Fixes for compilation against GCC 6.

[virtualjaguar] / src / gui / controllertab.h

diff --git a/src/gui/controllertab.h b/src/gui/controllertab.h
index 5f5d11aca2f636dc19d9c68c1adddb689095bf3d..5862eb37a5bddad3208a398202ceb93637ae7198 100644 (file)
--- a/src/gui/controllertab.h
+++ b/src/gui/controllertab.h
@@ -1,7 +1,10 @@
 #ifndef __CONTROLLERTAB_H__
 #define __CONTROLLERTAB_H__
 
-#include <QtGui>
+#include <QtWidgets>
+#include <stdint.h>
+
+class ControllerWidget;
 
 class ControllerTab: public QWidget
 {
@@ -11,20 +14,33 @@ class ControllerTab: public QWidget
                ControllerTab(QWidget * parent = 0);
                ~ControllerTab();
 
+               void SetupLastUsedProfile(void);
+
        protected slots:
                void DefineAllKeys(void);
+               void UpdateProfileKeys(int, uint32_t);
+               void UpdateProfileConnections(int);
+               void ChangeDevice(int);
+               void ChangeMapName(int);
+               void AddMapName(void);
+               void DeleteMapName(void);
 
        private:
+               QLabel * label1;
+               QLabel * label2;
+               QLabel * label3;
+               QComboBox * deviceList;
+               QComboBox * mapNameList;
+               QComboBox * mapToList;
+               QCheckBox * controller1;
+               QCheckBox * controller2;
+               QPushButton * addMapName;
+               QPushButton * deleteMapName;
                QPushButton * redefineAll;
-               void DrawBorderedText(QPainter &, int, int, QString);
 
        public:
-               int p1Keys[21];
-
-       // Class data
-       private:
-               static char keyName1[96][16];
-               static char keyName2[64][16];
+               ControllerWidget * controllerWidget;
+               int profileNum;
 };
 
 #endif // __CONTROLLERTAB_H__