Merge branch 'develop'

[clinton/Virtual-Jaguar-Rx.git] / src / gui / emustatus.h

diff --git a/src/gui/emustatus.h b/src/gui/emustatus.h
index 6552e89..22da650 100644 (file)
--- a/src/gui/emustatus.h
+++ b/src/gui/emustatus.h
@@ -7,7 +7,7 @@
 #ifndef __EMUSTATUS_H__
 #define __EMUSTATUS_H__
 
-#include <QtWidgets>
+#include <QtWidgets/QtWidgets>
 #include <stdint.h>
 
 class EmuStatusWindow : public QWidget
@@ -16,18 +16,24 @@ class EmuStatusWindow : public QWidget
 
        public:
                EmuStatusWindow(QWidget * parent = 0);
-
-       public slots:
+               void UpdateM68KCycles(size_t cycles);
                void RefreshContents(void);
+               void ResetM68KCycles(void);
+
+       private slots:
+               void ResetCycles(void);
 
        protected:
                void keyPressEvent(QKeyEvent *);
 
        private:
                QVBoxLayout * layout;
+               QPushButton * resetcycles;
                QLabel * text;
-               bool    GPURunning;
-               bool    M68000DebugHaltStatus;
+               bool GPURunning;
+               bool M68000DebugHaltStatus;
+               size_t M68K_opcodecycles;
+               size_t M68K_totalcycles;
 };
 
 #endif // __EMUSTATUS_H__