From 3657d2c0d9807d6f88378981513a944cce4a1a16 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 29 Jun 2016 10:37:15 +0200
Subject: logic, gui: no need to reference "struct main_settings"

Now that "struct main_settings" doesn't implicitly reload in dtor, we no
longer have to pass it around from the user interface.

Only reload it where it's modified, i.e. in the options dialog. Changing
the filter/dialog/mapping comboboxen implicitly saves the main options
however.
---
 opentrack-logic/tracker.cpp | 3 +--
 opentrack-logic/tracker.h   | 4 ++--
 opentrack-logic/work.hpp    | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'opentrack-logic')

diff --git a/opentrack-logic/tracker.cpp b/opentrack-logic/tracker.cpp
index 2ac04d03..3fb5c6fc 100644
--- a/opentrack-logic/tracker.cpp
+++ b/opentrack-logic/tracker.cpp
@@ -21,8 +21,7 @@
 #   include <windows.h>
 #endif
 
-Tracker::Tracker(main_settings& s, Mappings &m, SelectedLibraries &libs) :
-    s(s),
+Tracker::Tracker(Mappings &m, SelectedLibraries &libs) :
     m(m),
     newpose {0,0,0, 0,0,0},
     centerp(s.center_at_startup),
diff --git a/opentrack-logic/tracker.h b/opentrack-logic/tracker.h
index 591ca03c..dad955c8 100644
--- a/opentrack-logic/tracker.h
+++ b/opentrack-logic/tracker.h
@@ -48,7 +48,7 @@ class OPENTRACK_LOGIC_EXPORT Tracker : private QThread
     Q_OBJECT
 private:
     QMutex mtx;
-    main_settings& s;
+    main_settings s;
     Mappings& m;
 
     Timer t;
@@ -72,7 +72,7 @@ private:
     void t_compensate(const rmat& rmat, const double* ypr, double* output, bool rz);
     void run() override;
 public:
-    Tracker(main_settings& s, Mappings& m, SelectedLibraries& libs);
+    Tracker(Mappings& m, SelectedLibraries& libs);
     ~Tracker();
 
     void get_raw_and_mapped_poses(double* mapped, double* raw) const;
diff --git a/opentrack-logic/work.hpp b/opentrack-logic/work.hpp
index 2377be5a..37bc58bf 100644
--- a/opentrack-logic/work.hpp
+++ b/opentrack-logic/work.hpp
@@ -22,7 +22,7 @@
 
 struct Work
 {
-    main_settings& s;
+    main_settings s;
     SelectedLibraries& libs;
     mem<Tracker> tracker;
     mem<Shortcuts> sc;
@@ -31,9 +31,9 @@ struct Work
     using tt = std::tuple<key_opts&, fn, bool>;
     std::vector<tt> keys;
 
-    Work(main_settings& s, Mappings& m, SelectedLibraries& libs, WId handle) :
-        s(s), libs(libs),
-        tracker(std::make_shared<Tracker>(s, m, libs)),
+    Work(Mappings& m, SelectedLibraries& libs, WId handle) :
+        libs(libs),
+        tracker(std::make_shared<Tracker>(m, libs)),
         sc(std::make_shared<Shortcuts>()),
         handle(handle),
         keys {
-- 
cgit v1.2.3