Fully qualify Qt::endl, needed with Qt6

This commit is contained in:
Volker Krause 2022-03-09 17:38:46 +01:00
parent 7188f8fbd1
commit 19538a8dcb

View file

@ -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();