diff options
| author | 2016-04-25 20:09:51 -0400 | |
|---|---|---|
| committer | 2016-04-25 20:09:51 -0400 | |
| commit | 596678f2cd1b40c456db8f278a7f652c2a37da84 (patch) | |
| tree | a4ffbdf51889f7a63ea7dc3da3afee4535987030 /src/osd/modules/debugger/qt/memorywindow.cpp | |
| parent | ec2669cacff2ec954ba351e09ba083c4e32b4ce4 (diff) | |
| parent | e8326cdc3267591b635f4f97e5255e031ba6b834 (diff) | |
Merge remote-tracking branch 'upstream/master' into firstrun
Diffstat (limited to 'src/osd/modules/debugger/qt/memorywindow.cpp')
| -rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index 7b86740fe51..9d10dbb5024 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -19,11 +19,11 @@ MemoryWindow::MemoryWindow(running_machine* machine, QWidget* parent) : - WindowQt(machine, NULL) + WindowQt(machine, nullptr) { setWindowTitle("Debug: Memory View"); - if (parent != NULL) + if (parent != nullptr) { QPoint parentPos = parent->pos(); setGeometry(parentPos.x()+100, parentPos.y()+100, 800, 400); @@ -278,7 +278,7 @@ void MemoryWindow::decreaseBytesPerLine(bool checked) void MemoryWindow::populateComboBox() { - if (m_memTable == NULL) + if (m_memTable == nullptr) return; m_memoryComboBox->clear(); @@ -312,7 +312,7 @@ QAction* MemoryWindow::dataFormatMenuItem(const QString& itemName) return actions[j]; } } - return NULL; + return nullptr; } @@ -357,7 +357,7 @@ void DebuggerMemView::mousePressEvent(QMouseEvent* event) { // TODO: You can specify a box that the tooltip stays alive within - might be good? const QString addressAndPc = QString("Address %1 written at PC=%2").arg(address, 2, 16).arg(pc, 2, 16); - QToolTip::showText(QCursor::pos(), addressAndPc, NULL); + QToolTip::showText(QCursor::pos(), addressAndPc, nullptr); // Copy the PC into the clipboard as well QClipboard *clipboard = QApplication::clipboard(); @@ -365,7 +365,7 @@ void DebuggerMemView::mousePressEvent(QMouseEvent* event) } else { - QToolTip::showText(QCursor::pos(), "UNKNOWN PC", NULL); + QToolTip::showText(QCursor::pos(), "UNKNOWN PC", nullptr); } } |
