From 77b0ab5630b285b38a04c74477d9f58eac7355bd Mon Sep 17 00:00:00 2001
From: Stéphane Lenclud <github@lenclud.com>
Date: Tue, 16 Apr 2019 18:01:57 +0200
Subject: Easy Tracker: Mostly code clean-up.

---
 tracker-easy/tracker-easy.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'tracker-easy/tracker-easy.h')

diff --git a/tracker-easy/tracker-easy.h b/tracker-easy/tracker-easy.h
index 257dd6ca..06551533 100644
--- a/tracker-easy/tracker-easy.h
+++ b/tracker-easy/tracker-easy.h
@@ -39,11 +39,16 @@ namespace EasyTracker
 
     struct Tracker : QThread, ITracker
     {
-    public:
+        // We had problem where Qt slots would not get disconnected upon object destruction.
+        // Issue seems to be gone now even without Q_OBJECT declaration, go figure.
+        //Q_OBJECT
+    public:        
         friend class Dialog;
 
         explicit Tracker();
         ~Tracker() override;
+
+        // From ITracker
         module_status start_tracker(QFrame* parent_window) override;
         void data(double* data) override;
         bool center() override;
@@ -52,6 +57,7 @@ namespace EasyTracker
         void CreateModelFromSettings();
         void CreateCameraIntrinsicsMatrices();
 
+        // From QThread
         void run() override;
 
         bool maybe_reopen_camera();
@@ -60,7 +66,7 @@ namespace EasyTracker
         QMutex camera_mtx;
 
 
-        Settings s;
+        Settings iSettings;
 
         std::unique_ptr<QLayout> layout;
         std::vector<cv::Point> iPoints;
-- 
cgit v1.2.3