summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-03 14:42:33 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-03 14:42:33 +0200
commit9201417e9973f901a39195507cf2935a529e821e (patch)
tree8cb23efc9ec1b62cb403d738ee6d47584a142cd0 /ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp
parent6aa89934e8f22a580dc8a63cec61fb9ea9d14f23 (diff)
fix msvc empty config list
Some MSVC 2015RC bug with static initialized const char*. But reproduced also in #179 (?)
Diffstat (limited to 'ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp')
-rw-r--r--ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp
index 017a8f0a..80543e7a 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_settings.cpp
@@ -36,12 +36,12 @@
void TrackerSettings::load_ini()
{
#ifdef OPENTRACK_API
- QSettings settings(options::group::org); // Registry settings (in HK_USER)
+ QSettings settings(OPENTRACK_ORG); // Registry settings (in HK_USER)
#else
QSettings settings("opentrack"); // Registry settings (in HK_USER)
#endif
#ifdef OPENTRACK_API
- QString currentFile = settings.value( options::group::filename_key, QCoreApplication::applicationDirPath() + options::group::default_path ).toString();
+ QString currentFile = settings.value( OPENTRACK_CONFIG_FILENAME_KEY, QCoreApplication::applicationDirPath() + OPENTRACK_DEFAULT_CONFIG_PATH ).toString();
#else
QString currentFile = settings.value( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();
#endif
@@ -106,12 +106,12 @@ void TrackerSettings::save_ini() const
{
#ifdef OPENTRACK_API
- QSettings settings(options::group::org); // Registry settings (in HK_USER)
+ QSettings settings(OPENTRACK_ORG); // Registry settings (in HK_USER)
#else
QSettings settings("opentrack"); // Registry settings (in HK_USER)
#endif
#ifdef OPENTRACK_API
- QString currentFile = settings.value( options::group::filename_key, QCoreApplication::applicationDirPath() + options::group::default_path ).toString();
+ QString currentFile = settings.value( OPENTRACK_CONFIG_FILENAME_KEY, QCoreApplication::applicationDirPath() + OPENTRACK_DEFAULT_CONFIG_PATH ).toString();
#else
QString currentFile = settings.value( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();
#endif