From 9485ca9d43dcab732325e4ba16194153ea293d4b Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sat, 1 Aug 2015 20:41:27 +0200 Subject: Revert "debugqt: Port to Qt5 [O. Galibert]" Experience shows it's too early for that. I'll keep that in a corner and we'll see again later. --- src/osd/modules/debugger/qt/dasmwindow.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'src/osd/modules/debugger/qt/dasmwindow.c') diff --git a/src/osd/modules/debugger/qt/dasmwindow.c b/src/osd/modules/debugger/qt/dasmwindow.c index 71b92c59ce4..14de9080876 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.c +++ b/src/osd/modules/debugger/qt/dasmwindow.c @@ -2,12 +2,6 @@ // copyright-holders:Andrew Gardner #define NO_MEM_TRACKING -#include -#include -#include -#include -#include - #include "dasmwindow.h" #include "debug/debugcon.h" @@ -36,17 +30,17 @@ DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) : // The input edit m_inputEdit = new QLineEdit(topSubFrame); - connect(m_inputEdit, &QLineEdit::returnPressed, this, &DasmWindow::expressionSubmitted); + connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(expressionSubmitted())); // The cpu combo box m_cpuComboBox = new QComboBox(topSubFrame); m_cpuComboBox->setObjectName("cpu"); m_cpuComboBox->setMinimumWidth(300); - connect(m_cpuComboBox, static_cast(&QComboBox::currentIndexChanged), this, &DasmWindow::cpuChanged); + connect(m_cpuComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(cpuChanged(int))); // The main disasm window m_dasmView = new DebuggerView(DVT_DISASSEMBLY, m_machine, this); - connect(m_dasmView, &DebuggerView::updated, this, &DasmWindow::dasmViewUpdated); + connect(m_dasmView, SIGNAL(updated()), this, SLOT(dasmViewUpdated())); // Force a recompute of the disassembly region downcast(m_dasmView->view())->set_expression("curpc"); @@ -83,9 +77,9 @@ DasmWindow::DasmWindow(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, &QAction::triggered, this, &DasmWindow::toggleBreakpointAtCursor); - connect(m_breakpointEnableAct, &QAction::triggered, this, &DasmWindow::enableBreakpointAtCursor); - connect(m_runToCursorAct, &QAction::triggered, this, &DasmWindow::runToCursor); + 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))); // Right bar options QActionGroup* rightBarGroup = new QActionGroup(this); @@ -103,7 +97,7 @@ DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) : rightActEncrypted->setShortcut(QKeySequence("Ctrl+E")); rightActComments->setShortcut(QKeySequence("Ctrl+C")); rightActRaw->setChecked(true); - connect(rightBarGroup, &QActionGroup::triggered, this, &DasmWindow::rightBarChanged); + connect(rightBarGroup, SIGNAL(triggered(QAction*)), this, SLOT(rightBarChanged(QAction*))); // Assemble the options menu QMenu* optionsMenu = menuBar()->addMenu("&Options"); -- cgit v1.2.3-70-g09d2