correct some obsolete stuff

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>

6 files changed, 32 insertions, 27 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 2ccb2bb7..eb24b320 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -89,7 +89,7 @@ static void fill_combobox(const QString& filter, QList<DynamicLibrary*>& list, Q
 //
 // Setup the Main Dialog
 //
-FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WFlags flags) : 
+FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WindowFlags flags) :
     QMainWindow(parent, flags),
     #if defined(_WIN32)
         keybindingWorker(NULL),
@@ -938,7 +938,7 @@ void FaceTrackNoIR::bindKeyboardShortcuts()
                 seq = "Alt+" + seq;
             if (iniFile.value("Ctrl_Center", false).toBool())
                 seq = "Ctrl+" + seq;
-            keyCenter = new QxtGlobalShortcut(QKeySequence(seq));
+            keyCenter = new QxtGlobalShortcut(QKeySequence(seq), this);
             connect(keyCenter, SIGNAL(activated()), this, SLOT(shortcutRecentered()));
         }
     }
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h
index b9c7168b..6c087c43 100644
--- a/facetracknoir/facetracknoir.h
+++ b/facetracknoir/facetracknoir.h
@@ -25,7 +25,7 @@
 #ifndef FaceTrackNoIR_H
 #define FaceTrackNoIR_H
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QApplication>
 #include <QFileDialog>
 #include <QListView>
@@ -39,7 +39,7 @@
 #include <QString>
 #include <QByteArray>
 #if !defined(_WIN32)
-#	include <qxtglobalshortcut.h>
+#	include "qxt-mini/QxtGlobalShortcut"
 #else
 #	include <windows.h>
 #endif
@@ -67,7 +67,7 @@ class FaceTrackNoIR : public QMainWindow, IDynamicLibraryProvider
 	Q_OBJECT
 
 public:
-	FaceTrackNoIR(QWidget *parent = 0, Qt::WFlags flags = 0);
+    FaceTrackNoIR(QWidget *parent = 0, Qt::WindowFlags flags = 0);
 	~FaceTrackNoIR();
 
     QFrame *get_video_widget();					// Get a pointer to the video-widget, to use in the DLL
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index 5c573a0b..5568db26 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -1480,8 +1480,8 @@ background:none;</string>
       <property name="frameShape">

        <enum>QFrame::NoFrame</enum>

       </property>

-      <property name="numDigits">

-       <number>6</number>

+      <property name="digitCount">

+       <number>2</number>

       </property>

      </widget>

      <widget class="QLCDNumber" name="lcdNumRotX">

@@ -1496,8 +1496,8 @@ background:none;</string>
       <property name="frameShape">

        <enum>QFrame::NoFrame</enum>

       </property>

-      <property name="numDigits">

-       <number>6</number>

+      <property name="digitCount">

+       <number>2</number>

       </property>

      </widget>

      <widget class="QLabel" name="label_4">

@@ -1546,6 +1546,9 @@ color:white;</string>
       <property name="frameShape">

        <enum>QFrame::NoFrame</enum>

       </property>

+      <property name="digitCount">

+       <number>2</number>

+      </property>

      </widget>

      <widget class="QLabel" name="label_6">

       <property name="geometry">

@@ -1576,6 +1579,9 @@ border:none;</string>
       <property name="frameShape">

        <enum>QFrame::NoFrame</enum>

       </property>

+      <property name="digitCount">

+       <number>2</number>

+      </property>

      </widget>

      <widget class="QLabel" name="label_7">

       <property name="geometry">

@@ -1640,8 +1646,8 @@ color:white;</string>
       <property name="frameShape">

        <enum>QFrame::NoFrame</enum>

       </property>

-      <property name="numDigits">

-       <number>6</number>

+      <property name="digitCount">

+       <number>2</number>

       </property>

      </widget>

      <widget class="QLCDNumber" name="lcdNumX">

@@ -1656,8 +1662,8 @@ color:white;</string>
       <property name="frameShape">

        <enum>QFrame::NoFrame</enum>

       </property>

-      <property name="numDigits">

-       <number>5</number>

+      <property name="digitCount">

+       <number>2</number>

       </property>

      </widget>

     </widget>

@@ -1704,8 +1710,8 @@ color:white;</string>
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <property name="numDigits">

-      <number>5</number>

+     <property name="digitCount">

+      <number>1</number>

      </property>

      <property name="segmentStyle">

       <enum>QLCDNumber::Flat</enum>

@@ -1732,8 +1738,8 @@ color:white;</string>
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <property name="numDigits">

-      <number>5</number>

+     <property name="digitCount">

+      <number>1</number>

      </property>

      <property name="segmentStyle">

       <enum>QLCDNumber::Flat</enum>

@@ -1760,8 +1766,8 @@ color:white;</string>
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <property name="numDigits">

-      <number>5</number>

+     <property name="digitCount">

+      <number>1</number>

      </property>

      <property name="segmentStyle">

       <enum>QLCDNumber::Flat</enum>

@@ -1788,7 +1794,7 @@ color:white;</string>
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <property name="numDigits">

+     <property name="digitCount">

       <number>5</number>

      </property>

      <property name="segmentStyle">

@@ -1816,7 +1822,7 @@ color:white;</string>
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <property name="numDigits">

+     <property name="digitCount">

       <number>5</number>

      </property>

      <property name="segmentStyle">

@@ -1844,7 +1850,7 @@ color:white;</string>
      <property name="frameShadow">

       <enum>QFrame::Raised</enum>

      </property>

-     <property name="numDigits">

+     <property name="digitCount">

       <number>5</number>

      </property>

      <property name="segmentStyle">

diff --git a/ftnoir_protocol_base/ftnoir_protocol_base.h b/ftnoir_protocol_base/ftnoir_protocol_base.h
index d20e01b5..79f0800c 100644
--- a/ftnoir_protocol_base/ftnoir_protocol_base.h
+++ b/ftnoir_protocol_base/ftnoir_protocol_base.h
@@ -34,8 +34,8 @@
 
 #include "ftnoir_protocol_base_global.h"
 #include "ftnoir_tracker_base/ftnoir_tracker_types.h"
-#include <QtGui/QWidget>
-#include <QtGui/QFrame>
+#include <QWidget>
+#include <QFrame>
 
 struct IProtocol
 {
diff --git a/ftnoir_tracker_base/ftnoir_tracker_base.h b/ftnoir_tracker_base/ftnoir_tracker_base.h
index cd603225..edbe7379 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_base.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_base.h
@@ -27,8 +27,8 @@
 
 #include "ftnoir_tracker_base_global.h"
 #include "ftnoir_tracker_types.h"
-#include <QtGui/QWidget>
-#include <QtGui/QFrame>
+#include <QWidget>
+#include <QFrame>
 #include <QWaitCondition>
 #include <QMutex>
 #include <QFrame>
diff --git a/qfunctionconfigurator/qfunctionconfigurator.h b/qfunctionconfigurator/qfunctionconfigurator.h
index 8460751a..fa72fb72 100644
--- a/qfunctionconfigurator/qfunctionconfigurator.h
+++ b/qfunctionconfigurator/qfunctionconfigurator.h
@@ -9,7 +9,6 @@
 
 #include <QWidget>
 #include <QtGui>
-#include <QtDesigner/QDesignerExportWidget>
 #include <QPointF>
 #include <QElapsedTimer>
 #include "qfunctionconfigurator/functionconfig.h"