aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/General/converter/converterdialog.cpp6
-rw-r--r--src/plugins/General/scrobbler/scrobbler.cpp2
-rw-r--r--src/plugins/Ui/skinned/eqwidget.cpp8
-rw-r--r--src/plugins/Ui/skinned/skin.cpp2
-rw-r--r--src/plugins/Ui/skinned/skinnedsettings.cpp6
-rw-r--r--src/plugins/Ui/skinned/skinreader.cpp16
6 files changed, 20 insertions, 20 deletions
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index cd602b389..ab75ed07f 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -53,7 +53,7 @@ ConverterDialog::ConverterDialog(QList <PlayListTrack *> items, QWidget *parent
createMenus();
readPresets(":/converter/presets.conf");
- readPresets(QDir::homePath() + "/.qmmp/converter/presets.conf");
+ readPresets(Qmmp::configDir() + "converter/presets.conf");
}
ConverterDialog::~ConverterDialog()
@@ -233,10 +233,10 @@ void ConverterDialog::readPresets(const QString &path)
void ConverterDialog::savePresets()
{
- QDir dir(QDir::homePath() + "/.qmmp/");
+ QDir dir(Qmmp::configDir());
dir.mkdir("converter");
- QFile file(QDir::homePath() + "/.qmmp/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/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index 065c55f38..852cbe4ea 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -88,7 +88,7 @@ Scrobbler::Scrobbler(const QString &scrobblerUrl, const QString &name, QObject *
m_name = name;
m_state = Qmmp::Stopped;
m_time = new QTime();
- m_cache = new ScrobblerCache(QDir::homePath() +"/.qmmp/scrobbler_"+name+".cache");
+ m_cache = new ScrobblerCache(Qmmp::configDir() +"scrobbler_"+name+".cache");
m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toAscii();
m_http = new QNetworkAccessManager(this);
m_core = SoundCore::instance();
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index e6a1ef470..a9f5bd895 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -146,7 +146,7 @@ void EqWidget::readSettings()
move (settings.value ("Skinned/eq_pos", QPoint (100, 216)).toPoint()); //geometry
readEq();
//equalizer presets
- QString preset_path = QDir::homePath() +"/.qmmp/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);
@@ -170,7 +170,7 @@ void EqWidget::readSettings()
break;
}
//equalizer auto-load presets
- QSettings eq_auto (QDir::homePath() +"/.qmmp/eq.auto_preset", QSettings::IniFormat);
+ QSettings eq_auto (Qmmp::configDir() + "eq.auto_preset", QSettings::IniFormat);
for (int i = 1; true; ++i)
{
if (eq_auto.contains(QString("Presets/Preset%1").arg(i)))
@@ -197,7 +197,7 @@ void EqWidget::writeSettings()
QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
settings.setValue ("Skinned/eq_pos", this->pos()); //geometry
//equalizer presets
- QSettings eq_preset (QDir::homePath() +"/.qmmp/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)
{
@@ -211,7 +211,7 @@ void EqWidget::writeSettings()
eq_preset.endGroup();
}
//equalizer auto-load presets
- QSettings eq_auto (QDir::homePath() +"/.qmmp/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/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 0ea43e756..da606572e 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -68,7 +68,7 @@ Skin::Skin (QObject *parent) : QObject (parent)
ACTION(ActionManager::WM_DOUBLE_SIZE)->setChecked(m_double_size);
setSkin (QDir::cleanPath(path));
/* skin directory */
- QDir skinDir(QDir::homePath()+"/.qmmp");
+ QDir skinDir(Qmmp::configDir());
skinDir.mkdir ("skins");
}
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index bf43d74ad..b068e2e80 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(QDir::homePath() +"/.qmmp/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(QDir::homePath() +"/.qmmp/skins/" + QFileInfo(path).fileName());
+ file.copy(Qmmp::configDir() + "skins/" + QFileInfo(path).fileName());
}
loadSkins();
}
@@ -214,7 +214,7 @@ void SkinnedSettings::loadSkins()
m_ui.listWidget->addItem (item);
m_skinList << fileInfo;
- findSkins(QDir::homePath() +"/.qmmp/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 a7caebb26..e2ff0f504 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2012 by Ilya Kotov *
+ * Copyright (C) 2008-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -25,7 +25,7 @@
#include <QByteArray>
#include <QApplication>
#include <QFile>
-
+#include <qmmp/qmmp.h>
#include "skinreader.h"
SkinReader::SkinReader(QObject *parent)
@@ -33,7 +33,7 @@ SkinReader::SkinReader(QObject *parent)
{
m_process = new QProcess(this);
//create cache dir
- QDir dir(QDir::homePath() +"/.qmmp/");
+ QDir dir(Qmmp::configDir());
dir.mkdir("cache");
dir.cd("cache");
dir.mkdir("thumbs");
@@ -46,7 +46,7 @@ SkinReader::~SkinReader()
void SkinReader::generateThumbs()
{
m_previewMap.clear();
- QDir dir(QDir::homePath() +"/.qmmp/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(QDir::homePath() +"/.qmmp/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,16 +123,16 @@ void SkinReader::generateThumbs()
void SkinReader::unpackSkin(const QString &path)
{
//remove old skin
- QDir dir(QDir::homePath() +"/.qmmp/cache/skin");
+ QDir dir(Qmmp::configDir() + "cache/skin");
dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
QFileInfoList f = dir.entryInfoList();
foreach(QFileInfo file, f)
dir.remove(file.fileName());
//unpack
if (path.endsWith(".tgz") || path.endsWith(".tar.gz") || path.endsWith(".tar.bz2"))
- untar(path, QDir::homePath() +"/.qmmp/cache/skin", false);
+ untar(path, Qmmp::configDir() + "cache/skin", false);
if (path.endsWith(".zip") || path.endsWith(".wsz"))
- unzip(path, QDir::homePath() +"/.qmmp/cache/skin", false);
+ unzip(path, Qmmp::configDir() + "cache/skin", false);
}
const QStringList SkinReader::skins()
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 17:10:49 +0000