diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-07-05 19:43:17 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-07-05 19:43:17 +0200 |
| commit | 7b04f55feb0d50e03d013b2be0ec555d363a40b2 (patch) | |
| tree | 589da3860728c7328161810e8893d7dbe6e664a0 /src/hdpisupport.cpp | |
| parent | 42be0eb4f1d7a25dca97e8e2eb4ec4d03b7931fb (diff) | |
Imported Upstream version 16.7.0~ds0
Diffstat (limited to 'src/hdpisupport.cpp')
| -rw-r--r-- | src/hdpisupport.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/hdpisupport.cpp b/src/hdpisupport.cpp index 68bbf2e..c5b950b 100644 --- a/src/hdpisupport.cpp +++ b/src/hdpisupport.cpp @@ -20,12 +20,6 @@ #include <QSettings> #include <QApplication> -#if QT_VERSION >= 0x050000 -#include <QStandardPaths> -#else -#include <QDesktopServices> -#endif - //#define DEBUG #ifdef DEBUG @@ -55,15 +49,7 @@ HDPISupport::HDPISupport(const QString & config_path) #ifdef HDPI_STORE_DATA set = 0; - if (!config_path.isEmpty()) { - setConfigPath(config_path); - } else { - #if QT_VERSION >= 0x050000 - setConfigPath(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)); - #else - setConfigPath(QDesktopServices::storageLocation(QDesktopServices::TempLocation)); - #endif - } + setConfigPath(config_path); #else apply(); #endif @@ -91,11 +77,11 @@ void HDPISupport::setConfigPath(const QString & config_path) { } if (!config_path.isEmpty()) { - ini_file = config_path + "/smplayerhdpi.ini"; + QString inifile = config_path + "/hdpi.ini"; #ifdef DEBUG - qDebug() << "HDPISupport::setConfigPath: ini file:" << ini_file; + qDebug() << "HDPISupport::setConfigPath: ini file:" << inifile; #endif - set = new QSettings(ini_file, QSettings::IniFormat); + set = new QSettings(inifile, QSettings::IniFormat); load(); } |