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

3 files changed, 12 insertions, 12 deletions

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()