From e481697ea6e156e456f3d51ba7c816ad4a908792 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 15 Sep 2013 16:00:25 +0200
Subject: Fix mingw-w64 cross-compile from Linux

Case-sensitivity and MSVC-isms bite again.
---
 ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui | 170 ++++++++++------------
 ftnoir_tracker_rift/ftnoir_tracker_rift.cpp       |   2 +-
 2 files changed, 78 insertions(+), 94 deletions(-)

(limited to 'ftnoir_tracker_rift')

diff --git a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui
index eaf5b9d6..612c61f1 100644
--- a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui
+++ b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>UIRiftControls</class>
- <widget class="QWidget" name="UIHydraControls">
+ <widget class="QWidget" name="UIRiftControls">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>411</width>
-    <height>142</height>
+    <height>145</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -45,97 +48,78 @@
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_2">
-
-
-
-        <item row="0" column="0">
-          <widget class="QLabel" name="label_6">
-            <property name="text">
-              <string>Pitch:</string>
-            </property>
-          </widget>
-        </item>
-
-        <item row="0" column="1">
-          <widget class="QCheckBox" name="chkEnablePitch">
-            <property name="maximumSize">
-              <size>
-                <width>20</width>
-                <height>16777215</height>
-              </size>
-            </property>
-            <property name="layoutDirection">
-              <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="styleSheet">
-              <string notr="true"/>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-          </widget>
-        </item>
-
-        <item row="1" column="0">
-          <widget class="QLabel" name="label_9">
-            <property name="text">
-              <string>Yaw:</string>
-            </property>
-          </widget>
-        </item>
-
-
-        <item row="1" column="1">
-          <widget class="QCheckBox" name="chkEnableYaw">
-            <property name="maximumSize">
-              <size>
-                <width>20</width>
-                <height>16777215</height>
-              </size>
-            </property>
-            <property name="layoutDirection">
-              <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-          </widget>
-        </item>
-
-
-
-        <item row="2" column="0">
-          <widget class="QLabel" name="label_11">
-            <property name="text">
-              <string>Roll:</string>
-            </property>
-          </widget>
-        </item>
-
-        <item row="2" column="1">
-          <widget class="QCheckBox" name="chkEnableRoll">
-            <property name="maximumSize">
-              <size>
-                <width>20</width>
-                <height>16777215</height>
-              </size>
-            </property>
-            <property name="layoutDirection">
-              <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text">
-              <string/>
-            </property>
-          </widget>
-        </item>
-
-
-
-
-
-
-
-
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Pitch:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QCheckBox" name="chkEnablePitch">
+         <property name="maximumSize">
+          <size>
+           <width>20</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Yaw:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="chkEnableYaw">
+         <property name="maximumSize">
+          <size>
+           <width>20</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Roll:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="chkEnableRoll">
+         <property name="maximumSize">
+          <size>
+           <width>20</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index f5e1f5fa..0c3984ac 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -55,7 +55,7 @@ void Rift_Tracker::StartTracker(QFrame* videoFrame)
     //
     System::Init(Log::ConfigureDefaultLog(LogMask_All));
     pManager = *DeviceManager::Create();
-    DeviceEnumerator<HMDDevice>& enumerator = pManager->EnumerateDevices<HMDDevice>();
+    DeviceEnumerator<HMDDevice> enumerator = pManager->EnumerateDevices<HMDDevice>();
     if (enumerator.IsAvailable())
     {
         pHMD = *enumerator.CreateDevice();
-- 
cgit v1.2.3