changed PlayListTask::sort and PlayListTask::sortSelection functions

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

6 files changed, 15 insertions, 12 deletions

diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index febc5162d..a29c4338d 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -36,6 +36,7 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent)
 {
     if(m_instance)
         qFatal("PlayListManager: only one instance is allowed");
+    qRegisterMetaType<PlayListModel::SortMode>();
     m_instance = this;
     m_ui_settings = QmmpUiSettings::instance();
     m_header = new PlayListHeaderModel(this);
@@ -447,12 +448,12 @@ void PlayListManager::reverseList()
     m_selected->reverseList();
 }
 
-void PlayListManager::sortSelection(int mode)
+void PlayListManager::sortSelection(PlayListModel::SortMode mode)
 {
     m_selected->sortSelection(mode);
 }
 
-void PlayListManager::sort(int mode)
+void PlayListManager::sort(PlayListModel::SortMode mode)
 {
     m_selected->sort(mode);
 }
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index 2dc444441..c0a675092 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -222,11 +222,11 @@ public slots:
     /*!
      * This is a convenience function and is the same as calling \b selectedPlayList()->sortSelection(mode)
      */
-    void sortSelection(int mode);
+    void sortSelection(PlayListModel::SortMode mode);
     /*!
      * This is a convenience function and is the same as calling \b selectedPlayList()->sort(mode)
      */
-    void sort(int mode);
+    void sort(PlayListModel::SortMode mode);
     /*!
      * This is a convenience function and is the same as calling \b selectedPlayList()->addToQueue()
      */
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index c4ba37b68..2a99e40c6 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -830,7 +830,7 @@ void PlayListModel::reverseList()
     emit listChanged(STRUCTURE);
 }
 
-void PlayListModel::sortSelection(int mode)
+void PlayListModel::sortSelection(SortMode mode)
 {
     if(m_container->isEmpty())
         return;
@@ -838,7 +838,7 @@ void PlayListModel::sortSelection(int mode)
     m_task->sortSelection(m_container->tracks(), mode);
 }
 
-void PlayListModel::sort(int mode)
+void PlayListModel::sort(SortMode mode)
 {
     if(m_container->isEmpty())
         return;
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index cdc492452..6ca9471bf 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -505,11 +505,11 @@ public slots:
     /*!
      * Sorts selected items in \b mode sort mode.
      */
-    void sortSelection(int mode);
+    void sortSelection(SortMode mode);
     /*!
      * Sorts items in \b mode sort mode.
      */
-    void sort(int mode);
+    void sort(SortMode mode);
     /*!
      * Sorts tracks by the column with index \b column.
      */
@@ -600,4 +600,6 @@ private:
     PlayListTask *m_task;
 };
 
+Q_DECLARE_METATYPE(PlayListModel::SortMode)
+
 #endif
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index d43e6c9c1..08b3ec685 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -129,7 +129,7 @@ PlayListTask::~PlayListTask()
     clear();
 }
 
-void PlayListTask::sort(QList<PlayListTrack *> tracks, int mode)
+void PlayListTask::sort(QList<PlayListTrack *> tracks, PlayListModel::SortMode mode)
 {
     if(isRunning())
         return;
@@ -160,7 +160,7 @@ void PlayListTask::sort(QList<PlayListTrack *> tracks, int mode)
     start();
 }
 
-void PlayListTask::sortSelection(QList<PlayListTrack *> tracks, int mode)
+void PlayListTask::sortSelection(QList<PlayListTrack *> tracks, PlayListModel::SortMode mode)
 {
     if(isRunning())
         return;
diff --git a/src/qmmpui/playlisttask_p.h b/src/qmmpui/playlisttask_p.h
index f44839900..c40ed18aa 100644
--- a/src/qmmpui/playlisttask_p.h
+++ b/src/qmmpui/playlisttask_p.h
@@ -51,8 +51,8 @@ public:
 
     ~PlayListTask();
 
-    void sort(QList<PlayListTrack *> tracks, int mode);
-    void sortSelection(QList<PlayListTrack *> tracks, int mode);
+    void sort(QList<PlayListTrack *> tracks, PlayListModel::SortMode mode);
+    void sortSelection(QList<PlayListTrack *> tracks, PlayListModel::SortMode mode);
     void sortByColumn(QList <PlayListTrack *> tracks, int column);
     void removeInvalidTracks(QList<PlayListTrack *> tracks, PlayListTrack *current_track);
     void removeDuplicates(QList<PlayListTrack *> tracks, PlayListTrack *current_track);