ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing override virtual function syntax sugar to debugger header. Moved Movie menu item to 2nd in list after File.

This commit is contained in:
mjbudd77 2021-07-18 17:09:04 -04:00
parent 34e4e03fe4
commit db0ab29be2
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/drivers/Qt/ConsoleDebugger.h
View File

@ -161,16 +161,16 @@ class QAsmView : public QWidget
protected: protected:
bool event(QEvent *event) override; bool event(QEvent *event) override;
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *event); void keyReleaseEvent(QKeyEvent *event) override;
void mousePressEvent(QMouseEvent * event); void mousePressEvent(QMouseEvent * event) override;
void mouseReleaseEvent(QMouseEvent * event); void mouseReleaseEvent(QMouseEvent * event) override;
void mouseMoveEvent(QMouseEvent * event); void mouseMoveEvent(QMouseEvent * event) override;
void mouseDoubleClickEvent(QMouseEvent * event); void mouseDoubleClickEvent(QMouseEvent * event) override;
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) override;
void wheelEvent(QWheelEvent *event); void wheelEvent(QWheelEvent *event) override;
void contextMenuEvent(QContextMenuEvent *event); void contextMenuEvent(QContextMenuEvent *event) override;
void loadHighlightToClipboard(void); void loadHighlightToClipboard(void);
void toggleBreakpoint(int line); void toggleBreakpoint(int line);
@ -261,8 +261,8 @@ class DebuggerStackDisplay : public QPlainTextEdit
void setFont( const QFont &font ); void setFont( const QFont &font );
protected: protected:
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event) override;
void contextMenuEvent(QContextMenuEvent *event); void contextMenuEvent(QContextMenuEvent *event) override;
void recalcCharsPerLine(void); void recalcCharsPerLine(void);
int pxCharWidth; int pxCharWidth;
@ -319,10 +319,10 @@ class DebuggerTabBar : public QTabBar
signals: signals:
void beginDragOut(int); void beginDragOut(int);
protected: protected:
void mousePressEvent(QMouseEvent * event); void mousePressEvent(QMouseEvent * event) override;
void mouseReleaseEvent(QMouseEvent * event); void mouseReleaseEvent(QMouseEvent * event) override;
void mouseMoveEvent(QMouseEvent * event); void mouseMoveEvent(QMouseEvent * event) override;
void contextMenuEvent(QContextMenuEvent *event); void contextMenuEvent(QContextMenuEvent *event) override;
private: private:
bool theDragPress; bool theDragPress;
bool theDragOut; bool theDragOut;
@ -346,10 +346,10 @@ class DebuggerTabWidget : public QTabWidget
int row(void){ return _row; } int row(void){ return _row; }
int col(void){ return _col; } int col(void){ return _col; }
protected: protected:
void mouseMoveEvent(QMouseEvent * event); void mouseMoveEvent(QMouseEvent * event) override;
void dragEnterEvent(QDragEnterEvent *event); void dragEnterEvent(QDragEnterEvent *event) override;
void dropEvent(QDropEvent *event); void dropEvent(QDropEvent *event) override;
void contextMenuEvent(QContextMenuEvent *event); void contextMenuEvent(QContextMenuEvent *event) override;
private: private:
DebuggerTabBar *bar; DebuggerTabBar *bar;
int _row; int _row;
@ -379,9 +379,9 @@ class ConsoleDebugger : public QDialog
void setCpuStatusFont( const QFont &font ); void setCpuStatusFont( const QFont &font );
protected: protected:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event) override;
//void keyPressEvent(QKeyEvent *event); //void keyPressEvent(QKeyEvent *event) override;
//void keyReleaseEvent(QKeyEvent *event); //void keyReleaseEvent(QKeyEvent *event) override;
//QTreeWidget *tree; //QTreeWidget *tree;
QToolBar *toolBar; QToolBar *toolBar;

16
src/drivers/Qt/ConsoleWindow.cpp
View File

@ -765,9 +765,17 @@ void consoleWin_t::createMainMenu(void)
menubar->setNativeMenuBar( useNativeMenuBar ? true : false ); 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 // File
fileMenu = menubar->addMenu(tr("&File"));
connect( fileMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( fileMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( fileMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( fileMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );
@ -955,7 +963,6 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Options // Options
optMenu = menubar->addMenu(tr("&Options"));
connect( optMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( optMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( optMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( optMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );
@ -1079,7 +1086,6 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Emulation // Emulation
emuMenu = menubar->addMenu(tr("&Emulation"));
connect( emuMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( emuMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( emuMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( emuMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );
@ -1403,7 +1409,6 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Tools // Tools
toolsMenu = menubar->addMenu(tr("&Tools"));
connect( toolsMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( toolsMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( toolsMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( toolsMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );
@ -1453,7 +1458,6 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Debug // Debug
debugMenu = menubar->addMenu(tr("&Debug"));
connect( debugMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( debugMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( debugMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( debugMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );
@ -1532,7 +1536,6 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Movie // Movie
movieMenu = menubar->addMenu(tr("&Movie"));
connect( movieMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( movieMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( movieMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( movieMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );
@ -1713,7 +1716,6 @@ void consoleWin_t::createMainMenu(void)
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Help // Help
helpMenu = menubar->addMenu(tr("&Help"));
connect( helpMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) ); connect( helpMenu, SIGNAL(aboutToShow(void)), this, SLOT(mainMenuOpen(void)) );
connect( helpMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) ); connect( helpMenu, SIGNAL(aboutToHide(void)), this, SLOT(mainMenuClose(void)) );