changed Qmmp::configDir() output: do not add slash at the end of path

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

11 files changed, 27 insertions, 29 deletions

diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index eb4f39e1f..8fdb9390b 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -81,7 +81,7 @@ ConverterDialog::ConverterDialog(QList <PlayListTrack *> tracks,  QWidget *paren
     createMenus();
 
     readPresets(":/converter/presets.conf");
-    readPresets(Qmmp::configDir() + "converter/presets.conf");
+    readPresets(Qmmp::configDir() + "/converter/presets.conf");
 }
 
 ConverterDialog::~ConverterDialog()
@@ -302,7 +302,7 @@ void ConverterDialog::savePresets()
     QDir dir(Qmmp::configDir());
     dir.mkdir("converter");
 
-    QFile file(Qmmp::configDir() + "converter/presets.conf");
+    QFile file(Qmmp::configDir() + "/converter/presets.conf");
     if(!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
     {
         qWarning("ConverterDialog: unable to save presets; error %s", qPrintable(file.errorString()));
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index d914e1630..39626c1ec 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -38,7 +38,7 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget
     setAttribute(Qt::WA_DeleteOnClose);
     setAttribute(Qt::WA_QuitOnClose, false);
     m_requestReply = 0;
-    m_cachePath = Qmmp::configDir() + "lyrics/";
+    m_cachePath = Qmmp::configDir() + "/lyrics/";
     m_ui.artistLineEdit->setText(artist);
     m_ui.titleLineEdit->setText(title);
     m_http = new QNetworkAccessManager(this);
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index 2652e3523..468a88bd6 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -90,7 +90,7 @@ Scrobbler::Scrobbler(const QString &scrobblerUrl, const QString &name, QObject *
     m_scrobblerUrl = scrobblerUrl;
     m_name = name;
     m_time = new QTime();
-    m_cache = new ScrobblerCache(Qmmp::configDir() +"scrobbler_"+name+".cache");
+    m_cache = new ScrobblerCache(Qmmp::configDir() +"/scrobbler_"+name+".cache");
     m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toLatin1();
     m_http = new QNetworkAccessManager(this);
     m_core = SoundCore::instance();
diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp
index 8a135429b..2cf410b37 100644
--- a/src/plugins/Input/sid/decodersidfactory.cpp
+++ b/src/plugins/Input/sid/decodersidfactory.cpp
@@ -38,7 +38,7 @@ DecoderSIDFactory::DecoderSIDFactory()
     settings.beginGroup("SID");
     if(settings.value("use_hvsc", false).toBool())
     {
-        QString default_path = Qmmp::configDir() + "Songlengths.txt";
+        QString default_path = Qmmp::configDir() + "/Songlengths.txt";
         if(!m_db.open(qPrintable(settings.value("hvsc_path", default_path).toString())))
             qWarning("DecoderSIDFactory: %s", m_db.error());
     }
diff --git a/src/plugins/Input/sid/settingsdialog.cpp b/src/plugins/Input/sid/settingsdialog.cpp
index 5d8f733be..dc247d97b 100644
--- a/src/plugins/Input/sid/settingsdialog.cpp
+++ b/src/plugins/Input/sid/settingsdialog.cpp
@@ -34,7 +34,7 @@ SettingsDialog::SettingsDialog(SidDatabase *db, QWidget *parent) : QDialog(paren
     settings.beginGroup("SID");
 
     m_ui.useHVSCCheckBox->setChecked(settings.value("use_hvsc", false).toBool());
-    QString hvsc_default_path = Qmmp::configDir() + "Songlengths.txt";
+    QString hvsc_default_path = Qmmp::configDir() + "/Songlengths.txt";
     m_ui.hvscPathLineEdit->setText(settings.value("hvsc_path", hvsc_default_path).toString());
     m_ui.defaultLengthSpinBox->setValue(settings.value("song_length", 180).toInt());
 
diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index e546587b2..c494217af 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -140,7 +140,7 @@ void Equalizer::loadPresets()
 {
     m_presetComboBox->clear();
     //equalizer presets
-    QString preset_path = Qmmp::configDir() + "eq15.preset";
+    QString preset_path = Qmmp::configDir() + "/eq15.preset";
     if(!QFile::exists(preset_path))
         preset_path = ":/qsui/eq15.preset";
     QSettings eq_preset (preset_path, QSettings::IniFormat);
@@ -243,7 +243,7 @@ void Equalizer::savePreset()
 
 void Equalizer::savePresets()
 {
-    QSettings eq_preset (Qmmp::configDir() + "eq15.preset", QSettings::IniFormat);
+    QSettings eq_preset (Qmmp::configDir() + "/eq15.preset", QSettings::IniFormat);
     eq_preset.clear ();
     for (int i = 0; i < m_presets.size(); ++i)
     {
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index f11074bfb..dfa24aaf1 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -159,7 +159,7 @@ void EqWidget::readSettings()
     readEq();
     m_autoButton->setChecked(settings.value("Skinned/eq_auto", false).toBool());
     //equalizer presets
-    QString preset_path = Qmmp::configDir() + "eq.preset";
+    QString preset_path = Qmmp::configDir() + "/eq.preset";
     if(!QFile::exists(preset_path))
         preset_path = ":/skinned/eq.preset";
     QSettings eq_preset (preset_path, QSettings::IniFormat);
@@ -179,7 +179,7 @@ void EqWidget::readSettings()
         eq_preset.endGroup();
     }
     //equalizer auto-load presets
-    QSettings eq_auto (Qmmp::configDir() + "eq.auto_preset", QSettings::IniFormat);
+    QSettings eq_auto (Qmmp::configDir() + "/eq.auto_preset", QSettings::IniFormat);
     i = 0;
     while(eq_auto.contains(QString("Presets/Preset%1").arg(++i)))
     {
@@ -203,7 +203,7 @@ void EqWidget::writeSettings()
     settings.setValue ("Skinned/eq_pos", this->pos()); //geometry
     settings.setValue ("Skinned/eq_auto", m_autoButton->isChecked());
     //equalizer presets
-    QSettings eq_preset (Qmmp::configDir() + "eq.preset", QSettings::IniFormat);
+    QSettings eq_preset (Qmmp::configDir() + "/eq.preset", QSettings::IniFormat);
     eq_preset.clear ();
     for (int i = 0; i < m_presets.size(); ++i)
     {
@@ -217,7 +217,7 @@ void EqWidget::writeSettings()
         eq_preset.endGroup();
     }
     //equalizer auto-load presets
-    QSettings eq_auto (Qmmp::configDir() + "eq.auto_preset", QSettings::IniFormat);
+    QSettings eq_auto (Qmmp::configDir() + "/eq.auto_preset", QSettings::IniFormat);
     eq_auto.clear();
     for (int i = 0; i < m_autoPresets.size(); ++i)
     {
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index a2b75d29d..aff96afa1 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -62,7 +62,7 @@ void SkinnedSettings::on_listWidget_itemClicked(QListWidgetItem *)
     else if (m_skinList.at (row).isFile())
     {
         m_reader->unpackSkin(m_skinList.at (row).canonicalFilePath());
-        m_skin->setSkin(Qmmp::configDir() + "cache/skin");
+        m_skin->setSkin(Qmmp::configDir() + "/cache/skin");
     }
     if(m_ui.listWidget->currentItem())
         m_currentSkinName = m_ui.listWidget->currentItem()->text();
@@ -122,7 +122,7 @@ void SkinnedSettings::on_skinInstallButton_clicked()
     foreach(QString path, files)
     {
         QFile file(path);
-        file.copy(Qmmp::configDir() + "skins/" + QFileInfo(path).fileName());
+        file.copy(Qmmp::configDir() + "/skins/" + QFileInfo(path).fileName());
     }
     loadSkins();
 }
@@ -197,7 +197,7 @@ void SkinnedSettings::loadSkins()
     m_ui.listWidget->addItem (item);
     m_skinList << fileInfo;
 
-    findSkins(Qmmp::configDir() + "skins");
+    findSkins(Qmmp::configDir() + "/skins");
 #if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)
     findSkins(qApp->applicationDirPath()+"/skins");
 #else
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index 160e9b4d4..e6e5da859 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -46,7 +46,7 @@ SkinReader::~SkinReader()
 void SkinReader::generateThumbs()
 {
     m_previewMap.clear();
-    QDir dir(Qmmp::configDir() + "skins");
+    QDir dir(Qmmp::configDir() + "/skins");
     dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     QFileInfoList f = dir.entryInfoList();
 #if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)
@@ -56,7 +56,7 @@ void SkinReader::generateThumbs()
 #endif
     dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     f << dir.entryInfoList();
-    QDir cache_dir(Qmmp::configDir() + "cache/thumbs");
+    QDir cache_dir(Qmmp::configDir() + "/cache/thumbs");
     cache_dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     QFileInfoList d = cache_dir.entryInfoList();
     //clear removed skins from cache
@@ -123,7 +123,7 @@ void SkinReader::generateThumbs()
 void SkinReader::unpackSkin(const QString &path)
 {
     //remove old skin
-    QDir dir(Qmmp::configDir() + "cache/skin");
+    QDir dir(Qmmp::configDir() + "/cache/skin");
     dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     QFileInfoList f = dir.entryInfoList();
     foreach(QFileInfo file, f)
@@ -131,9 +131,9 @@ void SkinReader::unpackSkin(const QString &path)
     //unpack
     QString name = QFileInfo(path).fileName().toLower();
     if (name.endsWith(".tgz") || name.endsWith(".tar.gz") || name.endsWith(".tar.bz2"))
-        untar(path, Qmmp::configDir() + "cache/skin", false);
+        untar(path, Qmmp::configDir() + "/cache/skin", false);
     else if (name.endsWith(".zip") || name.endsWith(".wsz"))
-        unzip(path, Qmmp::configDir() + "cache/skin", false);
+        unzip(path, Qmmp::configDir() + "/cache/skin", false);
 }
 
 const QStringList SkinReader::skins()
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 44f404e15..9c0e3e8fb 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,7 +41,7 @@ QString Qmmp::m_appDir;
 
 const QString Qmmp::configFile()
 {
-    return configDir() + "qmmprc";
+    return configDir() + "/qmmprc";
 }
 
 const QString Qmmp::configDir()
@@ -50,22 +50,20 @@ const QString Qmmp::configDir()
     if(m_configDir.isEmpty())
     {
         if(isPortable())
-            return m_appDir + "/.qmmp/";
+            return m_appDir + "/.qmmp";
         else
-            return  QDir::homePath() +"/.qmmp/";
+            return  QDir::homePath() +"/.qmmp";
     }
     else
         return m_configDir;
 #else
-    return m_configDir.isEmpty() ? QDir::homePath() +"/.qmmp/" : m_configDir;
+    return m_configDir.isEmpty() ? QDir::homePath() +"/.qmmp" : m_configDir;
 #endif
 }
 
 void Qmmp::setConfigDir(const QString &path)
 {
     m_configDir = path;
-    if(!m_configDir.endsWith('/'))
-        m_configDir.append('/');
 }
 
 const QString Qmmp::strVersion()
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index bef8d567c..dfa4c4127 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -241,7 +241,7 @@ void PlayListManager::readPlayLists()
     QString line, param, value;
     int s = 0, current = 0, pl = 0;
     QList <PlayListTrack *> tracks;
-    QFile file(Qmmp::configDir() + "playlist.txt");
+    QFile file(Qmmp::configDir() + "/playlist.txt");
     file.open(QIODevice::ReadOnly);
     QByteArray array = file.readAll();
     file.close();
@@ -330,7 +330,7 @@ void PlayListManager::readPlayLists()
 void PlayListManager::writePlayLists()
 {
     qDebug("PlayListManager: saving playlists...");
-    QString plFilePath = Qmmp::configDir() + "playlist.txt";
+    QString plFilePath = Qmmp::configDir() + "/playlist.txt";
     QSaveFile plFile(plFilePath);
     if(!plFile.open(QIODevice::WriteOnly))
     {