Commit 7cb9ce57 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compiles against qt5.15 (endl other other use Qt:: namespace now)

parent 15f1251c
...@@ -42,7 +42,13 @@ RenameCategory KDebugSettingsUtil::parseRenameCategory(QString line, const QStri ...@@ -42,7 +42,13 @@ RenameCategory KDebugSettingsUtil::parseRenameCategory(QString line, const QStri
const int space = line.indexOf(QLatin1Char(' ')); const int space = line.indexOf(QLatin1Char(' '));
if (space == -1) { if (space == -1) {
qCWarning(KDEBUGSETTINGS_LOG) << "Invalid categories file. Missing space. Syntax is logname<space>description + optional element. Line: " qCWarning(KDEBUGSETTINGS_LOG) << "Invalid categories file. Missing space. Syntax is logname<space>description + optional element. Line: "
<< line << " from file:" << filename << endl; << line << " from file:" << filename
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
<< endl
#else
<< Qt::endl
#endif
;
return category; return category;
} }
...@@ -92,7 +98,13 @@ KdeLoggingCategory KDebugSettingsUtil::parseLineKdeLoggingCategory(QString line, ...@@ -92,7 +98,13 @@ KdeLoggingCategory KDebugSettingsUtil::parseLineKdeLoggingCategory(QString line,
const int space = line.indexOf(QLatin1Char(' ')); const int space = line.indexOf(QLatin1Char(' '));
if (space == -1) { if (space == -1) {
qCWarning(KDEBUGSETTINGS_LOG) << "Invalid categories file. Missing space. Syntax is logname<space>description + optional element. Line: " qCWarning(KDEBUGSETTINGS_LOG) << "Invalid categories file. Missing space. Syntax is logname<space>description + optional element. Line: "
<< line << " from file:" << filename << endl; << line << " from file:" << filename
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
<< endl
#else
<< Qt::endl
#endif
;
return category; return category;
} }
QString logName; QString logName;
......
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