some api fixes

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

6 files changed, 15 insertions, 33 deletions

diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt
index 4434f3a81..490c7fd1e 100644
--- a/src/qmmpui/CMakeLists.txt
+++ b/src/qmmpui/CMakeLists.txt
@@ -13,12 +13,6 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 ADD_DEFINITIONS(-DQT_THREAD)
-ADD_DEFINITIONS(-DLIB_DIR=\\\"\\/${LIB_DIR}\\\")
-IF(SVN_VERSION)
-ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}-svn\\\")
-ELSE(SVN_VERSION)
-ADD_DEFINITIONS(-DQMMP_STR_VERSION=\\\"${QMMP_VERSION}\\\")
-ENDIF(SVN_VERSION)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp
index 9320064f1..4a8ae40af 100644
--- a/src/qmmpui/commandlinemanager.cpp
+++ b/src/qmmpui/commandlinemanager.cpp
@@ -25,7 +25,7 @@
 
 #include <cstdlib>
 #include <iostream>
-
+#include <qmmp/qmmp.h>
 #include "commandlinemanager.h"
 
 using namespace std;
@@ -40,9 +40,8 @@ static void checkOptions()
         files.clear();
         options = new QList<CommandLineOption *>;
 
-        QDir pluginsDir (qApp->applicationDirPath());
-        pluginsDir.cdUp();
-        pluginsDir.cd("./"LIB_DIR"/qmmp/CommandLineOptions");
+        QDir pluginsDir (Qmmp::pluginsPath());
+        pluginsDir.cd("CommadLineOptions");
         foreach (QString fileName, pluginsDir.entryList(QDir::Files))
         {
             QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 9ab1c57c2..e094f5006 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -156,10 +156,8 @@ void FileDialog::registerBuiltinFactories()
 
 void FileDialog::registerExternalFactories()
 {
-    QDir pluginsDir (qApp->applicationDirPath());
-    pluginsDir.cdUp();
-    pluginsDir.cd("./"LIB_DIR"/qmmp/FileDialogs");
-
+    QDir pluginsDir (Qmmp::pluginsPath());
+    pluginsDir.cd("FileDialogs");
     foreach (QString fileName, pluginsDir.entryList(QDir::Files))
     {
         QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
@@ -208,7 +206,7 @@ FileDialog* FileDialog::instance()
 
     QStringList names = factories.keys();
 
-    if(!names.contains(f_dialogName))
+    if (!names.contains(f_dialogName))
         f_dialogName = "qt_dialog";
 
     if (m_current_factory != f_dialogName || !_instance)
@@ -275,7 +273,10 @@ void FileDialog::popup(QWidget *parent,
     {
         QStringList files;
         if (m == AddFiles || m == AddFile || m == AddDirsFiles)
-            files = getOpenFileNames(parent, caption, *dir, filters);
+        {
+            QString selectedFilter;
+            files = getOpenFileNames(parent, caption, *dir, filters, &selectedFilter);
+        }
         else if (m == AddDirs || m == AddDir)
         {
             QString path = getExistingDirectory(parent, caption, *dir);
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 9f47ddc1f..7bf9514d7 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -36,10 +36,8 @@ static void checkFactories()
     {
         files.clear();
         factories = new QList<GeneralFactory *>;
-
-        QDir pluginsDir (qApp->applicationDirPath());
-        pluginsDir.cdUp();
-        pluginsDir.cd("./"LIB_DIR"/qmmp/General");
+        QDir pluginsDir (Qmmp::pluginsPath());
+        pluginsDir.cd("General");
         foreach (QString fileName, pluginsDir.entryList(QDir::Files))
         {
             QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp
index 673abcb0f..7b41f35c9 100644
--- a/src/qmmpui/playlistparser.cpp
+++ b/src/qmmpui/playlistparser.cpp
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QList>
 #include <QApplication>
-
+#include <qmmp/qmmp.h>
 #include "playlistformat.h"
 #include "playlistparser.h"
 
@@ -78,9 +78,8 @@ void PlaylistParser::loadExternalPlaylistFormats()
 {
     if (!m_formats.isEmpty())
         return;
-    QDir pluginsDir (qApp->applicationDirPath());
-    pluginsDir.cdUp();
-    pluginsDir.cd("./"LIB_DIR"/qmmp/PlaylistFormats");
+    QDir pluginsDir (Qmmp::pluginsPath());
+    pluginsDir.cd("PlaylistFormats");
     foreach (QString fileName, pluginsDir.entryList(QDir::Files))
     {
         QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro
index 7027a9070..af48ad1fa 100644
--- a/src/qmmpui/qmmpui.pro
+++ b/src/qmmpui/qmmpui.pro
@@ -17,15 +17,6 @@ unix : isEmpty(LIB_DIR){
         LIB_DIR = /lib
     }
 
-unix : DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\"
-
-DEFINES += QMMP_VERSION=$$QMMP_VERSION
-contains(CONFIG, SVN_VERSION){
-    DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION-svn\\\"
-}else {
-    DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\"
-}
-
 VERSION = $$QMMP_VERSION
 
 target.path = $$LIB_DIR