summaryrefslogtreecommitdiffhomepage
path: root/opentrack
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-11-02 06:07:11 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-11-02 06:24:28 +0100
commitab72c34a668d604942b27f912f8a1971870782fe (patch)
tree93a4ea940e28daad9c900181f60f8a45c64bfb1e /opentrack
parentc044ce0d0830902b9ca86dcd9a725e5ef4f72eb1 (diff)
separate config directory for 2.3-branch
Diffstat (limited to 'opentrack')
-rw-r--r--opentrack/mappings.hpp8
-rw-r--r--opentrack/options.hpp2
2 files changed, 6 insertions, 4 deletions
diff --git a/opentrack/mappings.hpp b/opentrack/mappings.hpp
index 86126db9..7f949f2d 100644
--- a/opentrack/mappings.hpp
+++ b/opentrack/mappings.hpp
@@ -6,6 +6,8 @@ using namespace options;
#include "../qfunctionconfigurator/functionconfig.h"
#include "main-settings.hpp"
+static constexpr const char* settings_group = "opentrack-2.3";
+
class Mapping {
public:
Mapping(QString primary,
@@ -22,7 +24,7 @@ public:
name2(secondary)
{
// XXX TODO move all this qsettings boilerplate into a single header -sh 20141004
- QSettings settings("opentrack");
+ QSettings settings(settings_group);
QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
QSettings iniFile(currentFile, QSettings::IniFormat);
curve.loadSettings(iniFile, primary);
@@ -54,7 +56,7 @@ public:
void load_mappings()
{
- QSettings settings("opentrack");
+ QSettings settings(settings_group);
QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
QSettings iniFile( currentFile, QSettings::IniFormat );
@@ -66,7 +68,7 @@ public:
}
void save_mappings()
{
- QSettings settings("opentrack");
+ QSettings settings(settings_group);
QString currentFile = settings.value("SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini").toString();
QSettings iniFile(currentFile, QSettings::IniFormat);
diff --git a/opentrack/options.hpp b/opentrack/options.hpp
index 6c15d729..1d54e8b3 100644
--- a/opentrack/options.hpp
+++ b/opentrack/options.hpp
@@ -97,7 +97,7 @@ namespace options {
}
conf.endGroup();
}
- static constexpr const char* org = "opentrack";
+ static constexpr const char* org = "opentrack-2.3";
void save()
{