From 5d24046c224789c9679f66366639523e3bfa2813 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 1 Dec 2019 09:22:12 +0000 Subject: [PATCH] kdbg: fix build against Katie Signed-off-by: Ivailo Monev --- kdbg/kdbg/brkpt.cpp | 2 +- kdbg/kdbg/brkpt.h | 2 +- kdbg/kdbg/dbgmainwnd.cpp | 4 ++-- kdbg/kdbg/pgmargs.cpp | 2 +- kdbg/kdbg/sourcewnd.cpp | 4 ++-- kdbg/kdbg/xsldbgdriver.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kdbg/kdbg/brkpt.cpp b/kdbg/kdbg/brkpt.cpp index 1af3088d..cf6a5afb 100644 --- a/kdbg/kdbg/brkpt.cpp +++ b/kdbg/kdbg/brkpt.cpp @@ -191,7 +191,7 @@ bool BreakpointTable::eventFilter(QObject* ob, QEvent* ev) if (ev->type() == QEvent::MouseButtonPress) { QMouseEvent* mev = static_cast(ev); - if (mev->button() == Qt::MidButton) { + if (mev->button() == Qt::MiddleButton) { // enable or disable the clicked-on item BreakpointItem* bp = static_cast(m_ui.bpList->itemAt(mev->pos())); diff --git a/kdbg/kdbg/brkpt.h b/kdbg/kdbg/brkpt.h index cf8d830b..a0af8f52 100644 --- a/kdbg/kdbg/brkpt.h +++ b/kdbg/kdbg/brkpt.h @@ -31,7 +31,7 @@ protected: std::vector m_icons; void insertBreakpoint(int num, bool temp, bool enabled, QString location, - QString fileName = 0, int lineNo = -1, + QString fileName = QString(), int lineNo = -1, int hits = 0, uint ignoreCount = 0, QString condition = QString()); void initListAndIcons(); diff --git a/kdbg/kdbg/dbgmainwnd.cpp b/kdbg/kdbg/dbgmainwnd.cpp index 56b33a30..64d81605 100644 --- a/kdbg/kdbg/dbgmainwnd.cpp +++ b/kdbg/kdbg/dbgmainwnd.cpp @@ -1180,7 +1180,7 @@ void DebuggerMainWnd::slotFileExe() { // open a new executable QString executable = myGetFileName(i18n("Select the executable to debug"), - m_lastDirectory, 0, this); + m_lastDirectory, QString(), this); if (executable.isEmpty()) return; @@ -1193,7 +1193,7 @@ void DebuggerMainWnd::slotFileCore() if (m_debugger->canStart()) { QString corefile = myGetFileName(i18n("Select core dump"), - m_lastDirectory, 0, this); + m_lastDirectory, QString(), this); if (!corefile.isEmpty()) { m_debugger->useCoreFile(corefile, false); } diff --git a/kdbg/kdbg/pgmargs.cpp b/kdbg/kdbg/pgmargs.cpp index e030ac97..35631183 100644 --- a/kdbg/kdbg/pgmargs.cpp +++ b/kdbg/kdbg/pgmargs.cpp @@ -199,7 +199,7 @@ void PgmArgs::on_insertFile_clicked() // use the selection as default QString f = programArgs->selectedText(); - f = KFileDialog::getSaveFileName(f, QString::null, + f = KFileDialog::getSaveFileName(f, QString(), this, caption); // don't clear the selection if no file was selected if (!f.isEmpty()) { diff --git a/kdbg/kdbg/sourcewnd.cpp b/kdbg/kdbg/sourcewnd.cpp index d653fea4..16540cf0 100644 --- a/kdbg/kdbg/sourcewnd.cpp +++ b/kdbg/kdbg/sourcewnd.cpp @@ -336,7 +336,7 @@ void SourceWindow::find(const QString& text, bool caseSensitive, FindDirection d void SourceWindow::infoMousePress(QMouseEvent* ev) { // we handle left and middle button - if (ev->button() != Qt::LeftButton && ev->button() != Qt::MidButton) + if (ev->button() != Qt::LeftButton && ev->button() != Qt::MiddleButton) { return; } @@ -373,7 +373,7 @@ void SourceWindow::infoMousePress(QMouseEvent* ev) emit clickedLeft(m_fileName, line, address, (ev->modifiers() & Qt::ShiftModifier) != 0); break; - case Qt::MidButton: + case Qt::MiddleButton: TRACE(QString().sprintf("mid-clicked row %d", line)); emit clickedMid(m_fileName, line, address); break; diff --git a/kdbg/kdbg/xsldbgdriver.cpp b/kdbg/kdbg/xsldbgdriver.cpp index eb51322a..3bf1abb9 100644 --- a/kdbg/kdbg/xsldbgdriver.cpp +++ b/kdbg/kdbg/xsldbgdriver.cpp @@ -106,7 +106,7 @@ static XsldbgCmdInfo cmds[] = { XsldbgDriver::XsldbgDriver(): DebuggerDriver() { - m_haveDataFile = FALSE; + m_haveDataFile = false; #ifndef NDEBUG // check command info array