global config file path

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

14 files changed, 37 insertions, 33 deletions

diff --git a/src/ui/addurldialog.cpp b/src/ui/addurldialog.cpp
index 581aa9cac..61ba12eb5 100644
--- a/src/ui/addurldialog.cpp
+++ b/src/ui/addurldialog.cpp
@@ -27,6 +27,7 @@
 #include <qmmpui/playlistparser.h>
 #include <qmmpui/playlistformat.h>
 #include <qmmpui/playlistmodel.h>
+#include <qmmp/qmmp.h>
 
 #define HISTORY_SIZE 10
 
@@ -35,7 +36,7 @@ AddUrlDialog::AddUrlDialog( QWidget * parent, Qt::WindowFlags f) : QDialog(paren
     setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
     setAttribute(Qt::WA_QuitOnClose, FALSE);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_history = settings.value("URLDialog/history").toStringList();
     urlComboBox->addItems(m_history);
     m_http = new QHttp(this);
@@ -62,7 +63,7 @@ AddUrlDialog::~AddUrlDialog()
 {
     if ( m_history.size() > HISTORY_SIZE)
         m_history.removeLast();
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("URLDialog/history", m_history);
     m_http->close();
 }
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index d1a25ef1f..1b0afa273 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -96,7 +96,7 @@ ConfigDialog::~ConfigDialog()
 
 void ConfigDialog::readSettings()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     ui.formatLineEdit->setText(
         settings.value ("PlayList/title_format", "%p - %t").toString());
     ui.metadataCheckBox->setChecked(
@@ -371,7 +371,7 @@ void ConfigDialog::loadPluginsInfo()
 
 void ConfigDialog::loadFonts()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QString fontname = settings.value ( "PlayList/Font","" ).toString();
     QFont font;
     font.fromString(fontname);
@@ -393,7 +393,7 @@ void ConfigDialog::setPlFont()
     {
         ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
         ui.plFontLabel->setFont(font);
-        QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+        QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
         settings.setValue ( "PlayList/Font", font.toString() );
     }
 }
@@ -407,7 +407,7 @@ void ConfigDialog::setMainFont()
     {
         ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
         ui.mainFontLabel->setFont(font);
-        QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+        QSettings settings ( Qmmp::configFile(), QSettings::IniFormat );
         settings.setValue ( "MainWindow/Font", font.toString() );
     }
 }
@@ -538,7 +538,7 @@ void ConfigDialog::addTitleString( QAction * a)
 
 void ConfigDialog::saveSettings()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue ("PlayList/title_format", ui.formatLineEdit->text().trimmed());
     settings.setValue ("PlayList/load_metadata", ui.metadataCheckBox->isChecked());
     settings.setValue ("PlayList/convert_underscore", ui.underscoresCheckBox->isChecked());
diff --git a/src/ui/display.cpp b/src/ui/display.cpp
index 13a85989e..fc9b2b9bb 100644
--- a/src/ui/display.cpp
+++ b/src/ui/display.cpp
@@ -156,7 +156,7 @@ MainDisplay::MainDisplay (QWidget *parent)
 
 MainDisplay::~MainDisplay()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue ("Playlist/visible",m_plButton->isChecked());
     settings.setValue ("Equalizer/visible",m_eqButton->isChecked());
 }
diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp
index a007a0763..873cd5dc8 100644
--- a/src/ui/eqtitlebar.cpp
+++ b/src/ui/eqtitlebar.cpp
@@ -48,7 +48,7 @@ EqTitleBar::EqTitleBar(QWidget *parent)
     m_shade = new Button(this, Skin::EQ_BT_SHADE1_N, Skin::EQ_BT_SHADE1_P);
     connect(m_shade, SIGNAL(clicked()), SLOT(shade()));
     m_shade->move(254,3);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     if (settings.value("Equalizer/shaded", FALSE).toBool())
         shade();
     else
@@ -61,7 +61,7 @@ EqTitleBar::EqTitleBar(QWidget *parent)
 
 EqTitleBar::~EqTitleBar()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("Equalizer/shaded", m_shaded);
 }
 
diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index 860830146..bc9f96467 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -131,7 +131,7 @@ void EqWidget::updateSkin()
 
 void EqWidget::readSettings()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup ("Equalizer");
     //geometry
     move (settings.value ("pos", QPoint (100, 216)).toPoint());
@@ -193,7 +193,7 @@ void EqWidget::readSettings()
 
 void EqWidget::writeSettings()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup ("Equalizer");
     //geometry
     settings.setValue ("pos", this->pos());
diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp
index 8590a1b2a..5743fdd55 100644
--- a/src/ui/listwidget.cpp
+++ b/src/ui/listwidget.cpp
@@ -66,7 +66,7 @@ ListWidget::~ListWidget()
 
 void ListWidget::readSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString fontname = settings.value("PlayList/Font","").toString();
     m_font.fromString(fontname);
     m_show_protocol = settings.value ("PlayList/show_protocol", FALSE).toBool();
diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp
index 0779c93d2..b56a9d017 100644
--- a/src/ui/mainvisual.cpp
+++ b/src/ui/mainvisual.cpp
@@ -61,7 +61,7 @@ MainVisual::MainVisual (QWidget *parent)
 
 MainVisual::~MainVisual()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     if (m_vis)
     {
         settings.setValue("Visualization/type",m_vis->name());
@@ -242,7 +242,7 @@ void MainVisual::updateSettings()
     else
         m_timer->setInterval (40);
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     act = m_peaksFalloffGroup->checkedAction ();
     if (act)
         settings.setValue("Visualization/peaks_falloff", act->data().toInt());
@@ -376,7 +376,7 @@ void MainVisual::createMenu()
 
 void MainVisual::readSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
 
     QString name = settings.value("Visualization/type","Analyzer").toString();
     m_visModeGroup->actions ()[0]->setChecked(TRUE);
@@ -435,7 +435,7 @@ Analyzer::Analyzer()
     double peaks_speed[] = { 0.05, 0.1, 0.2, 0.4, 0.8 };
     double analyzer_speed[] = { 1.2, 1.8, 2.2, 2.8, 2.4 };
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_peaks_falloff =
         peaks_speed[settings.value("Visualization/peaks_falloff", 3).toInt()-1];
     m_analyzer_falloff =
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 3f7b996e4..146e2e6cc 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -314,7 +314,7 @@ void MainWindow::changeEvent (QEvent * event)
 
 void MainWindow::readSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     if (!m_update)
     {
         settings.beginGroup("MainWindow");
@@ -348,7 +348,7 @@ void MainWindow::readSettings()
 
 void MainWindow::writeSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("MainWindow");
     //geometry
     settings.setValue("pos", this->pos());
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index a6718ab74..866fdcf33 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -399,7 +399,7 @@ void PlayList::readSettings()
     }
     else
     {
-        QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+        QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
         settings.beginGroup ("PlayList");
         //position
         move (settings.value ("pos", QPoint (100, 332)).toPoint());
@@ -411,7 +411,7 @@ void PlayList::readSettings()
 
 void PlayList::writeSettings()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup ("PlayList");
     //position
     settings.setValue ("pos", this->pos());
diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp
index 73e66f881..2e3b154ac 100644
--- a/src/ui/playlisttitlebar.cpp
+++ b/src/ui/playlisttitlebar.cpp
@@ -53,7 +53,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent)
     resize(275,20);
     setMinimumWidth(275);
     readSettings();
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     m_pl->resize (settings.value ("PlayList/size", QSize (275, 116)).toSize());
     if (settings.value ("PlayList/shaded", FALSE).toBool())
         shade();
@@ -64,7 +64,7 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent)
 
 PlayListTitleBar::~PlayListTitleBar()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue ("PlayList/size", QSize (m_pl->width(), m_shaded ? m_height:m_pl->height()));
     settings.setValue ("PlayList/shaded", m_shaded);
 }
@@ -209,7 +209,7 @@ void PlayListTitleBar::setModel(PlayListModel *model)
 
 void PlayListTitleBar::readSettings()
 {
-    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QString fontname = settings.value("PlayList/Font","").toString();
     if (fontname.isEmpty ())
         fontname = QFont("Helvetica [Cronyx]", 8).toString();
diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp
index b66ab05d0..535af46d6 100644
--- a/src/ui/skin.cpp
+++ b/src/ui/skin.cpp
@@ -29,6 +29,7 @@
 #include <QImage>
 #include <QBuffer>
 
+#include <qmmp/qmmp.h>
 #include "skin.h"
 
 Skin *Skin::pointer = 0;
@@ -60,7 +61,7 @@ Skin::Skin (QObject *parent)
         : QObject (parent)
 {
     pointer = this;
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString path = settings.value("skin_path","").toString();
     if (path.isEmpty() || !QDir(path).exists ())
         path = ":/default";
@@ -76,7 +77,7 @@ Skin::~Skin()
 
 void Skin::setSkin (const QString& path)
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("skin_path",path);
 
     qDebug ("Skin: set skin %s",qPrintable(path));    //TODO don't clear lists
diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp
index 536778e62..fe92a25f0 100644
--- a/src/ui/textscroller.cpp
+++ b/src/ui/textscroller.cpp
@@ -24,6 +24,7 @@
 #include <QMenu>
 #include <QMouseEvent>
 #include <QSettings>
+#include <qmmp/qmmp.h>
 
 #include "skin.h"
 #include "textscroller.h"
@@ -63,7 +64,7 @@ TextScroller::TextScroller ( QWidget *parent )
     autoscrollAction->setCheckable (TRUE);
     connect(autoscrollAction, SIGNAL(toggled(bool)), SLOT(setAutoscroll(bool)));
     m_menu->addAction(autoscrollAction);
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     autoscrollAction->setChecked(settings.value("TextScroller/autoscroll", TRUE).toBool());
     setAutoscroll(autoscrollAction->isChecked());
 }
@@ -71,7 +72,7 @@ TextScroller::TextScroller ( QWidget *parent )
 
 TextScroller::~TextScroller()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("TextScroller/autoscroll", m_autoscroll);
 }
 
@@ -123,7 +124,7 @@ void TextScroller::setAutoscroll(bool enabled)
 
 void TextScroller::readSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     QString fontname = settings.value("MainWindow/Font","").toString();
     m_font.fromString(fontname);
 
diff --git a/src/ui/timeindicator.cpp b/src/ui/timeindicator.cpp
index 9b81ba040..111ed2d07 100644
--- a/src/ui/timeindicator.cpp
+++ b/src/ui/timeindicator.cpp
@@ -20,6 +20,7 @@
 #include <QPainter>
 #include <QSettings>
 #include <QMouseEvent>
+#include <qmmp/qmmp.h>
 
 #include "skin.h"
 #include "timeindicator.h"
@@ -97,7 +98,7 @@ void TimeIndicator::updateSkin()
 
 void TimeIndicator::readSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Display");
     m_elapsed  = settings.value("Elapsed",true).toBool();
     settings.endGroup();
@@ -106,7 +107,7 @@ void TimeIndicator::readSettings()
 
 void TimeIndicator::writeSettings()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Display");
     settings.setValue("Elapsed",m_elapsed);
     settings.endGroup();
diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp
index d91bb3032..00a59e1bc 100644
--- a/src/ui/titlebar.cpp
+++ b/src/ui/titlebar.cpp
@@ -57,7 +57,7 @@ TitleBar::TitleBar(QWidget *parent)
     setActive(FALSE);
     connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
 
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     if (settings.value("Display/shaded", FALSE).toBool())
         shade();
     else
@@ -68,7 +68,7 @@ TitleBar::TitleBar(QWidget *parent)
 
 TitleBar::~TitleBar()
 {
-    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.setValue("Display/shaded", m_shaded);
 }