More code refactoring and clean-up.

[lamexp/LameXP.git] / src / Model_FileList.cpp

diff --git a/src/Model_FileList.cpp b/src/Model_FileList.cpp
index 5d4d5bd..4ad59b3 100644 (file)
--- a/src/Model_FileList.cpp
+++ b/src/Model_FileList.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -22,8 +22,13 @@
 
 #include "Model_FileList.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Global.h>
+
+//Qt
 #include <QFileInfo>
 #include <QDir>
 #include <QFile>
@@ -350,7 +355,7 @@ int FileListModel::importFromCsv(QWidget *parent, const QString &inFile)
 
                QStringList codecList;
                codecList.append(systemDefault);
-               codecList.append(lamexp_available_codepages());
+               codecList.append(MUtils::available_codepages());
 
                QInputDialog *input = new QInputDialog(parent);
                input->setLabelText(EXPAND(tr("Select ANSI Codepage for CSV file:")));
@@ -361,7 +366,7 @@ int FileListModel::importFromCsv(QWidget *parent, const QString &inFile)
        
                if(input->exec() < 1)
                {
-                       LAMEXP_DELETE(input);
+                       MUTILS_DELETE(input);
                        return CsvError_Aborted;
                }
        
@@ -376,7 +381,7 @@ int FileListModel::importFromCsv(QWidget *parent, const QString &inFile)
                        codec = QTextCodec::codecForName("System");
                }
 
-               LAMEXP_DELETE(input);
+               MUTILS_DELETE(input);
        }
 
        bomCheck.clear();
@@ -428,7 +433,7 @@ int FileListModel::importFromCsv(QWidget *parent, const QString &inFile)
        {
                if(stream.atEnd())
                {
-                       LAMEXP_DELETE_ARRAY(ignore);
+                       MUTILS_DELETE_ARRAY(ignore);
                        return CsvError_Incomplete;
                }
                
@@ -495,7 +500,7 @@ int FileListModel::importFromCsv(QWidget *parent, const QString &inFile)
                        }
                        else
                        {
-                               qWarning("Unkonw field '%s' will be ignored!", QUTF8(header.at(j)));
+                               qWarning("Unkonw field '%s' will be ignored!", MUTILS_UTF8(header.at(j)));
                                ignore[j] = true;
                                
                                if(!checkArray(ignore, false, nCols))
@@ -509,7 +514,7 @@ int FileListModel::importFromCsv(QWidget *parent, const QString &inFile)
 
        //----------------------//
 
-       LAMEXP_DELETE_ARRAY(ignore);
+       MUTILS_DELETE_ARRAY(ignore);
        return CsvError_OK;
 }