Fix MSVC build. Also, minor reformat

4 files changed, 49 insertions, 73 deletions

diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h
index 1fcddc4e..d02f1587 100644
--- a/facetracknoir/curve-config.h
+++ b/facetracknoir/curve-config.h
@@ -8,7 +8,6 @@ class CurveConfigurationDialog: public QWidget
 {
     Q_OBJECT
 public:
-
     explicit CurveConfigurationDialog( FaceTrackNoIR *ftnoir, QWidget *parent );
     virtual ~CurveConfigurationDialog();
     void showEvent ( QShowEvent * event );
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 534f18c8..17dded92 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -24,7 +24,7 @@
 #include "facetracknoir.h"
 #include "shortcuts.h"
 #include "tracker.h"
-#include <ftnoir_tracker_ht/ht-api.h>
+#include "curve-config.h"
 #include <QDebug>
 
 #if defined(_WIN32)
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index b4ea2912..2aa6614f 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -25,13 +25,6 @@
 #ifndef FaceTrackNoIR_H
 #define FaceTrackNoIR_H
 
-#undef FTNOIR_PROTOCOL_BASE_LIB
-#undef FTNOIR_TRACKER_BASE_LIB
-#undef FTNOIR_FILTER_BASE_LIB
-#define FTNOIR_PROTOCOL_BASE_EXPORT Q_DECL_IMPORT
-#define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_IMPORT
-#define FTNOIR_FILTER_BASE_EXPORT Q_DECL_IMPORT
-
 #include <QtGui/QMainWindow>
 #include <QApplication>
 #include <QFileDialog>
@@ -55,15 +48,14 @@
 
 #include "ui_facetracknoir.h"
 
-#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
-#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
-#include "ftnoir_filter_base/ftnoir_filter_base.h"
-
 #include "global-settings.h"
 #include "tracker.h"
-#include "facetracknoir/curve-config.h"
 #include "facetracknoir/shortcuts.h"
 
+#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
+#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
+#include "ftnoir_filter_base/ftnoir_filter_base.h"
+
 class Tracker;				// pre-define class to avoid circular includes
 class FaceTrackNoIR;
 
@@ -105,7 +97,7 @@ public:
     QxtGlobalShortcut* keyCenter;
 #endif
 public slots:
-        void shortcutRecentered();
+    void shortcutRecentered();
 
 private:
     HeadPoseData pose;
@@ -133,50 +125,50 @@ private:
     QList<DynamicLibrary*> dlopen_protocols;
 
     bool looping;
-
+    
 private slots:
-	//file menu
-	void open();
-	void save();
-	void saveAs();
-	void exit();
-//		void setIcon(int index);
-	void profileSelected(int index);
-
-	void showVideoWidget();
-	void showHeadPoseWidget();
-	void showTrackerSettings();
-	void showSecondTrackerSettings();
-
-	void showServerControls();
-	void showFilterControls();
-	void showKeyboardShortcuts();
-	void showCurveConfiguration();
-
-        void setInvertAxis( Axis axis, int invert );
-        void setInvertYaw(int invert) {
-            setInvertAxis(Yaw, invert);
-        }
-        void setInvertPitch(int invert) {
-            setInvertAxis(Pitch, invert);
-        }        
-        void setInvertRoll(int invert) {
-            setInvertAxis(Roll, invert);
-        }
-        void setInvertX(int invert) {
-            setInvertAxis(TX, invert);
-        }
-        void setInvertY(int invert) {
-            setInvertAxis(TY, invert);
-        }
-        void setInvertZ(int invert) {
-            setInvertAxis(TZ, invert);
-        }
-		void showHeadPose();
-
-        void startTracker();
-		void stopTracker();
-
+    //file menu
+    void open();
+    void save();
+    void saveAs();
+    void exit();
+    //		void setIcon(int index);
+    void profileSelected(int index);
+    
+    void showVideoWidget();
+    void showHeadPoseWidget();
+    void showTrackerSettings();
+    void showSecondTrackerSettings();
+    
+    void showServerControls();
+    void showFilterControls();
+    void showKeyboardShortcuts();
+    void showCurveConfiguration();
+    
+    void setInvertAxis( Axis axis, int invert );
+    void setInvertYaw(int invert) {
+        setInvertAxis(Yaw, invert);
+    }
+    void setInvertPitch(int invert) {
+        setInvertAxis(Pitch, invert);
+    }        
+    void setInvertRoll(int invert) {
+        setInvertAxis(Roll, invert);
+    }
+    void setInvertX(int invert) {
+        setInvertAxis(TX, invert);
+    }
+    void setInvertY(int invert) {
+        setInvertAxis(TY, invert);
+    }
+    void setInvertZ(int invert) {
+        setInvertAxis(TZ, invert);
+    }
+    void showHeadPose();
+    
+    void startTracker();
+    void stopTracker();
+    
 };
 
 #endif // FaceTrackNoIR_H
diff --git a/facetracknoir/tracker.h b/facetracknoir/tracker.h
index 0476eec4..31489d87 100644
--- a/facetracknoir/tracker.h
+++ b/facetracknoir/tracker.h
@@ -35,22 +35,7 @@
 #include "global-settings.h"
 #include <ftnoir_tracker_base/ftnoir_tracker_types.h>
 
-//#define DIRECTINPUT_VERSION 0x0800
-//#include <Dinput.h>
-#undef FTNOIR_PROTOCOL_BASE_LIB
-#undef FTNOIR_TRACKER_BASE_LIB
-#undef FTNOIR_FILTER_BASE_LIB
-#undef FTNOIR_PROTOCOL_BASE_EXPORT
-#undef FTNOIR_TRACKER_BASE_EXPORT
-#undef FTNOIR_FILTER_BASE_EXPORT
-#define FTNOIR_PROTOCOL_BASE_EXPORT Q_DECL_IMPORT
-#define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_IMPORT
-#define FTNOIR_FILTER_BASE_EXPORT Q_DECL_IMPORT
-
 #include <qfunctionconfigurator/functionconfig.h>
-#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
-#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
-#include "ftnoir_filter_base/ftnoir_filter_base.h"
 #include "tracker_types.h"
 
 class FaceTrackNoIR;				// pre-define parent-class to avoid circular includes