From ae75e5707576d04f8aa6c7f6e1bb59a63149b6db Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 24 Dec 2008 18:38:45 +0000
Subject: global config file path

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@702 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/notifier/notifier.cpp         | 2 +-
 src/plugins/General/notifier/popupwidget.cpp      | 2 +-
 src/plugins/General/notifier/settingsdialog.cpp   | 7 ++++---
 src/plugins/General/statusicon/settingsdialog.cpp | 7 ++++---
 src/plugins/General/statusicon/statusicon.cpp     | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/plugins/General')

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();
-- 
cgit v1.2.3-13-gbd6f