From f7942d879aa5d9d2d8fece66b795c86715f1fa95 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 28 May 2019 14:07:08 +0200 Subject: [PATCH] drop some qt2 deprecated Signed-off-by: gregory guy (cherry picked from commit b84d4a9cc76005af43c2e42c7390b3680813fb45) --- kdbg/debugger.cpp | 14 ++++++-------- kdbg/pgmargs.cpp | 14 +++++++------- kdbg/typetable.h | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/kdbg/debugger.cpp b/kdbg/debugger.cpp index 5d0f517..4d86803 100644 --- a/kdbg/debugger.cpp +++ b/kdbg/debugger.cpp @@ -11,10 +11,10 @@ #include "exprwnd.h" #include "pgmsettings.h" #include "programconfig.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include /* i18n */ @@ -1451,8 +1451,7 @@ bool KDebugger::handlePrintDeref(CmdQueueItem* cmd, const char* output) void KDebugger::handleBacktrace(const char* output) { // reduce flicker - m_btWindow.setAutoUpdate(false); - + m_btWindow.setUpdatesEnabled(false); m_btWindow.clear(); std::list stack; @@ -1475,8 +1474,7 @@ void KDebugger::handleBacktrace(const char* output) TQString().setNum(frm->lineNo+1) + ")"); } } - - m_btWindow.setAutoUpdate(true); + m_btWindow.setUpdatesEnabled(true); m_btWindow.repaint(); } diff --git a/kdbg/pgmargs.cpp b/kdbg/pgmargs.cpp index d427ed6..d375a02 100644 --- a/kdbg/pgmargs.cpp +++ b/kdbg/pgmargs.cpp @@ -5,11 +5,11 @@ */ #include "pgmargs.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include /* i18n */ @@ -216,7 +216,7 @@ void PgmArgs::browseArgFile() TQString caption = i18n("Select a file name to insert as program argument"); // use the selection as default - TQString f = programArgs->markedText(); + TQString f = programArgs->selectedText(); f = KFileDialog::getSaveFileName(f, TQString::null, this, caption); // don't clear the selection if no file was selected @@ -230,7 +230,7 @@ void PgmArgs::browseArgDir() TQString caption = i18n("Select a directory to insert as program argument"); // use the selection as default - TQString f = programArgs->markedText(); + TQString f = programArgs->selectedText(); f = KFileDialog::getExistingDirectory(f, this, caption); // don't clear the selection if no file was selected if (!f.isEmpty()) { diff --git a/kdbg/typetable.h b/kdbg/typetable.h index c58e55a..fc691e3 100644 --- a/kdbg/typetable.h +++ b/kdbg/typetable.h @@ -98,7 +98,7 @@ public: * Does the file name match this library? */ bool matchFileName(const TQString& fileName) const { - return m_shlibNameRE.match(fileName) >= 0; + return m_shlibNameRE.exactMatch(fileName) >= 0; } /**