From d0e81c6a4ae58335e0868ed23fd23c375907dc13 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 16 Jun 2018 13:20:14 +0200 Subject: [PATCH] Improve coding style in QtConfigArguments --- resources/qtconfigarguments.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/qtconfigarguments.cpp b/resources/qtconfigarguments.cpp index 09646e6..c050324 100644 --- a/resources/qtconfigarguments.cpp +++ b/resources/qtconfigarguments.cpp @@ -128,7 +128,7 @@ void QtConfigArguments::applySettings(bool preventApplyingDefaultFont) const if (qEnvironmentVariableIsSet("ICON_THEME_SEARCH_PATH")) { QString path; path.append(qgetenv("ICON_THEME_SEARCH_PATH")); - QIcon::setThemeSearchPaths(QStringList() << path << QStringLiteral(":/icons")); + QIcon::setThemeSearchPaths(QStringList({ path, QStringLiteral(":/icons") })); } else { QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QStringLiteral("../share/icons") << QStringLiteral(":/icons")); } @@ -150,9 +150,7 @@ void QtConfigArguments::applySettings(bool preventApplyingDefaultFont) const try { font.setPointSize(stringToNumber(m_fontArg.values().back())); } catch (const ConversionException &) { - cerr << "Warning: The specified font size is no number and will be " - "ignored." - << endl; + cerr << Phrases::Warning << "The specified font size is no number and will be ignored." << Phrases::EndFlush; } QGuiApplication::setFont(font); }