From 015547df5de7dcfaa60bfa6f8ac30b1f9c91385a Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 16 Oct 2013 20:57:56 +0200
Subject: fix the damn mess

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
---
 facetracknoir/facetracknoir.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'facetracknoir/facetracknoir.h')

diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index 8f510d78..bfeb2d38 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -94,8 +94,8 @@ public:
     Key keyToggle;
     KeybindingWorker* keybindingWorker;
 #else 
-    QxtGlobalShortcut* keyCenter;
-    QxtGlobalShortcut* keyToggle;
+    QxtGlobalShortcut keyCenter;
+    QxtGlobalShortcut keyToggle;
 #endif
 public slots:
     void shortcutRecentered();
@@ -112,7 +112,6 @@ private:
     IProtocolDialog* pProtocolDialog;			// Pointer to Protocol dialog instance (in DLL)
     IFilterDialog* pFilterDialog;				// Pointer to Filter dialog instance (in DLL)
 
-	/** Widget variables **/
 	QWidget *_keyboard_shortcuts;
 	QWidget *_curve_config;
 
@@ -120,12 +119,15 @@ private:
 
 	void GetCameraNameDX();
 	void loadSettings();
-	void setupFaceTrackNoIR();
 
     QList<DynamicLibrary*> dlopen_filters;
     QList<DynamicLibrary*> dlopen_trackers;
     QList<DynamicLibrary*> dlopen_protocols;
 
+#ifndef _WIN32
+    void bind_keyboard_shortcut(QxtGlobalShortcut& key, const QString label, QSettings& iniFile);
+#endif
+
     bool looping;
     
 private slots:
-- 
cgit v1.2.3