global config file path

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

24 files changed, 60 insertions, 49 deletions

diff --git a/src/plugins/Effect/srconverter/settingsdialog.cpp b/src/plugins/Effect/srconverter/settingsdialog.cpp
index 349feab03..c335a576d 100644
--- a/src/plugins/Effect/srconverter/settingsdialog.cpp
+++ b/src/plugins/Effect/srconverter/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -28,7 +29,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 {
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose, TRUE);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     ui.srSpinBox->setValue(settings.value("SRC/sample_rate",48000).toInt());
     ui.engineComboBox->setCurrentIndex(settings.value("SRC/engine", 0).toInt());
 }
@@ -40,7 +41,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("SRC/sample_rate",ui.srSpinBox->value());
     settings.setValue("SRC/engine", ui.engineComboBox->currentIndex());
     QDialog::accept();
diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp
index b8f729da9..f6523ccd8 100644
--- a/src/plugins/Effect/srconverter/srconverter.cpp
+++ b/src/plugins/Effect/srconverter/srconverter.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
 #include <math.h>
 #include <stdlib.h>
+#include <qmmp/qmmp.h>
 
 #include "srconverter.h"
 
@@ -34,7 +34,7 @@ SRConverter::SRConverter(QObject* parent) : Effect(parent)
     m_srcOut = 0;
     m_src_state = 0;
     m_srcError = 0;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_overSamplingFs = settings.value("SRC/sample_rate",48000).toInt();
     m_converter_type = converter_type_array[settings.value("SRC/engine", 0).toInt()];
 }
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
index fda997f85..e424c9387 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
@@ -21,13 +21,14 @@
 #include "qmmpfiledialogimpl.h"
 
 #include <QDirModel>
-#include <QDir>
 #include <QApplication>
 #include <QFileInfo>
 #include <QStyle>
 #include <QSettings>
 #include <QMessageBox>
 
+#include <qmmp/qmmp.h>
+
 #define HISTORY_SIZE 8
 
 
@@ -82,7 +83,7 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD
             SLOT(updateSelection ()));
     PathCompleter* completer = new PathCompleter (m_model, fileListView, this);
     fileNameLineEdit->setCompleter (completer);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     closeOnAddToolButton->setChecked(settings.value("QMMPFileDialog/close_on_add", FALSE).toBool());
     restoreGeometry(settings.value("QMMPFileDialog/geometry").toByteArray());
     m_history = settings.value("QMMPFileDialog/history").toStringList();
@@ -315,7 +316,7 @@ void QmmpFileDialogImpl::on_fileTypeComboBox_activated(int index)
 
 void QmmpFileDialogImpl::hideEvent (QHideEvent *event)
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("QMMPFileDialog/close_on_add", closeOnAddToolButton->isChecked());
     settings.setValue("QMMPFileDialog/geometry", saveGeometry());
     settings.setValue("QMMPFileDialog/history", m_history);
diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp
index 2d4f0e951..1340c0d5a 100644
--- a/src/plugins/General/notifier/notifier.cpp
+++ b/src/plugins/General/notifier/notifier.cpp
@@ -32,7 +32,7 @@ Notifier::Notifier(QObject *parent)
 {
     m_popupWidget = 0;
     QFile::remove(QDir::homePath()+"/.psi/tune");
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Notifier");
     m_desktop = settings.value("desktop_notification", TRUE).toBool();
     m_psi = settings.value("psi_notification", FALSE).toBool();
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp
index 8e640abdf..98c4e3462 100644
--- a/src/plugins/General/notifier/popupwidget.cpp
+++ b/src/plugins/General/notifier/popupwidget.cpp
@@ -68,7 +68,7 @@ PopupWidget::PopupWidget(QWidget *parent)
     hlayout->addLayout (vlayout);
     setLayout(hlayout);
     resize(sizeHint());
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Notifier");
     int delay = settings.value("message_delay", 2000).toInt();
     uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt();
diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp
index 297fae316..d7f2e2660 100644
--- a/src/plugins/General/notifier/settingsdialog.cpp
+++ b/src/plugins/General/notifier/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "popupwidget.h"
 #include "settingsdialog.h"
@@ -39,7 +40,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     m_buttons.insert(PopupWidget::LEFT, ui.leftButton);
     m_buttons.insert(PopupWidget::CENTER, ui.centerButton);
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Notifier");
     ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt());
     uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt();
@@ -55,7 +56,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Notifier");
     settings.setValue ("message_delay", ui.messageDelaySpinBox->value());
     uint pos = PopupWidget::BOTTOMLEFT;
diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp
index 1c3118659..1d034dfe0 100644
--- a/src/plugins/General/statusicon/settingsdialog.cpp
+++ b/src/plugins/General/statusicon/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -27,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         : QDialog(parent)
 {
     ui.setupUi(this);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Tray");
     ui.messageCheckBox->setChecked(settings.value("show_message",TRUE).toBool());
     ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt());
@@ -41,7 +42,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Tray");
     settings.setValue ("show_message", ui.messageCheckBox->isChecked());
     settings.setValue ("message_delay", ui.messageDelaySpinBox->value());
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 8e4f05b51..9c6453acb 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -51,7 +51,7 @@ StatusIcon::StatusIcon(QObject *parent)
     menu->addAction(tr("Exit"), this, SLOT(exit()));
     m_tray->setContextMenu(menu);
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Tray");
     m_showMessage = settings.value("show_message",TRUE).toBool();
     m_messageDelay = settings.value("message_delay", 2000).toInt();
diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp
index f9827fafa..78d2fc8ad 100644
--- a/src/plugins/Input/cue/cueparser.cpp
+++ b/src/plugins/Input/cue/cueparser.cpp
@@ -38,7 +38,7 @@ CUEParser::CUEParser(const QString &fileName)
     }
     QString album, genre, date, comment;
     QTextStream textStream (&file);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QTextCodec *codec = QTextCodec::codecForName(settings.value("CUE/encoding","ISO-8859-1").toByteArray ());
     textStream.setCodec(codec);
     QString artist;
diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp
index ad6731179..9c80736ed 100644
--- a/src/plugins/Input/cue/settingsdialog.cpp
+++ b/src/plugins/Input/cue/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 #include <QTextCodec>
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -33,7 +34,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     {
         ui.cueEncComboBox->addItem(codec->name());
     }
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("CUE");
     int pos = ui.cueEncComboBox->findText(settings.value("encoding","ISO-8859-1").toString());
     ui.cueEncComboBox->setCurrentIndex(pos);
@@ -46,7 +47,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("CUE");
     settings.setValue("encoding", ui.cueEncComboBox->currentText());
     settings.endGroup();
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index e47187b84..d47ae5a6b 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -51,7 +51,7 @@ extern "C"
 
 bool DecoderFFmpegFactory::supports(const QString &source) const
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
@@ -71,7 +71,7 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *) const
 
 const DecoderProperties DecoderFFmpegFactory::properties() const
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp
index 58e11b54a..a68c43ad2 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp
@@ -19,9 +19,10 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
 #include <QStringList>
 
+#include <qmmp/qmmp.h>
+
 extern "C"
 {
 #if defined HAVE_FFMPEG_AVFORMAT_H
@@ -49,7 +50,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 {
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QStringList filters;
     filters << "*.wma" << "*.ape";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
@@ -89,7 +90,7 @@ void SettingsDialog::accept()
         filters << "*.tta";
     if (ui.alacCheckBox->isChecked())
         filters << "*.alac";
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("FFMPEG/filters", filters);
     QDialog::accept();
 }
diff --git a/src/plugins/Input/flac/cueparser.cpp b/src/plugins/Input/flac/cueparser.cpp
index 1441a999b..7f3dc9a28 100644
--- a/src/plugins/Input/flac/cueparser.cpp
+++ b/src/plugins/Input/flac/cueparser.cpp
@@ -32,7 +32,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName)
 {
     QString album, genre, date, comment;
     QTextStream textStream (array);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QTextCodec *codec = QTextCodec::codecForName(settings.value("CUE/encoding","ISO-8859-1").toByteArray ());
     textStream.setCodec(codec);
     m_filePath = fileName;
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index 9ede2f1d8..fa3f1d12b 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -108,7 +108,7 @@ QList<FileInfo *> DecoderMADFactory::createPlayList(const QString &fileName, boo
 
     if (useMetaData)
     {
-        QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+        QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
         settings.beginGroup("MAD");
 
         QTextCodec *codec = 0;
diff --git a/src/plugins/Input/mad/detailsdialog.cpp b/src/plugins/Input/mad/detailsdialog.cpp
index c2e55e5cb..885ff6e5e 100644
--- a/src/plugins/Input/mad/detailsdialog.cpp
+++ b/src/plugins/Input/mad/detailsdialog.cpp
@@ -33,6 +33,8 @@
 #include <taglib/mpegheader.h>
 #include <taglib/mpegproperties.h>
 
+#include <qmmp/qmmp.h>
+
 #include "detailsdialog.h"
 
 DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
@@ -47,7 +49,7 @@ DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
     if (!QFile::exists(m_path))
         return;
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     m_codec_v1 =
         QTextCodec::codecForName(settings.value("ID3v1_encoding", "ISO-8859-1" )
@@ -294,7 +296,7 @@ uint DetailsDialog::selectedTag()
 
 void DetailsDialog::closeEvent (QCloseEvent *)
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     if (ui.id3v1RadioButton->isChecked())
         settings.setValue("current_tag","ID3v1");
diff --git a/src/plugins/Input/mad/settingsdialog.cpp b/src/plugins/Input/mad/settingsdialog.cpp
index 8f1746b95..45c2e8536 100644
--- a/src/plugins/Input/mad/settingsdialog.cpp
+++ b/src/plugins/Input/mad/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 #include <QTextCodec>
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -34,7 +35,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         ui.id3v1EncComboBox->addItem(codec->name());
         ui.id3v2EncComboBox->addItem(codec->name());
     }
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     int pos = ui.id3v1EncComboBox->findText
         (settings.value("ID3v1_encoding","ISO-8859-1").toString());
@@ -57,7 +58,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::writeSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     settings.setValue("ID3v1_encoding", ui.id3v1EncComboBox->currentText());
     settings.setValue("ID3v2_encoding", ui.id3v2EncComboBox->currentText());
diff --git a/src/plugins/Input/mad/tagextractor.cpp b/src/plugins/Input/mad/tagextractor.cpp
index 1385c8a85..fe8f59788 100644
--- a/src/plugins/Input/mad/tagextractor.cpp
+++ b/src/plugins/Input/mad/tagextractor.cpp
@@ -55,7 +55,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag()
     TagLib::String genre = taglib_tag.genre();
     TagLib::String title = taglib_tag.title();
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MAD");
     QByteArray name = settings.value("ID3v2_encoding","UTF-8").toByteArray ();
     bool utf = FALSE;
diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp
index 6321f56b7..c0e5bc380 100644
--- a/src/plugins/Input/modplug/decoder_modplug.cpp
+++ b/src/plugins/Input/modplug/decoder_modplug.cpp
@@ -334,7 +334,7 @@ void DecoderModPlug::readSettings()
 {
     if (!m_soundFile)
         return;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     CSoundFile::SetWaveConfig
     (
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp
index a0cd1bd7a..bc70baed9 100644
--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
@@ -80,7 +80,7 @@ Decoder *DecoderModPlugFactory::create(QObject *parent, QIODevice *input,
 QList<FileInfo *> DecoderModPlugFactory::createPlayList(const QString &fileName, bool useMetaData)
 {
     QList <FileInfo*> list;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     if (!useMetaData || settings.value("UseFileName", FALSE).toBool())
     {
         list << new FileInfo(fileName);
diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp
index 0bb8c192d..ce1da24a9 100644
--- a/src/plugins/Input/modplug/settingsdialog.cpp
+++ b/src/plugins/Input/modplug/settingsdialog.cpp
@@ -34,7 +34,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     //general
     ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", FALSE).toBool());
@@ -110,7 +110,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::writeSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     //general
     settings.setValue("NoiseReduction", ui.noiseCheckBox->isChecked());
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 0a73431f6..5974efa06 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -40,7 +40,7 @@
 OutputALSA::OutputALSA(QObject * parent)
         : Output(parent), m_inited(FALSE)
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString dev_name = settings.value("ALSA/device","default").toString();
     m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool();
     pcm_name = strdup(dev_name.toAscii().data());
@@ -64,7 +64,7 @@ void OutputALSA::configure(quint32 freq, int chan, int prec)
     uint exact_rate = freq;   /* Sample rate returned by */
 
     /* load settings from config */
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ALSA");
     uint buffer_time = settings.value("buffer_time",500).toUInt()*1000;
     uint period_time = settings.value("period_time",100).toUInt()*1000;
@@ -360,7 +360,7 @@ VolumeControlALSA::VolumeControlALSA(QObject *parent) : VolumeControl(parent)
 {
     //alsa mixer
     mixer = 0;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString card = settings.value("ALSA/mixer_card","hw:0").toString();
     QString dev = settings.value("ALSA/mixer_device", "PCM").toString();
     setupMixer(card, dev);
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index 2062c6584..f4025a9dc 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -18,7 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 extern "C"
 {
@@ -36,7 +37,7 @@ SettingsDialog::SettingsDialog ( QWidget *parent )
     getCards();
     connect (ui.deviceComboBox, SIGNAL(activated(int)),SLOT(setText(int)));
     connect(ui.mixerCardComboBox, SIGNAL(activated(int)), SLOT(showMixerDevices(int)));
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ALSA");
     ui.deviceComboBox->setEditText(settings.value("device","default").toString());
     ui.bufferSpinBox->setValue(settings.value("buffer_time",500).toInt());
@@ -181,7 +182,7 @@ void SettingsDialog::setText(int n)
 void SettingsDialog::accept()
 {
     qDebug("SettingsDialog (ALSA):: writeSettings()");
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ALSA");
     settings.setValue("device", ui.deviceComboBox->currentText ());
     settings.setValue("buffer_time",ui.bufferSpinBox->value());
diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp
index 90c3c9ac6..28746d1d9 100644
--- a/src/plugins/Visual/analyzer/analyzer.cpp
+++ b/src/plugins/Visual/analyzer/analyzer.cpp
@@ -37,7 +37,7 @@
 Analyzer::Analyzer (QWidget *parent)
         : Visual (parent), m_fps ( 20 )
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     restoreGeometry(settings.value("Analyzer/geometry").toByteArray());
     setFixedSize(2*300-30,105);
     m_pixmap = QPixmap (75,20);
@@ -178,7 +178,7 @@ void Analyzer::showEvent (QShowEvent *)
 void Analyzer::closeEvent (QCloseEvent *event)
 {
     //save geometry
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("Analyzer/geometry", saveGeometry());
     Visual::closeEvent(event); //removes visualization before class deleting
 }
diff --git a/src/plugins/Visual/analyzer/settingsdialog.cpp b/src/plugins/Visual/analyzer/settingsdialog.cpp
index 479e1f299..8ad1ec603 100644
--- a/src/plugins/Visual/analyzer/settingsdialog.cpp
+++ b/src/plugins/Visual/analyzer/settingsdialog.cpp
@@ -19,7 +19,8 @@
  ***************************************************************************/
 
 #include <QSettings>
-#include <QDir>
+
+#include <qmmp/qmmp.h>
 
 #include "settingsdialog.h"
 
@@ -27,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
  : QDialog(parent)
 {
     ui.setupUi(this);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     ui.analyzerComboBox->setCurrentIndex(settings.value("Analyzer/analyzer_falloff", 3).toInt()-1);
     ui.peaksCheckBox->setChecked(settings.value("Analyzer/show_peaks", TRUE).toBool());
     ui.peaksComboBox->setCurrentIndex(settings.value("Analyzer/peaks_falloff", 3).toInt()-1);
@@ -46,7 +47,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("Analyzer/analyzer_falloff", ui.analyzerComboBox->currentIndex() + 1);
     settings.setValue("Analyzer/peaks_falloff", ui.peaksComboBox->currentIndex() + 1);
     settings.setValue("Analyzer/refresh_rate", ui.fpsComboBox->currentIndex() + 1);