summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2018-09-19 07:04:35 +0200
committerLaurent Montel <[email protected]>2018-09-19 07:04:35 +0200
commitce006ca35dd9688a15d952215ba324918c9b322c (patch)
tree816041d00e6ff8d2a862484c0a8bcfb797e3abbe
parentb37c1f35f56b2aaaf5b918366050ea2d0f4f0980 (diff)
Make it compile with KDEFrameworkCompilerSettings
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/backtracegenerator.cpp2
-rw-r--r--src/debuggerlaunchers.h2
-rw-r--r--src/findconfigdatajob.h2
-rw-r--r--src/kdbgwin/abstract_generator.h2
-rw-r--r--src/kdbgwin/outputters.h2
-rw-r--r--src/statusnotifier.h2
-rw-r--r--src/tests/backtraceparsertest/backtraceparsertest.cpp4
8 files changed, 9 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 802236d..364f90a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
include(ECMMarkAsTest)
@@ -74,10 +74,6 @@ endif()
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
-add_definitions(-DQT_NO_CAST_FROM_ASCII)
-add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
add_subdirectory(src)
diff --git a/src/backtracegenerator.cpp b/src/backtracegenerator.cpp
index 208e9e2..91986c4 100644
--- a/src/backtracegenerator.cpp
+++ b/src/backtracegenerator.cpp
@@ -122,7 +122,7 @@ void BacktraceGenerator::slotReadInput()
int pos;
while ((pos = m_output.indexOf('\n')) != -1) {
- QString line = QString::fromLocal8Bit(m_output, pos + 1);
+ QString line = QString::fromLocal8Bit(m_output.constData(), pos + 1);
m_output.remove(0, pos + 1);
emit newLine(line);
diff --git a/src/debuggerlaunchers.h b/src/debuggerlaunchers.h
index 5325315..d4862b3 100644
--- a/src/debuggerlaunchers.h
+++ b/src/debuggerlaunchers.h
@@ -66,7 +66,7 @@ class TerminalDebuggerLauncher : public DefaultDebuggerLauncher
public:
explicit TerminalDebuggerLauncher(const Debugger & debugger, DebuggerManager *parent = 0);
-public slots:
+public Q_SLOTS:
virtual void start();
};
#endif
diff --git a/src/findconfigdatajob.h b/src/findconfigdatajob.h
index f292303..d3d5590 100644
--- a/src/findconfigdatajob.h
+++ b/src/findconfigdatajob.h
@@ -57,7 +57,7 @@ class FindConfigDataJob : public KJob
*/
QStringList data(InformationType type);
- private slots:
+ private Q_SLOTS:
void receivedData(KJob *job);
private:
diff --git a/src/kdbgwin/abstract_generator.h b/src/kdbgwin/abstract_generator.h
index cf9b26d..9222cf3 100644
--- a/src/kdbgwin/abstract_generator.h
+++ b/src/kdbgwin/abstract_generator.h
@@ -108,7 +108,7 @@ public:
/// Tries to load a symbol file for a module loaded at dwBaseAddr
virtual void LoadSymbol(const QString& module, DWORD64 dwBaseAddr) = 0;
-signals:
+Q_SIGNALS:
/// This will be emitted whenever the generator wishes to output information. It can either be
/// module information (in the form: "Loaded C:\path\to.dll (symbols loaded)", a stack frame line,
/// or newlines
diff --git a/src/kdbgwin/outputters.h b/src/kdbgwin/outputters.h
index 604d368..a90f0f7 100644
--- a/src/kdbgwin/outputters.h
+++ b/src/kdbgwin/outputters.h
@@ -43,7 +43,7 @@ protected:
public:
Outputter();
-public slots:
+public Q_SLOTS:
/// The slot that will be called for each line emitted by the generator. This method
/// sends the string to stdout and qCDebug(DRKONQI_LOG)
void OnDebugLine(const QString&);
diff --git a/src/statusnotifier.h b/src/statusnotifier.h
index b5fa7a5..db42afd 100644
--- a/src/statusnotifier.h
+++ b/src/statusnotifier.h
@@ -38,7 +38,7 @@ public:
static bool notificationServiceRegistered();
-signals:
+Q_SIGNALS:
void expired();
void activated();
diff --git a/src/tests/backtraceparsertest/backtraceparsertest.cpp b/src/tests/backtraceparsertest/backtraceparsertest.cpp
index 5da5628..7371b6e 100644
--- a/src/tests/backtraceparsertest/backtraceparsertest.cpp
+++ b/src/tests/backtraceparsertest/backtraceparsertest.cpp
@@ -43,7 +43,7 @@ void BacktraceParserTest::fetchData(const QString & group)
m_settings.endGroup();
foreach(const QString & key, keys) {
- QTest::newRow(key.toLocal8Bit())
+ QTest::newRow(qPrintable(key))
<< QString(QString::fromLatin1(DATA_DIR) + QLatin1Char('/') + key)
<< m_settings.value(group + QLatin1Char('/') + key).toString()
<< m_settings.value(QStringLiteral("debugger/") + key).toString();
@@ -105,7 +105,7 @@ void BacktraceParserTest::btParserBenchmark_data()
m_settings.beginGroup(QStringLiteral("debugger"));
QStringList keys = m_settings.allKeys();
foreach(const QString & key, keys) {
- QTest::newRow(key.toLocal8Bit())
+ QTest::newRow(qPrintable(key))
<< QString(QString::fromLatin1(DATA_DIR) + QLatin1Char('/') + key)
<< m_settings.value(key).toString();
}