summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-09-17 17:41:54 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-09-17 17:41:54 +0200
commitf8edb5c556f970f5fc9be8919e054e0d973e9dcc (patch)
treefb5e0c550f98b47078d5e367500c88e87f58e389
parent5bedf6f81342356c197604a9484281db0a726611 (diff)
main ui: appease GNU CC -Wreorder
-rw-r--r--facetracknoir/facetracknoir.cpp6
-rw-r--r--facetracknoir/tracker.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 394ad8a6..dc3bd15b 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -86,18 +86,18 @@ static void fill_combobox(const QString& filter, QList<DynamicLibrary*>& list, Q
// Setup the Main Dialog
//
FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WFlags flags) :
+ QMainWindow(parent, flags),
#if defined(_WIN32)
keybindingWorker(NULL),
#else
keyCenter(0),
#endif
- QMainWindow(parent, flags),
+ timUpdateHeadPose(this),
pTrackerDialog(NULL),
pSecondTrackerDialog(NULL),
pProtocolDialog(NULL),
pFilterDialog(NULL),
- looping(false),
- timUpdateHeadPose(this)
+ looping(false)
{
ui.setupUi(this);
diff --git a/facetracknoir/tracker.h b/facetracknoir/tracker.h
index 89f54bd5..885fc1e2 100644
--- a/facetracknoir/tracker.h
+++ b/facetracknoir/tracker.h
@@ -61,10 +61,10 @@ public:
int maxOutput1,
int maxInput2,
int maxOutput2) :
- curve(primary, maxInput1, maxOutput1),
- curveAlt(secondary, maxInput2, maxOutput2),
headPos(0),
invert(1),
+ curve(primary, maxInput1, maxOutput1),
+ curveAlt(secondary, maxInput2, maxOutput2),
zero(0)
{
QSettings settings("opentrack"); // Registry settings (in HK_USER)