5 files changed, 10 insertions, 12 deletions
diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp
index 9e1bd8602..9ec68290a 100644
--- a/src/qmmpui/filedialog.cpp
+++ b/src/qmmpui/filedialog.cpp
@@ -25,6 +25,7 @@
 #include <QApplication>
 #include <QPluginLoader>
 #include <QMetaObject>
+#include <qmmp/qmmp.h>
 
 #include "qtfiledialog.h"
 
@@ -50,7 +51,7 @@ void FileDialog::setEnabled(FileDialogFactory *factory)
         registerBuiltinFactories();
         registerExternalFactories();
     }
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("FileDialog", factories.key(factory));
 }
 
@@ -61,7 +62,7 @@ bool FileDialog::isEnabled(FileDialogFactory *factory)
         registerBuiltinFactories();
         registerExternalFactories();
     }
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QString f_dialogName = settings.value("FileDialog", "qt_dialog").toString();
     return factories.value(f_dialogName) == factory;
 }
@@ -202,7 +203,7 @@ FileDialog* FileDialog::instance()
         registerExternalFactories();
     }
 
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QString f_dialogName = settings.value("FileDialog", "qt_dialog").toString();
 
     QStringList names = factories.keys();
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 7bed340e1..6d43d3c68 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QList>
 #include <QApplication>
+#include <qmmp/qmmp.h>
 
 #include "general.h"
 
@@ -101,7 +102,7 @@ void General::setEnabled(GeneralFactory* factory, bool enable)
         return;
 
     QString name = files.at(factories->indexOf(factory)).section('/',-1);
-    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+    QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
     QStringList genList = settings.value("General/plugin_files").toStringList();
 
     if (enable)
@@ -120,7 +121,7 @@ bool General::isEnabled(GeneralFactory* factory)
     if (!factories->contains(factory))
         return FALSE;
     QString name = files.at(factories->indexOf(factory)).section('/',-1);
-    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+    QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
     QStringList genList = settings.value("General/plugin_files").toStringList();
     return genList.contains(name);
 }
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index bfbaa354c..23ce0b0c7 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -38,7 +38,7 @@ PlayListItem::PlayListItem(FileInfo *info, QSettings *settings) : AbstractPlayli
     //use external settings or create new
     QSettings *s = settings;
     if (!s)
-        s = new QSettings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+        s = new QSettings (Qmmp::configFile(), QSettings::IniFormat);
 
     m_use_meta = s->value ("PlayList/load_metadata", TRUE).toBool();  //TODO move to libqmmp
     //format
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 9cb144772..1ceb70265 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -370,7 +370,7 @@ void PlayListModel::showDetails()
 
 void PlayListModel::readSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_current = settings.value("Playlist/current",0).toInt();
 
     QString line, param, value;
@@ -439,7 +439,7 @@ void PlayListModel::writeSettings()
         file.write(QString("length=%1").arg(m->length()).toUtf8() +"\n");
     }
     file.close();
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("Playlist/current", m_current);
 }
 
diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp
index 373619574..713b23058 100644
--- a/src/qmmpui/playstate.cpp
+++ b/src/qmmpui/playstate.cpp
@@ -92,10 +92,6 @@ void ShufflePlayState::resetState()
     m_shuffled_current = 0;
 }
 
-
-
-
-
 NormalPlayState::NormalPlayState(PlayListModel * model) : PlayState(model)
 {}