Hooked up the UI/frontend controller #2 to the Jaguar core, final fixes to the

[virtualjaguar] / src / gui / controllertab.h

diff --git a/src/gui/controllertab.h b/src/gui/controllertab.h
index 545e5bc3a6beb5cf304385abcec1f77a84a87124..011eec2b00785b27fc876a29bb074aba81bcca48 100644 (file)
--- a/src/gui/controllertab.h
+++ b/src/gui/controllertab.h
@@ -4,6 +4,8 @@
 #include <QtGui>
 #include <stdint.h>
 
+class ControllerWidget;
+
 class ControllerTab: public QWidget
 {
        Q_OBJECT
@@ -11,24 +13,15 @@ class ControllerTab: public QWidget
        public:
                ControllerTab(QWidget * parent = 0);
                ~ControllerTab();
-               void UpdateLabel(void);
 
        protected slots:
                void DefineAllKeys(void);
 
        private:
                QPushButton * redefineAll;
-               void DrawBorderedText(QPainter &, int, int, QString);
 
        public:
-               uint32_t p1Keys[21];
-
-       private:
-               QLabel * controllerPic;
-
-               // Class data
-               static char keyName1[96][16];
-               static char keyName2[64][16];
+               ControllerWidget * controllerWidget;
 };
 
 #endif // __CONTROLLERTAB_H__