summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-06-29 13:14:04 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-06-29 13:18:34 +0200
commit948bd443b7dd42133df7ea90cbf5d7f22cafa3d4 (patch)
tree4edc5e93d0a886a602b10e3d3b7648395ff51039
parent91160a1142e8564f3ba46a71d86dc88dcbd66114 (diff)
logic/state: move to gui/main
-rw-r--r--gui/ui.h2
-rw-r--r--opentrack-logic/state.hpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/gui/ui.h b/gui/ui.h
index b6b87a93..c01b9c49 100644
--- a/gui/ui.h
+++ b/gui/ui.h
@@ -40,7 +40,7 @@ class MainWindow : public QMainWindow, private State
Q_OBJECT
Shortcuts global_shortcuts;
-
+ module_settings m;
Ui::OpentrackUI ui;
mem<QSystemTrayIcon> tray;
QTimer pose_update_timer;
diff --git a/opentrack-logic/state.hpp b/opentrack-logic/state.hpp
index f9bb82c0..7e9d10cb 100644
--- a/opentrack-logic/state.hpp
+++ b/opentrack-logic/state.hpp
@@ -25,7 +25,6 @@ struct State
Modules modules;
SelectedLibraries libs;
main_settings s;
- module_settings m;
Mappings pose;
mem<Work> work;
};