summaryrefslogtreecommitdiffhomepage
path: root/logic
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-17 21:28:45 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-17 21:34:53 +0200
commitcb33be1c50b68d6022f344ddac923c7aac3a11d5 (patch)
tree1840e3f9829aa69f10f81804f655e97be3f2eca8 /logic
parent41ba8aa5329c16a797140dc23650ef45f42753a3 (diff)
move options framework into its own library
- adjust usages - add support for QList signals and metatype
Diffstat (limited to 'logic')
-rw-r--r--logic/main-settings.hpp2
-rw-r--r--logic/mappings.hpp3
-rw-r--r--logic/shortcuts.h2
-rw-r--r--logic/state.hpp2
-rw-r--r--logic/tracker.h2
-rw-r--r--logic/tracklogger.hpp2
6 files changed, 6 insertions, 7 deletions
diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp
index 26313a26..d96a833b 100644
--- a/logic/main-settings.hpp
+++ b/logic/main-settings.hpp
@@ -9,7 +9,7 @@
#pragma once
#include <QString>
-#include "compat/options.hpp"
+#include "options/options.hpp"
#include "api/plugin-api.hpp"
using namespace options;
diff --git a/logic/mappings.hpp b/logic/mappings.hpp
index 0b9373c0..038b7560 100644
--- a/logic/mappings.hpp
+++ b/logic/mappings.hpp
@@ -7,8 +7,7 @@
#pragma once
-#include <QSettings>
-#include "compat/options.hpp"
+#include "options/options.hpp"
using namespace options;
#include "spline-widget/spline.hpp"
#include "main-settings.hpp"
diff --git a/logic/shortcuts.h b/logic/shortcuts.h
index c81b01f6..52b9979a 100644
--- a/logic/shortcuts.h
+++ b/logic/shortcuts.h
@@ -15,7 +15,7 @@
#include "export.hpp"
#include "qxt-mini/QxtGlobalShortcut"
-#include "compat/options.hpp"
+#include "options/options.hpp"
#include "main-settings.hpp"
#ifdef _WIN32
diff --git a/logic/state.hpp b/logic/state.hpp
index 4c3bb7a0..4e021949 100644
--- a/logic/state.hpp
+++ b/logic/state.hpp
@@ -8,7 +8,7 @@
#pragma once
-#include "compat/options.hpp"
+#include "options/options.hpp"
using namespace options;
#include "api/plugin-support.hpp"
#include "main-settings.hpp"
diff --git a/logic/tracker.h b/logic/tracker.h
index 15fb9701..d3c2660b 100644
--- a/logic/tracker.h
+++ b/logic/tracker.h
@@ -19,7 +19,7 @@
#include "spline-widget/spline.hpp"
#include "main-settings.hpp"
-#include "compat/options.hpp"
+#include "options/options.hpp"
#include "tracklogger.hpp"
#include <QMutex>
diff --git a/logic/tracklogger.hpp b/logic/tracklogger.hpp
index 52ab35bc..19e16fef 100644
--- a/logic/tracklogger.hpp
+++ b/logic/tracklogger.hpp
@@ -1,6 +1,6 @@
#pragma once
#include "main-settings.hpp"
-#include "compat/options.hpp"
+#include "options/options.hpp"
#include "compat/timer.hpp"
#include <fstream>