From 19538a8dcb4089582660f5bdfbbbac0341c25b7a Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 9 Mar 2022 17:38:46 +0100 Subject: [PATCH] Fully qualify Qt::endl, needed with Qt6 --- .../kwindecoration/kwin-applywindowdecoration.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp b/src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp index f6c79a5e14..ace08563fd 100644 --- a/src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp +++ b/src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp @@ -68,13 +68,13 @@ int main(int argc, char **argv) } } } else { - ts << i18n("You attempted to pass a file path, but this could not be resolved to a theme, and we will have to abort, due to having no theme to set") << endl; + ts << i18n("You attempted to pass a file path, but this could not be resolved to a theme, and we will have to abort, due to having no theme to set") << Qt::endl; exitCode = -1; } } if (settings->theme() == requestedTheme) { - ts << i18n("The requested theme \"%1\" is already set as the window decoration theme.", requestedTheme) << endl; + ts << i18n("The requested theme \"%1\" is already set as the window decoration theme.", requestedTheme) << Qt::endl; // not an error condition, just nothing happens } else if (themeResolved) { int index{-1}; @@ -97,18 +97,18 @@ int main(int argc, char **argv) QStringLiteral("reloadConfig")); QDBusConnection::sessionBus().send(message); ts << i18n("Successfully applied the cursor theme %1 to your current Plasma session", - model->data(model->index(index), KDecoration2::Configuration::DecorationsModel::ThemeNameRole).toString()) << endl; + model->data(model->index(index), KDecoration2::Configuration::DecorationsModel::ThemeNameRole).toString()) << Qt::endl; } else { ts << i18n("Failed to save your theme settings - the reason is unknown, but this is an unrecoverable error. You may find that simply trying again will work."); exitCode = -1; } } else { - ts << i18n("Could not find theme \"%1\". The theme should be one of the following options: %2", requestedTheme, availableThemes.join(QStringLiteral(", "))) << endl; + ts << i18n("Could not find theme \"%1\". The theme should be one of the following options: %2", requestedTheme, availableThemes.join(QStringLiteral(", "))) << Qt::endl; exitCode = -1; } } } else if (parser->isSet(QStringLiteral("list-themes"))) { - ts << i18n("You have the following KWin window decoration themes on your system:") << endl; + ts << i18n("You have the following KWin window decoration themes on your system:") << Qt::endl; for (int i = 0 ; i < model->rowCount(); ++i) { const QString displayName = model->data(model->index(i), Qt::DisplayRole).toString(); const QString themeName = model->data(model->index(i), KDecoration2::Configuration::DecorationsModel::ThemeNameRole).toString();