Commit aa54e5dd authored by Alexander Lohnau's avatar Alexander Lohnau
Browse files

Fix -Wclazy-qstring-arg warnings

parent fda6d411
...@@ -296,7 +296,7 @@ static void createGtkrc( const QPalette& cg, bool exportGtkTheme, const QString& ...@@ -296,7 +296,7 @@ static void createGtkrc( const QPalette& cg, bool exportGtkTheme, const QString&
if (!exist_gtkrc) if (!exist_gtkrc)
{ {
QString gtk2ThemeFilename; QString gtk2ThemeFilename;
gtk2ThemeFilename = QStringLiteral("%1/.themes/%2/gtk-2.0/gtkrc").arg(QDir::homePath()).arg(gtkStyle); gtk2ThemeFilename = QStringLiteral("%1/.themes/%2/gtk-2.0/gtkrc").arg(QDir::homePath(), gtkStyle);
if (!QFile::exists(gtk2ThemeFilename)) { if (!QFile::exists(gtk2ThemeFilename)) {
QStringList gtk2ThemePath; QStringList gtk2ThemePath;
gtk2ThemeFilename.clear(); gtk2ThemeFilename.clear();
...@@ -306,7 +306,7 @@ static void createGtkrc( const QPalette& cg, bool exportGtkTheme, const QString& ...@@ -306,7 +306,7 @@ static void createGtkrc( const QPalette& cg, bool exportGtkTheme, const QString&
gtk2ThemePath.removeDuplicates(); gtk2ThemePath.removeDuplicates();
for (int i = 0; i < gtk2ThemePath.size(); ++i) for (int i = 0; i < gtk2ThemePath.size(); ++i)
{ {
gtk2ThemeFilename = QStringLiteral("%1/themes/%2/gtk-2.0/gtkrc").arg(gtk2ThemePath.at(i)).arg(gtkStyle); gtk2ThemeFilename = QStringLiteral("%1/themes/%2/gtk-2.0/gtkrc").arg(gtk2ThemePath.at(i), gtkStyle);
if (QFile::exists(gtk2ThemeFilename)) if (QFile::exists(gtk2ThemeFilename))
break; break;
else else
......
...@@ -39,8 +39,8 @@ void TestChromeBookmarks::bookmarkFinderShouldFindEachProfileDirectory() ...@@ -39,8 +39,8 @@ void TestChromeBookmarks::bookmarkFinderShouldFindEachProfileDirectory()
QList<Profile> profiles = findChrome.find(); QList<Profile> profiles = findChrome.find();
QCOMPARE(profiles.size(), 2); QCOMPARE(profiles.size(), 2);
QCOMPARE(profiles[0].path(), profileTemplate.arg("chromium").arg("Default")); QCOMPARE(profiles[0].path(), profileTemplate.arg("chromium", "Default"));
QCOMPARE(profiles[1].path(), profileTemplate.arg("chromium").arg("Profile 1")); QCOMPARE(profiles[1].path(), profileTemplate.arg("chromium", "Profile 1"));
} }
void TestChromeBookmarks::bookmarkFinderShouldReportNoProfilesOnErrors() void TestChromeBookmarks::bookmarkFinderShouldReportNoProfilesOnErrors()
......
...@@ -199,13 +199,13 @@ void ServiceRunnerTest::testForeignAppsOutscoreKCMs() ...@@ -199,13 +199,13 @@ void ServiceRunnerTest::testForeignAppsOutscoreKCMs()
// KDE app should be >= non-KDE app // KDE app should be >= non-KDE app
QVERIFY2(virtThingsRelevance >= virtManRelevance, QVERIFY2(virtThingsRelevance >= virtManRelevance,
qPrintable(QStringLiteral("%1 >= %2").arg(virtThingsRelevance.value()).arg(virtManRelevance.value()))); qPrintable(QStringLiteral("%1 >= %2").arg(virtThingsRelevance.value(), virtManRelevance.value())));
// KDE app strictly greater KDE kcm // KDE app strictly greater KDE kcm
QVERIFY2(virtThingsRelevance > kcmRelevance, QVERIFY2(virtThingsRelevance > kcmRelevance,
qPrintable(QStringLiteral("%1 > %2").arg(virtThingsRelevance.value()).arg(kcmRelevance.value()))); qPrintable(QStringLiteral("%1 > %2").arg(virtThingsRelevance.value(), kcmRelevance.value())));
// non-KDE app also strictly greater (because it is an app) // non-KDE app also strictly greater (because it is an app)
QVERIFY2(virtManRelevance > kcmRelevance, QVERIFY2(virtManRelevance > kcmRelevance,
qPrintable(QStringLiteral("%1 > %2").arg(virtManRelevance.value()).arg(kcmRelevance.value()))); qPrintable(QStringLiteral("%1 > %2").arg(virtManRelevance.value(), kcmRelevance.value())));
} }
void ServiceRunnerTest::testINotifyUsage() void ServiceRunnerTest::testINotifyUsage()
......
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