refactoring

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

4 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index d1cfb4e1a..69f94420b 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -31,7 +31,7 @@
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/qmmpuisettings.h>
-#include <qmmpui/columnmanager.h>
+#include <qmmpui/playlistheadermodel.h>
 #include "listwidget.h"
 #include "playlistheader.h"
 #include "skin.h"
@@ -45,7 +45,7 @@ ListWidget::ListWidget(QWidget *parent)
 {
     m_skin = Skin::instance();
     m_ui_settings = QmmpUiSettings::instance();
-    ColumnManager *column_manager = m_ui_settings->columnManager();
+    PlayListHeaderModel *column_manager = m_ui_settings->columnManager();
     m_menu = new QMenu(this);
     m_timer = new QTimer(this);
     m_timer->setInterval(50);
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h
index 0b221394d..5e3873fba 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.h
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.h
@@ -30,7 +30,7 @@
 
 class QPainter;
 class Skin;
-class ColumnManager;
+class PlayListHeaderModel;
 
 struct ListWidgetRow
 {
@@ -85,7 +85,7 @@ private:
     Skin *m_skin;
     QFontMetrics *m_metrics;
     QFontMetrics *m_extra_metrics;
-    ColumnManager *m_column_manager;
+    PlayListHeaderModel *m_column_manager;
     QFont m_font, m_extra_font;
     bool m_update;
     bool m_show_number;
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index bc8a0767e..139bfd74f 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -31,7 +31,7 @@
 #include <QIcon>
 #include <qmmp/qmmp.h>
 #include <qmmpui/qmmpuisettings.h>
-#include <qmmpui/columnmanager.h>
+#include <qmmpui/playlistheadermodel.h>
 #include "skin.h"
 #include "playlistheader.h"
 
diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h
index e563aefb3..421d344a3 100644
--- a/src/plugins/Ui/skinned/playlistheader.h
+++ b/src/plugins/Ui/skinned/playlistheader.h
@@ -29,7 +29,7 @@ class QMouseEvent;
 class QContextMenuEvent;
 class QMenu;
 class Skin;
-class ColumnManager;
+class PlayListHeaderModel;
 
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -70,7 +70,7 @@ private:
     QStringList m_names;
     QPoint m_pressed_pos;
     QPoint m_mouse_pos;
-    ColumnManager *m_manager;
+    PlayListHeaderModel *m_manager;
     bool m_show_number;
     bool m_align_numbres;
     int m_number_width;