From db0ab29be2f12e5efec600603e39a3c36a775ba4 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 18 Jul 2021 17:09:04 -0400 Subject: [PATCH] Added missing override virtual function syntax sugar to debugger header. Moved Movie menu item to 2nd in list after File. --- src/drivers/Qt/ConsoleDebugger.h | 46 ++++++++++++++++---------------- src/drivers/Qt/ConsoleWindow.cpp | 16 ++++++----- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/drivers/Qt/ConsoleDebugger.h b/src/drivers/Qt/ConsoleDebugger.h index 3ea62b28..91a6f532 100644 --- a/src/drivers/Qt/ConsoleDebugger.h +++ b/src/drivers/Qt/ConsoleDebugger.h @@ -161,16 +161,16 @@ class QAsmView : public QWidget protected: bool event(QEvent *event) override; - void paintEvent(QPaintEvent *event); - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void mousePressEvent(QMouseEvent * event); - void mouseReleaseEvent(QMouseEvent * event); - void mouseMoveEvent(QMouseEvent * event); - void mouseDoubleClickEvent(QMouseEvent * event); - void resizeEvent(QResizeEvent *event); - void wheelEvent(QWheelEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void paintEvent(QPaintEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent * event) override; + void mouseReleaseEvent(QMouseEvent * event) override; + void mouseMoveEvent(QMouseEvent * event) override; + void mouseDoubleClickEvent(QMouseEvent * event) override; + void resizeEvent(QResizeEvent *event) override; + void wheelEvent(QWheelEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; void loadHighlightToClipboard(void); void toggleBreakpoint(int line); @@ -261,8 +261,8 @@ class DebuggerStackDisplay : public QPlainTextEdit void setFont( const QFont &font ); protected: - void keyPressEvent(QKeyEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; void recalcCharsPerLine(void); int pxCharWidth; @@ -319,10 +319,10 @@ class DebuggerTabBar : public QTabBar signals: void beginDragOut(int); protected: - void mousePressEvent(QMouseEvent * event); - void mouseReleaseEvent(QMouseEvent * event); - void mouseMoveEvent(QMouseEvent * event); - void contextMenuEvent(QContextMenuEvent *event); + void mousePressEvent(QMouseEvent * event) override; + void mouseReleaseEvent(QMouseEvent * event) override; + void mouseMoveEvent(QMouseEvent * event) override; + void contextMenuEvent(QContextMenuEvent *event) override; private: bool theDragPress; bool theDragOut; @@ -346,10 +346,10 @@ class DebuggerTabWidget : public QTabWidget int row(void){ return _row; } int col(void){ return _col; } protected: - void mouseMoveEvent(QMouseEvent * event); - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void mouseMoveEvent(QMouseEvent * event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; private: DebuggerTabBar *bar; int _row; @@ -379,9 +379,9 @@ class ConsoleDebugger : public QDialog void setCpuStatusFont( const QFont &font ); protected: - void closeEvent(QCloseEvent *event); - //void keyPressEvent(QKeyEvent *event); - //void keyReleaseEvent(QKeyEvent *event); + void closeEvent(QCloseEvent *event) override; + //void keyPressEvent(QKeyEvent *event) override; + //void keyReleaseEvent(QKeyEvent *event) override; //QTreeWidget *tree; QToolBar *toolBar; diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index b891d643..34c702bd 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -765,9 +765,17 @@ void consoleWin_t::createMainMenu(void) menubar->setNativeMenuBar( useNativeMenuBar ? true : false ); + // Top Level Menu Iterms + fileMenu = menubar->addMenu(tr("&File")); + movieMenu = menubar->addMenu(tr("&Movie")); + optMenu = menubar->addMenu(tr("&Options")); + emuMenu = menubar->addMenu(tr("&Emulation")); + toolsMenu = menubar->addMenu(tr("&Tools")); + debugMenu = menubar->addMenu(tr("&Debug")); + helpMenu = menubar->addMenu(tr("&Help")); + //----------------------------------------------------------------------- // File - fileMenu = menubar->addMenu(tr("&File")); connect( fileMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( fileMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); @@ -955,7 +963,6 @@ void consoleWin_t::createMainMenu(void) //----------------------------------------------------------------------- // Options - optMenu = menubar->addMenu(tr("&Options")); connect( optMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( optMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); @@ -1079,7 +1086,6 @@ void consoleWin_t::createMainMenu(void) //----------------------------------------------------------------------- // Emulation - emuMenu = menubar->addMenu(tr("&Emulation")); connect( emuMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( emuMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); @@ -1403,7 +1409,6 @@ void consoleWin_t::createMainMenu(void) //----------------------------------------------------------------------- // Tools - toolsMenu = menubar->addMenu(tr("&Tools")); connect( toolsMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( toolsMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); @@ -1453,7 +1458,6 @@ void consoleWin_t::createMainMenu(void) //----------------------------------------------------------------------- // Debug - debugMenu = menubar->addMenu(tr("&Debug")); connect( debugMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( debugMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); @@ -1532,7 +1536,6 @@ void consoleWin_t::createMainMenu(void) //----------------------------------------------------------------------- // Movie - movieMenu = menubar->addMenu(tr("&Movie")); connect( movieMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( movieMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); @@ -1713,7 +1716,6 @@ void consoleWin_t::createMainMenu(void) //----------------------------------------------------------------------- // Help - helpMenu = menubar->addMenu(tr("&Help")); connect( helpMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( helpMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );