Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ce006ca3 authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile with KDEFrameworkCompilerSettings

parent b37c1f35
......@@ -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)
......
......@@ -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);
......
......@@ -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
......
......@@ -57,7 +57,7 @@ class FindConfigDataJob : public KJob
*/
QStringList data(InformationType type);
private slots:
private Q_SLOTS:
void receivedData(KJob *job);
private:
......
......@@ -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
......
......@@ -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&);
......
......@@ -38,7 +38,7 @@ public:
static bool notificationServiceRegistered();
signals:
Q_SIGNALS:
void expired();
void activated();
......
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment