From 3f0ae181b1e8d2cc7b6ec137fa7d0ff99545330f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 8 Apr 2015 11:35:24 +0000 Subject: refactoring git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4829 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/listwidget.cpp | 4 +- src/plugins/Ui/skinned/listwidgetdrawer.h | 4 +- src/plugins/Ui/skinned/playlistheader.cpp | 2 +- src/plugins/Ui/skinned/playlistheader.h | 4 +- src/qmmpui/columnmanager.cpp | 238 ------------------------------ src/qmmpui/columnmanager.h | 73 --------- src/qmmpui/playlistheadermodel.cpp | 238 ++++++++++++++++++++++++++++++ src/qmmpui/playlistheadermodel.h | 73 +++++++++ src/qmmpui/playlistmanager.h | 2 +- src/qmmpui/playlisttrack.h | 4 +- src/qmmpui/qmmpui.pro | 8 +- src/qmmpui/qmmpuisettings.cpp | 4 +- src/qmmpui/qmmpuisettings.h | 6 +- 13 files changed, 330 insertions(+), 330 deletions(-) delete mode 100644 src/qmmpui/columnmanager.cpp delete mode 100644 src/qmmpui/columnmanager.h create mode 100644 src/qmmpui/playlistheadermodel.cpp create mode 100644 src/qmmpui/playlistheadermodel.h (limited to 'src') 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 #include #include -#include +#include #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 #include #include -#include +#include #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 @@ -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; diff --git a/src/qmmpui/columnmanager.cpp b/src/qmmpui/columnmanager.cpp deleted file mode 100644 index f798f48f6..000000000 --- a/src/qmmpui/columnmanager.cpp +++ /dev/null @@ -1,238 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2015 by Ilya Kotov * - * forkotov02@hotmail.ru * - * * - * 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 * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include -#include "columneditor_p.h" -#include "columnmanager.h" - -ColumnManager::ColumnManager(QObject *parent) : - QObject(parent) -{ - QSettings s (Qmmp::configFile(), QSettings::IniFormat); - s.beginGroup("PlayList"); - int c = qMax(1, s.value("column_count", 1).toInt()); - for(int i = 0; i < c; ++i) - { - s.beginGroup(QString("column%1").arg(i)); - Column col; - col.name = s.value("name", tr("Album - Title")).toString(); - col.pattern = s.value("pattern", "%p%if(%p&%t, - ,)%t").toString(); - col.size = s.value("size", 150).toInt(); - col.titleFormatter = new MetaDataFormatter(col.pattern); - col.autoResize = s.value("autoresize", false).toBool(); - m_columns.append(col); - s.endGroup(); - } - s.endGroup(); -} - -ColumnManager::~ColumnManager() -{ - sync(); - foreach (Column col, m_columns) - { - delete col.titleFormatter; - col.titleFormatter = 0; - } - m_columns.clear(); -} - -void ColumnManager::insert(int index, const QString &name, const QString &pattern) -{ - if(index < 0 || index > m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - Column col; - col.name = name; - col.pattern = pattern; - col.titleFormatter = new MetaDataFormatter(pattern); - col.size = 50; - col.autoResize = false; - m_columns.insert(index, col); - sync(); - emit inserted(index); -} - -void ColumnManager::remove(int index) -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - if(m_columns.count() == 1) - return; - - delete m_columns.takeAt(index).titleFormatter; - sync(); - emit removed(index); -} - -void ColumnManager::resize(int index, int size) -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - m_columns[index].size = qMax(size, 30); - //sync(); - emit resized(index); -} - -void ColumnManager::setAutoResize(int index, bool autoResize) -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - if(m_columns[index].autoResize != autoResize) - { - m_columns[index].autoResize = autoResize; - emit changed(index); - } -} - -void ColumnManager::move(int from, int to) -{ - if(from < 0 || from >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - if(to < 0 || to >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - m_columns.move(from, to); - emit moved(from, to); -} - -void ColumnManager::execEditor(int index, QWidget *parent) -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return; - } - - if(!parent) - parent = qApp->activeWindow(); - - ColumnEditor editor(m_columns[index].name, m_columns[index].pattern, parent); - if(editor.exec() == QDialog::Accepted) - { - m_columns[index].name = editor.name(); - m_columns[index].pattern = editor.pattern(); - m_columns[index].titleFormatter->setPattern(editor.pattern()); - emit changed(index); - } -} - -int ColumnManager::count() -{ - return m_columns.count(); -} - -const MetaDataFormatter *ColumnManager::titleFormatter(int index) const -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return 0; - } - return m_columns[index].titleFormatter; -} - -int ColumnManager::size(int index) const -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return 0; - } - return m_columns[index].size; -} - -const QString ColumnManager::name(int index) const -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return QString(); - } - return m_columns[index].name; -} -const QString ColumnManager::pattern(int index) const -{ - if(index < 0 || index >= m_columns.size()) - { - qWarning("ColumnManager: index is out of range"); - return QString(); - } - return m_columns[index].pattern; -} - -QList ColumnManager::autoResizeColumns() const -{ - QList columns; - for(int i = 0; i < m_columns.count(); ++i) - { - if(m_columns[i].autoResize) - columns.append(i); - } - return columns; -} - -void ColumnManager::sync() -{ - QSettings s (Qmmp::configFile(), QSettings::IniFormat); - s.beginGroup("PlayList"); - int old_count = s.value("column_count", 1).toInt(); - s.setValue("column_count", m_columns.count()); - for(int i = 0; i < m_columns.count(); ++i) - { - s.beginGroup(QString("column%1").arg(i)); - Column col = m_columns.at(i); - s.setValue("name", col.name); - s.setValue("pattern", col.pattern); - s.setValue("size", col.size); - s.setValue("autoresize", col.autoResize); - s.endGroup(); - } - s.setValue("column_count", m_columns.count()); - for(int i = m_columns.count(); i < old_count; ++i) - { - s.remove(QString("column%1").arg(i)); - } - s.endGroup(); -} diff --git a/src/qmmpui/columnmanager.h b/src/qmmpui/columnmanager.h deleted file mode 100644 index 4a3fd8dda..000000000 --- a/src/qmmpui/columnmanager.h +++ /dev/null @@ -1,73 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2015 by Ilya Kotov * - * forkotov02@hotmail.ru * - * * - * 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 * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef COLUMNMANAGER_H -#define COLUMNMANAGER_H - -#include -#include -#include "metadataformatter.h" - -/** - * @author Ilya Kotov - */ -class ColumnManager : public QObject -{ - Q_OBJECT -public: - explicit ColumnManager(QObject *parent = 0); - - ~ColumnManager(); - - void insert(int index, const QString &name, const QString &pattern); - void remove(int index); - void resize(int index, int size); - void setAutoResize(int index, bool autoResize); - void move(int from, int to); - void execEditor(int index, QWidget *parent = 0); - - int count(); - const MetaDataFormatter* titleFormatter(int index) const; - int size(int index) const; - const QString name(int index) const; - const QString pattern(int index) const; - QList autoResizeColumns() const; - -signals: - void inserted(int index); - void removed(int index); - void changed(int index); - void resized(int index); - void moved(int from, int to); - -private: - void sync(); - struct Column - { - QString name; - QString pattern; - int size; - bool autoResize; - MetaDataFormatter *titleFormatter; - }; - QList m_columns; -}; - -#endif // COLUMNMANAGER_H diff --git a/src/qmmpui/playlistheadermodel.cpp b/src/qmmpui/playlistheadermodel.cpp new file mode 100644 index 000000000..513e51526 --- /dev/null +++ b/src/qmmpui/playlistheadermodel.cpp @@ -0,0 +1,238 @@ +/*************************************************************************** + * Copyright (C) 2015 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * 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 * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include +#include +#include +#include "columneditor_p.h" +#include "playlistheadermodel.h" + +PlayListHeaderModel::PlayListHeaderModel(QObject *parent) : + QObject(parent) +{ + QSettings s (Qmmp::configFile(), QSettings::IniFormat); + s.beginGroup("PlayList"); + int c = qMax(1, s.value("column_count", 1).toInt()); + for(int i = 0; i < c; ++i) + { + s.beginGroup(QString("column%1").arg(i)); + Column col; + col.name = s.value("name", tr("Album - Title")).toString(); + col.pattern = s.value("pattern", "%p%if(%p&%t, - ,)%t").toString(); + col.size = s.value("size", 150).toInt(); + col.titleFormatter = new MetaDataFormatter(col.pattern); + col.autoResize = s.value("autoresize", false).toBool(); + m_columns.append(col); + s.endGroup(); + } + s.endGroup(); +} + +PlayListHeaderModel::~PlayListHeaderModel() +{ + sync(); + foreach (Column col, m_columns) + { + delete col.titleFormatter; + col.titleFormatter = 0; + } + m_columns.clear(); +} + +void PlayListHeaderModel::insert(int index, const QString &name, const QString &pattern) +{ + if(index < 0 || index > m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + Column col; + col.name = name; + col.pattern = pattern; + col.titleFormatter = new MetaDataFormatter(pattern); + col.size = 50; + col.autoResize = false; + m_columns.insert(index, col); + sync(); + emit inserted(index); +} + +void PlayListHeaderModel::remove(int index) +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + if(m_columns.count() == 1) + return; + + delete m_columns.takeAt(index).titleFormatter; + sync(); + emit removed(index); +} + +void PlayListHeaderModel::resize(int index, int size) +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + m_columns[index].size = qMax(size, 30); + //sync(); + emit resized(index); +} + +void PlayListHeaderModel::setAutoResize(int index, bool autoResize) +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + if(m_columns[index].autoResize != autoResize) + { + m_columns[index].autoResize = autoResize; + emit changed(index); + } +} + +void PlayListHeaderModel::move(int from, int to) +{ + if(from < 0 || from >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + if(to < 0 || to >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + m_columns.move(from, to); + emit moved(from, to); +} + +void PlayListHeaderModel::execEditor(int index, QWidget *parent) +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return; + } + + if(!parent) + parent = qApp->activeWindow(); + + ColumnEditor editor(m_columns[index].name, m_columns[index].pattern, parent); + if(editor.exec() == QDialog::Accepted) + { + m_columns[index].name = editor.name(); + m_columns[index].pattern = editor.pattern(); + m_columns[index].titleFormatter->setPattern(editor.pattern()); + emit changed(index); + } +} + +int PlayListHeaderModel::count() +{ + return m_columns.count(); +} + +const MetaDataFormatter *PlayListHeaderModel::titleFormatter(int index) const +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return 0; + } + return m_columns[index].titleFormatter; +} + +int PlayListHeaderModel::size(int index) const +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return 0; + } + return m_columns[index].size; +} + +const QString PlayListHeaderModel::name(int index) const +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return QString(); + } + return m_columns[index].name; +} +const QString PlayListHeaderModel::pattern(int index) const +{ + if(index < 0 || index >= m_columns.size()) + { + qWarning("ColumnManager: index is out of range"); + return QString(); + } + return m_columns[index].pattern; +} + +QList PlayListHeaderModel::autoResizeColumns() const +{ + QList columns; + for(int i = 0; i < m_columns.count(); ++i) + { + if(m_columns[i].autoResize) + columns.append(i); + } + return columns; +} + +void PlayListHeaderModel::sync() +{ + QSettings s (Qmmp::configFile(), QSettings::IniFormat); + s.beginGroup("PlayList"); + int old_count = s.value("column_count", 1).toInt(); + s.setValue("column_count", m_columns.count()); + for(int i = 0; i < m_columns.count(); ++i) + { + s.beginGroup(QString("column%1").arg(i)); + Column col = m_columns.at(i); + s.setValue("name", col.name); + s.setValue("pattern", col.pattern); + s.setValue("size", col.size); + s.setValue("autoresize", col.autoResize); + s.endGroup(); + } + s.setValue("column_count", m_columns.count()); + for(int i = m_columns.count(); i < old_count; ++i) + { + s.remove(QString("column%1").arg(i)); + } + s.endGroup(); +} diff --git a/src/qmmpui/playlistheadermodel.h b/src/qmmpui/playlistheadermodel.h new file mode 100644 index 000000000..d6c5c2053 --- /dev/null +++ b/src/qmmpui/playlistheadermodel.h @@ -0,0 +1,73 @@ +/*************************************************************************** + * Copyright (C) 2015 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * 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 * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef PLAYLISTHEADERMODEL_H +#define PLAYLISTHEADERMODEL_H + +#include +#include +#include "metadataformatter.h" + +/** + * @author Ilya Kotov + */ +class PlayListHeaderModel : public QObject +{ + Q_OBJECT +public: + explicit PlayListHeaderModel(QObject *parent = 0); + + ~PlayListHeaderModel(); + + void insert(int index, const QString &name, const QString &pattern); + void remove(int index); + void resize(int index, int size); + void setAutoResize(int index, bool autoResize); + void move(int from, int to); + void execEditor(int index, QWidget *parent = 0); + + int count(); + const MetaDataFormatter* titleFormatter(int index) const; + int size(int index) const; + const QString name(int index) const; + const QString pattern(int index) const; + QList autoResizeColumns() const; + +signals: + void inserted(int index); + void removed(int index); + void changed(int index); + void resized(int index); + void moved(int from, int to); + +private: + void sync(); + struct Column + { + QString name; + QString pattern; + int size; + bool autoResize; + MetaDataFormatter *titleFormatter; + }; + QList m_columns; +}; + +#endif // COLUMNMANAGER_H 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 -#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 @@ -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 #include -#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 -- cgit v1.2.3-13-gbd6f