From 5ad76bb13ecc29aeb5b2b71cb33a00add44c5b35 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Wed, 25 Sep 2019 00:30:25 +0800 Subject: Use QStandardPaths. RIP Windows users. --- ChangeLog | 5 +++++ qmidiplayer-desktop/qmpplistwindow.cpp | 5 +++-- qmidiplayer-desktop/qmpsettingswindow.cpp | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bab77a9..842fa4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-09-25 0.8.7 indev +Use QStandardPaths. + +RIP Windows users. + 2019-09-16 0.8.7 indev Use QCommandLineParser to parse arguments. diff --git a/qmidiplayer-desktop/qmpplistwindow.cpp b/qmidiplayer-desktop/qmpplistwindow.cpp index 667682e..b4b0c02 100644 --- a/qmidiplayer-desktop/qmpplistwindow.cpp +++ b/qmidiplayer-desktop/qmpplistwindow.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "qmpplistwindow.hpp" #include "ui_qmpplistwindow.h" #include "qmpmainwindow.hpp" @@ -24,7 +25,7 @@ qmpPlistWindow::qmpPlistWindow(QWidget *parent) : repeat=0;shuffle=0; if(qmpSettingsWindow::getSettingsIntf()->value("Behavior/RestorePlaylist","").toInt()) { - QSettings* plist=new QSettings(QDir::homePath()+QString("/.config/qmpplist"), + QSettings* plist=new QSettings(QStandardPaths::writableLocation(QStandardPaths::StandardLocation::ConfigLocation)+QString("/qmpplist"), QSettings::IniFormat); int fc=plist->value("Playlist/FileCount",0).toInt(); ui->lwFiles->clear();for(int i=1;i<=fc;++i) @@ -113,7 +114,7 @@ void qmpPlistWindow::closeEvent(QCloseEvent *event) } if(qmpMainWindow::getInstance()->isFinalizing()&&qmpSettingsWindow::getSettingsIntf()->value("Behavior/RestorePlaylist","").toInt()) { - QSettings* plist=new QSettings(QDir::homePath()+QString("/.config/qmpplist"), + QSettings* plist=new QSettings(QStandardPaths::writableLocation(QStandardPaths::StandardLocation::ConfigLocation)+QString("/qmpplist"), QSettings::IniFormat); plist->setValue("Playlist/FileCount",ui->lwFiles->count()); for(int i=0;ilwFiles->count();++i) diff --git a/qmidiplayer-desktop/qmpsettingswindow.cpp b/qmidiplayer-desktop/qmpsettingswindow.cpp index 5c5c7b0..bb0ba05 100644 --- a/qmidiplayer-desktop/qmpsettingswindow.cpp +++ b/qmidiplayer-desktop/qmpsettingswindow.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "qmpsettingswindow.hpp" #include "ui_qmpsettingswindow.h" #include "qmpmainwindow.hpp" @@ -23,7 +24,7 @@ qmpSettingsWindow::qmpSettingsWindow(QWidget *parent) : { ui->setupUi(this);customOptions.clear();customOptPages.clear(); connect(this,&qmpSettingsWindow::dialogClosing,(qmpMainWindow*)parent,&qmpMainWindow::dialogClosed); - settings=new QSettings(QDir::homePath()+QString("/.config/qmprc"),QSettings::IniFormat); + settings=new QSettings(QStandardPaths::writableLocation(QStandardPaths::StandardLocation::ConfigLocation)+QString("/qmprc"),QSettings::IniFormat); settingsInit();outwidget=ui->cbOutputDevice; ui->pbAdd->setIcon(QIcon(getThemedIcon(":/img/add.svg"))); ui->pbRemove->setIcon(QIcon(getThemedIcon(":/img/remove.svg"))); -- cgit v1.2.3