diff options
author | 2015-07-28 00:45:17 +0200 | |
---|---|---|
committer | 2015-07-29 11:19:43 +0200 | |
commit | a83ad4d11fb51771ecaff7d17a0c4ed8160430c6 (patch) | |
tree | 89b1e585f4196466204100bd4f869a34833c437e /src/osd/modules/debugger/qt/mainwindow.c | |
parent | 1b452e3bfb48e9c77e705a60ab285c382d457e8a (diff) |
debugqt: Port to Qt5 [O. Galibert]
Diffstat (limited to 'src/osd/modules/debugger/qt/mainwindow.c')
-rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/osd/modules/debugger/qt/mainwindow.c b/src/osd/modules/debugger/qt/mainwindow.c index bb4db219912..12b6a09dd77 100644 --- a/src/osd/modules/debugger/qt/mainwindow.c +++ b/src/osd/modules/debugger/qt/mainwindow.c @@ -2,6 +2,14 @@ // copyright-holders:Andrew Gardner #define NO_MEM_TRACKING +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QFileDialog> +#include <QtGui/QCloseEvent> + #include "mainwindow.h" #include "debug/debugcon.h" @@ -23,7 +31,7 @@ MainWindow::MainWindow(running_machine* machine, QWidget* parent) : // The input line m_inputEdit = new QLineEdit(mainWindowFrame); - connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(executeCommand())); + connect(m_inputEdit, &QLineEdit::returnPressed, this, &MainWindow::executeCommandSlot); m_inputEdit->installEventFilter(this); @@ -52,9 +60,9 @@ MainWindow::MainWindow(running_machine* machine, QWidget* parent) : m_breakpointToggleAct->setShortcut(Qt::Key_F9); m_breakpointEnableAct->setShortcut(Qt::SHIFT + Qt::Key_F9); m_runToCursorAct->setShortcut(Qt::Key_F4); - connect(m_breakpointToggleAct, SIGNAL(triggered(bool)), this, SLOT(toggleBreakpointAtCursor(bool))); - connect(m_breakpointEnableAct, SIGNAL(triggered(bool)), this, SLOT(enableBreakpointAtCursor(bool))); - connect(m_runToCursorAct, SIGNAL(triggered(bool)), this, SLOT(runToCursor(bool))); + connect(m_breakpointToggleAct, &QAction::triggered, this, &MainWindow::toggleBreakpointAtCursor); + connect(m_breakpointEnableAct, &QAction::triggered, this, &MainWindow::enableBreakpointAtCursor); + connect(m_runToCursorAct, &QAction::triggered, this, &MainWindow::runToCursor); // Right bar options QActionGroup* rightBarGroup = new QActionGroup(this); @@ -72,7 +80,7 @@ MainWindow::MainWindow(running_machine* machine, QWidget* parent) : rightActEncrypted->setShortcut(QKeySequence("Ctrl+E")); rightActComments->setShortcut(QKeySequence("Ctrl+C")); rightActRaw->setChecked(true); - connect(rightBarGroup, SIGNAL(triggered(QAction*)), this, SLOT(rightBarChanged(QAction*))); + connect(rightBarGroup, &QActionGroup::triggered, this, &MainWindow::rightBarChanged); // Assemble the options menu QMenu* optionsMenu = menuBar()->addMenu("&Options"); @@ -115,7 +123,7 @@ MainWindow::MainWindow(running_machine* machine, QWidget* parent) : dasmDock->setAllowedAreas(Qt::TopDockWidgetArea); m_dasmFrame = new DasmDockWidget(m_machine, dasmDock); dasmDock->setWidget(m_dasmFrame); - connect(m_dasmFrame->view(), SIGNAL(updated()), this, SLOT(dasmViewUpdated())); + connect(m_dasmFrame->view(), &DebuggerView::updated, this, &MainWindow::dasmViewUpdated); addDockWidget(Qt::TopDockWidgetArea, dasmDock); dockMenu->addAction(dasmDock->toggleViewAction()); @@ -300,6 +308,10 @@ void MainWindow::rightBarChanged(QAction* changedTo) m_dasmFrame->view()->viewport()->update(); } +void MainWindow::executeCommandSlot() +{ + executeCommand(true); +} void MainWindow::executeCommand(bool withClear) { @@ -477,8 +489,8 @@ void MainWindow::createImagesMenu() mountAct->setData(QVariant(interfaceIndex)); unmountAct->setObjectName("unmount"); unmountAct->setData(QVariant(interfaceIndex)); - connect(mountAct, SIGNAL(triggered(bool)), this, SLOT(mountImage(bool))); - connect(unmountAct, SIGNAL(triggered(bool)), this, SLOT(unmountImage(bool))); + connect(mountAct, &QAction::triggered, this, &MainWindow::mountImage); + connect(unmountAct, &QAction::triggered, this, &MainWindow::unmountImage); if (!img->exists()) unmountAct->setEnabled(false); |