refactoring

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4829 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 33 insertions, 33 deletions

diff --git a/src/qmmpui/columnmanager.cpp b/src/qmmpui/playlistheadermodel.cpp
index f798f48f6..513e51526 100644
--- a/src/qmmpui/columnmanager.cpp
+++ b/src/qmmpui/playlistheadermodel.cpp
@@ -22,9 +22,9 @@
 #include <QApplication>
 #include <qmmp/qmmp.h>
 #include "columneditor_p.h"
-#include "columnmanager.h"
+#include "playlistheadermodel.h"
 
-ColumnManager::ColumnManager(QObject *parent) :
+PlayListHeaderModel::PlayListHeaderModel(QObject *parent) :
     QObject(parent)
 {
     QSettings s (Qmmp::configFile(), QSettings::IniFormat);
@@ -45,7 +45,7 @@ ColumnManager::ColumnManager(QObject *parent) :
     s.endGroup();
 }
 
-ColumnManager::~ColumnManager()
+PlayListHeaderModel::~PlayListHeaderModel()
 {
     sync();
     foreach (Column col, m_columns)
@@ -56,7 +56,7 @@ ColumnManager::~ColumnManager()
     m_columns.clear();
 }
 
-void ColumnManager::insert(int index, const QString &name, const QString &pattern)
+void PlayListHeaderModel::insert(int index, const QString &name, const QString &pattern)
 {
     if(index < 0 || index > m_columns.size())
     {
@@ -75,7 +75,7 @@ void ColumnManager::insert(int index, const QString &name, const QString &patter
     emit inserted(index);
 }
 
-void ColumnManager::remove(int index)
+void PlayListHeaderModel::remove(int index)
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -91,7 +91,7 @@ void ColumnManager::remove(int index)
     emit removed(index);
 }
 
-void ColumnManager::resize(int index, int size)
+void PlayListHeaderModel::resize(int index, int size)
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -104,7 +104,7 @@ void ColumnManager::resize(int index, int size)
    emit resized(index);
 }
 
-void ColumnManager::setAutoResize(int index, bool autoResize)
+void PlayListHeaderModel::setAutoResize(int index, bool autoResize)
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -119,7 +119,7 @@ void ColumnManager::setAutoResize(int index, bool autoResize)
     }
 }
 
-void ColumnManager::move(int from, int to)
+void PlayListHeaderModel::move(int from, int to)
 {
     if(from < 0 || from >= m_columns.size())
     {
@@ -137,7 +137,7 @@ void ColumnManager::move(int from, int to)
     emit moved(from, to);
 }
 
-void ColumnManager::execEditor(int index, QWidget *parent)
+void PlayListHeaderModel::execEditor(int index, QWidget *parent)
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -158,12 +158,12 @@ void ColumnManager::execEditor(int index, QWidget *parent)
     }
 }
 
-int ColumnManager::count()
+int PlayListHeaderModel::count()
 {
     return m_columns.count();
 }
 
-const MetaDataFormatter *ColumnManager::titleFormatter(int index) const
+const MetaDataFormatter *PlayListHeaderModel::titleFormatter(int index) const
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -173,7 +173,7 @@ const MetaDataFormatter *ColumnManager::titleFormatter(int index) const
     return m_columns[index].titleFormatter;
 }
 
-int ColumnManager::size(int index) const
+int PlayListHeaderModel::size(int index) const
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -183,7 +183,7 @@ int ColumnManager::size(int index) const
     return m_columns[index].size;
 }
 
-const QString ColumnManager::name(int index) const
+const QString PlayListHeaderModel::name(int index) const
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -192,7 +192,7 @@ const QString ColumnManager::name(int index) const
     }
     return m_columns[index].name;
 }
-const QString ColumnManager::pattern(int index) const
+const QString PlayListHeaderModel::pattern(int index) const
 {
     if(index < 0 || index >= m_columns.size())
     {
@@ -202,7 +202,7 @@ const QString ColumnManager::pattern(int index) const
     return m_columns[index].pattern;
 }
 
-QList<int> ColumnManager::autoResizeColumns() const
+QList<int> PlayListHeaderModel::autoResizeColumns() const
 {
     QList<int> columns;
     for(int i = 0; i < m_columns.count(); ++i)
@@ -213,7 +213,7 @@ QList<int> ColumnManager::autoResizeColumns() const
     return columns;
 }
 
-void ColumnManager::sync()
+void PlayListHeaderModel::sync()
 {
     QSettings s (Qmmp::configFile(), QSettings::IniFormat);
     s.beginGroup("PlayList");
diff --git a/src/qmmpui/columnmanager.h b/src/qmmpui/playlistheadermodel.h
index 4a3fd8dda..d6c5c2053 100644
--- a/src/qmmpui/columnmanager.h
+++ b/src/qmmpui/playlistheadermodel.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COLUMNMANAGER_H
-#define COLUMNMANAGER_H
+#ifndef PLAYLISTHEADERMODEL_H
+#define PLAYLISTHEADERMODEL_H
 
 #include <QObject>
 #include <QWidget>
@@ -28,13 +28,13 @@
 /**
  * @author Ilya Kotov <forkotov02@hotmail.ru>
  */
-class ColumnManager : public QObject
+class PlayListHeaderModel : public QObject
 {
     Q_OBJECT
 public:
-    explicit ColumnManager(QObject *parent = 0);
+    explicit PlayListHeaderModel(QObject *parent = 0);
 
-    ~ColumnManager();
+    ~PlayListHeaderModel();
 
     void insert(int index, const QString &name, const QString &pattern);
     void remove(int index);
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index 728138fe3..68922d4d1 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -21,7 +21,7 @@
 #define PLAYLISTMANAGER_H
 
 #include <QObject>
-#include "columnmanager.h"
+#include "playlistheadermodel.h"
 #include "playlistmodel.h"
 
 class QTimer;
diff --git a/src/qmmpui/playlisttrack.h b/src/qmmpui/playlisttrack.h
index 71966a2d4..73ac63cde 100644
--- a/src/qmmpui/playlisttrack.h
+++ b/src/qmmpui/playlisttrack.h
@@ -27,7 +27,7 @@
 #include "playlistitem.h"
 
 class QmmpUiSettings;
-class ColumnManager;
+class PlayListHeaderModel;
 
 /** @brief The PlayListTrack class provides a track for use with the PlayListModel class.
  * @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -117,7 +117,7 @@ private:
     qint64 m_length;
     int m_refCount;
     bool m_sheduledForDeletion;
-    ColumnManager *m_columnManager;
+    PlayListHeaderModel *m_columnManager;
 };
 
 #endif
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index c806a576c..c2c7ff6de 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -70,8 +70,8 @@ HEADERS += general.h \
     normalcontainer_p.h \
     playlisttask_p.h \
     metadataformatter.h \
-    columnmanager.h \
-    columneditor_p.h
+    columneditor_p.h \
+    playlistheadermodel.h
 
 SOURCES += general.cpp \
     playlistparser.cpp \
@@ -106,8 +106,8 @@ SOURCES += general.cpp \
     playlistcontainer.cpp \
     playlisttask.cpp \
     metadataformatter.cpp \
-    columnmanager.cpp \
-    columneditor.cpp
+    columneditor.cpp \
+    playlistheadermodel.cpp
 
 FORMS += forms/detailsdialog.ui \
     forms/tageditor.ui \
diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp
index 3373c84e0..f28fefd19 100644
--- a/src/qmmpui/qmmpuisettings.cpp
+++ b/src/qmmpui/qmmpuisettings.cpp
@@ -32,7 +32,7 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     if(m_instance)
         qFatal("QmmpUiSettings: only one instance is allowed");
     m_instance = this;
-    m_colum_manager = new ColumnManager(this);
+    m_colum_manager = new PlayListHeaderModel(this);
     QSettings s (Qmmp::configFile(), QSettings::IniFormat);
     s.beginGroup("PlayList");
     m_group_format = s.value("group_format", "%p%if(%p&%a, - %if(%y,[%y] ,),)%a").toString();
@@ -312,7 +312,7 @@ bool QmmpUiSettings::clearPreviousPlayList() const
     return m_clear_prev_playlist;
 }
 
-ColumnManager *QmmpUiSettings::columnManager()
+PlayListHeaderModel *QmmpUiSettings::columnManager()
 {
     return m_colum_manager;
 }
diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h
index 46a483697..4c6b40b2f 100644
--- a/src/qmmpui/qmmpuisettings.h
+++ b/src/qmmpui/qmmpuisettings.h
@@ -23,7 +23,7 @@
 
 #include <QObject>
 #include <QStringList>
-#include "columnmanager.h"
+#include "playlistheadermodel.h"
 #include "metadataformatter.h"
 
 class QTimer;
@@ -179,7 +179,7 @@ public:
      */
     bool clearPreviousPlayList() const;
 
-    ColumnManager *columnManager();
+    PlayListHeaderModel *columnManager();
     const MetaDataFormatter* titleFormatter(int column) const;
     const MetaDataFormatter* groupFormatter() const;
 
@@ -277,7 +277,7 @@ private:
     //formatters
     MetaDataFormatter m_group_formatter;
     //column settings
-    ColumnManager *m_colum_manager;
+    PlayListHeaderModel *m_colum_manager;
 };
 
 #endif // QMMPUISETTINGS_H