From 9d231a83ad8c2d76145ad3bfadd2eb5fa949d769 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 27 Dec 2015 12:58:00 +0100 Subject: qt5 debugger port [O. Galibert] --- src/osd/modules/debugger/qt/memorywindow.cpp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'src/osd/modules/debugger/qt/memorywindow.cpp') diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index e78691db6f8..925c8b86bd1 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -2,6 +2,17 @@ // copyright-holders:Andrew Gardner #define NO_MEM_TRACKING +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "memorywindow.h" #include "debug/dvmemory.h" @@ -30,13 +41,13 @@ MemoryWindow::MemoryWindow(running_machine* machine, QWidget* parent) : // The input edit m_inputEdit = new QLineEdit(topSubFrame); - connect(m_inputEdit, SIGNAL(returnPressed()), this, SLOT(expressionSubmitted())); + connect(m_inputEdit, &QLineEdit::returnPressed, this, &MemoryWindow::expressionSubmitted); // The memory space combo box m_memoryComboBox = new QComboBox(topSubFrame); m_memoryComboBox->setObjectName("memoryregion"); m_memoryComboBox->setMinimumWidth(300); - connect(m_memoryComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(memoryRegionChanged(int))); + connect(m_memoryComboBox, static_cast(&QComboBox::currentIndexChanged), this, &MemoryWindow::memoryRegionChanged); // The main memory window m_memTable = new DebuggerMemView(DVT_MEMORY, m_machine, this); @@ -97,7 +108,7 @@ MemoryWindow::MemoryWindow(running_machine* machine, QWidget* parent) : formatActEight->setShortcut(QKeySequence("Ctrl+8")); formatAct32bitFloat->setShortcut(QKeySequence("Ctrl+9")); formatActOne->setChecked(true); - connect(dataFormat, SIGNAL(triggered(QAction*)), this, SLOT(formatChanged(QAction*))); + connect(dataFormat, &QActionGroup::triggered, this, &MemoryWindow::formatChanged); // Create a address display group QActionGroup* addressGroup = new QActionGroup(this); addressGroup->setObjectName("addressgroup"); @@ -110,22 +121,22 @@ MemoryWindow::MemoryWindow(running_machine* machine, QWidget* parent) : addressActLogical->setShortcut(QKeySequence("Ctrl+G")); addressActPhysical->setShortcut(QKeySequence("Ctrl+Y")); addressActLogical->setChecked(true); - connect(addressGroup, SIGNAL(triggered(QAction*)), this, SLOT(addressChanged(QAction*))); + connect(addressGroup, &QActionGroup::triggered, this, &MemoryWindow::addressChanged); // Create a reverse view radio QAction* reverseAct = new QAction("Reverse View", this); reverseAct->setObjectName("reverse"); reverseAct->setCheckable(true); reverseAct->setShortcut(QKeySequence("Ctrl+R")); - connect(reverseAct, SIGNAL(toggled(bool)), this, SLOT(reverseChanged(bool))); + connect(reverseAct, &QAction::toggled, this, &MemoryWindow::reverseChanged); // Create increase and decrease bytes-per-line actions QAction* increaseBplAct = new QAction("Increase Bytes Per Line", this); QAction* decreaseBplAct = new QAction("Decrease Bytes Per Line", this); increaseBplAct->setShortcut(QKeySequence("Ctrl+P")); decreaseBplAct->setShortcut(QKeySequence("Ctrl+O")); - connect(increaseBplAct, SIGNAL(triggered(bool)), this, SLOT(increaseBytesPerLine(bool))); - connect(decreaseBplAct, SIGNAL(triggered(bool)), this, SLOT(decreaseBytesPerLine(bool))); + connect(increaseBplAct, &QAction::triggered, this, &MemoryWindow::increaseBytesPerLine); + connect(decreaseBplAct, &QAction::triggered, this, &MemoryWindow::decreaseBytesPerLine); // Assemble the options menu QMenu* optionsMenu = menuBar()->addMenu("&Options"); -- cgit v1.2.3-70-g09d2 From 08c8c26b629290d4776002ca14ccc2c1907b58fd Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 8 Jan 2016 13:42:19 +0100 Subject: remove usage of NO_MEM_TRACKING macro (nw) --- src/osd/modules/debugger/debugqt.cpp | 2 -- src/osd/modules/debugger/qt/breakpointswindow.cpp | 2 -- src/osd/modules/debugger/qt/dasmwindow.cpp | 2 -- src/osd/modules/debugger/qt/debuggerview.cpp | 2 -- src/osd/modules/debugger/qt/deviceinformationwindow.cpp | 2 -- src/osd/modules/debugger/qt/deviceswindow.cpp | 2 -- src/osd/modules/debugger/qt/logwindow.cpp | 2 -- src/osd/modules/debugger/qt/mainwindow.cpp | 2 -- src/osd/modules/debugger/qt/memorywindow.cpp | 2 -- src/osd/modules/debugger/qt/windowqt.cpp | 2 -- src/osd/sdl/sdlsocket.cpp | 1 - 11 files changed, 21 deletions(-) (limited to 'src/osd/modules/debugger/qt/memorywindow.cpp') diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp index 75d925f1f24..195cf38ae89 100644 --- a/src/osd/modules/debugger/debugqt.cpp +++ b/src/osd/modules/debugger/debugqt.cpp @@ -8,8 +8,6 @@ // //============================================================ -#define NO_MEM_TRACKING - #include "debug_module.h" #include "modules/osdmodule.h" diff --git a/src/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp index e1d90146b18..7b30459c8e9 100644 --- a/src/osd/modules/debugger/qt/breakpointswindow.cpp +++ b/src/osd/modules/debugger/qt/breakpointswindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include #include diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp index 71b92c59ce4..c5f9347ec25 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.cpp +++ b/src/osd/modules/debugger/qt/dasmwindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include #include diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp index c0cefdda759..319ee370392 100644 --- a/src/osd/modules/debugger/qt/debuggerview.cpp +++ b/src/osd/modules/debugger/qt/debuggerview.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include #include diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp index ca6913f0b06..54cc4406d23 100644 --- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include #include diff --git a/src/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp index 75d84f4bc7e..b9c8f276f69 100644 --- a/src/osd/modules/debugger/qt/deviceswindow.cpp +++ b/src/osd/modules/debugger/qt/deviceswindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include "deviceswindow.h" #include "deviceinformationwindow.h" diff --git a/src/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp index 38cb33d0f0b..b6e704cd5c6 100644 --- a/src/osd/modules/debugger/qt/logwindow.cpp +++ b/src/osd/modules/debugger/qt/logwindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include "logwindow.h" diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index 12b6a09dd77..ef4a3ea809c 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include #include diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index 925c8b86bd1..3992dc0fd85 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include #include diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp index 01b4983ec06..adaf96ab2e1 100644 --- a/src/osd/modules/debugger/qt/windowqt.cpp +++ b/src/osd/modules/debugger/qt/windowqt.cpp @@ -1,7 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner -#define NO_MEM_TRACKING - #include #include diff --git a/src/osd/sdl/sdlsocket.cpp b/src/osd/sdl/sdlsocket.cpp index 549729bf3e2..5d3e7030deb 100644 --- a/src/osd/sdl/sdlsocket.cpp +++ b/src/osd/sdl/sdlsocket.cpp @@ -24,7 +24,6 @@ #include #include -#define NO_MEM_TRACKING #include "emu.h" #include "sdlfile.h" -- cgit v1.2.3-70-g09d2