Hello community, here is the log from the commit of package kactivities-stats for openSUSE:Factory checked in at 2018-10-22 11:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities-stats (Old) and /work/SRC/openSUSE:Factory/.kactivities-stats.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities-stats" Mon Oct 22 11:21:55 2018 rev:30 rq:643266 version:5.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities-stats/kactivities-stats.changes 2018-10-01 08:04:56.966399889 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities-stats.new/kactivities-stats.changes 2018-10-22 11:22:34.691202096 +0200 @@ -1,0 +2,20 @@ +Fri Oct 19 09:03:09 UTC 2018 - wba...@tmo.at + +- Use gcc7 on Leap 42.3, it fails to build with 4.8 + +------------------------------------------------------------------- +Tue Oct 16 08:01:47 UTC 2018 - Luca Beltrame <lbeltr...@kde.org> + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:51:46 UTC 2018 - lbeltr...@kde.org + +- Update to 5.51.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.51.0.php +- Changes since 5.50.0: + * Make it compile with strict compile flags + +------------------------------------------------------------------- Old: ---- kactivities-stats-5.50.0.tar.xz New: ---- kactivities-stats-5.51.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities-stats.spec ++++++ --- /var/tmp/diff_new_pack.Qf4C5t/_old 2018-10-22 11:22:35.159201623 +0200 +++ /var/tmp/diff_new_pack.Qf4C5t/_new 2018-10-22 11:22:35.163201618 +0200 @@ -12,23 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define lname libKF5ActivitiesStats1 -%define _tar_path 5.50 +%define _tar_path 5.51 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kactivities-stats -Version: 5.50.0 +Version: 5.51.0 Release: 0 Summary: KDE Plasma Activities support License: LGPL-2.0-or-later Group: System/Libraries -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-stats-%{version}.tar.xz Source1: baselibs.conf BuildRequires: cmake >= 3.0 @@ -45,6 +45,8 @@ BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +BuildRequires: gcc7-c++ %endif %description @@ -72,6 +74,11 @@ %setup -q -n kactivities-stats-%{version} %build + %if 0%{?suse_version} <= 1325 + # It does not build with the default compiler (GCC 4.8) on Leap 42.x + export CC=gcc-7 + export CXX=g++-7 + %endif %cmake_kf5 -d build %make_jobs ++++++ kactivities-stats-5.50.0.tar.xz -> kactivities-stats-5.51.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/CMakeLists.txt new/kactivities-stats-5.51.0/CMakeLists.txt --- old/kactivities-stats-5.50.0/CMakeLists.txt 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/CMakeLists.txt 2018-10-07 12:03:39.000000000 +0200 @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.50.0") # handled by release scripts -set(KF5_DEP_VERSION "5.50.0") # handled by release scripts +set(KF5_VERSION "5.51.0") # handled by release scripts +set(KF5_DEP_VERSION "5.51.0") # handled by release scripts project (KActivitiesStats VERSION ${KF5_VERSION}) set (REQUIRED_QT_VERSION 5.8.0) @@ -20,7 +20,7 @@ # Extra CMake stuff include (FeatureSummary) -find_package (ECM 5.50.0 NO_MODULE) +find_package (ECM 5.51.0 NO_MODULE) set_package_properties (ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary (WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -28,7 +28,7 @@ include (KDEInstallDirs) include (KDECMakeSettings) -include (KDECompilerSettings NO_POLICY_SCOPE) +include (KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include (GenerateExportHeader) include (ECMGenerateHeaders) include (ECMAddQch) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/autotests/QueryTest.cpp new/kactivities-stats-5.51.0/autotests/QueryTest.cpp --- old/kactivities-stats-5.50.0/autotests/QueryTest.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/autotests/QueryTest.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -39,20 +39,20 @@ void QueryTest::testDefaults() { - TEST_CHUNK("Testing the term defaults"); + TEST_CHUNK(QStringLiteral("Testing the term defaults")); Query query; QCOMPARE(query.selection(), AllResources); - QCOMPARE(query.types(), {":any"}); - QCOMPARE(query.agents(), {":current"}); - QCOMPARE(query.activities(), {":current"}); + QCOMPARE(query.types(), {QStringLiteral(":any")}); + QCOMPARE(query.agents(), {QStringLiteral(":current")}); + QCOMPARE(query.activities(), {QStringLiteral(":current")}); QCOMPARE(query.ordering(), HighScoredFirst); } void QueryTest::testDebuggingOutput() { - TEST_CHUNK("Debugging output for a query"); + TEST_CHUNK(QStringLiteral("Debugging output for a query")); Query query; @@ -62,7 +62,7 @@ void QueryTest::testDerivationFromDefault() { - TEST_CHUNK("Testing query derivation from default") + TEST_CHUNK(QStringLiteral("Testing query derivation from default")) Query queryDefault; auto queryDerived = queryDefault | LinkedResources; @@ -78,7 +78,7 @@ void QueryTest::testDerivationFromCustom() { - TEST_CHUNK("Testing query derivation from custom") + TEST_CHUNK(QStringLiteral("Testing query derivation from custom")) Query queryCustom; auto queryDerived = queryCustom | LinkedResources; @@ -94,61 +94,61 @@ void QueryTest::testNormalSyntaxAgentManipulation() { - TEST_CHUNK("Testing normal syntax manipulation: Agents") + TEST_CHUNK(QStringLiteral("Testing normal syntax manipulation: Agents")) Query query; - query.addAgents(QStringList() << "gvim" << "kate"); + query.addAgents(QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); - QCOMPARE(query.agents(), QStringList() << "gvim" << "kate"); + QCOMPARE(query.agents(), QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); - query.addAgents(QStringList() << "kwrite"); + query.addAgents(QStringList() << QStringLiteral("kwrite")); - QCOMPARE(query.agents(), QStringList() << "gvim" << "kate" << "kwrite"); + QCOMPARE(query.agents(), QStringList() << QStringLiteral("gvim") << QStringLiteral("kate") << QStringLiteral("kwrite")); query.clearAgents(); - QCOMPARE(query.agents(), QStringList() << ":current"); + QCOMPARE(query.agents(), QStringList() << QStringLiteral(":current")); } void QueryTest::testNormalSyntaxTypeManipulation() { - TEST_CHUNK("Testing normal syntax manipulation: Types") + TEST_CHUNK(QStringLiteral("Testing normal syntax manipulation: Types")) Query query; - query.addTypes(QStringList() << "text/html" << "text/plain"); + query.addTypes(QStringList() << QStringLiteral("text/html") << QStringLiteral("text/plain")); - QCOMPARE(query.types(), QStringList() << "text/html" << "text/plain"); + QCOMPARE(query.types(), QStringList() << QStringLiteral("text/html") << QStringLiteral("text/plain")); - query.addTypes(QStringList() << "text/xml"); + query.addTypes(QStringList() << QStringLiteral("text/xml")); - QCOMPARE(query.types(), QStringList() << "text/html" << "text/plain" << "text/xml"); + QCOMPARE(query.types(), QStringList() << QStringLiteral("text/html") << QStringLiteral("text/plain") << QStringLiteral("text/xml")); query.clearTypes(); - QCOMPARE(query.types(), QStringList() << ":any"); + QCOMPARE(query.types(), QStringList() << QStringLiteral(":any")); } void QueryTest::testNormalSyntaxActivityManipulation() { - TEST_CHUNK("Testing normal syntax manipulation: Activities") + TEST_CHUNK(QStringLiteral("Testing normal syntax manipulation: Activities")) Query query; - query.addActivities(QStringList() << "a1" << "a2"); + query.addActivities(QStringList() << QStringLiteral("a1") << QStringLiteral("a2")); - QCOMPARE(query.activities(), QStringList() << "a1" << "a2"); + QCOMPARE(query.activities(), QStringList() << QStringLiteral("a1") << QStringLiteral("a2")); - query.addActivities(QStringList() << "a3"); + query.addActivities(QStringList() << QStringLiteral("a3")); - QCOMPARE(query.activities(), QStringList() << "a1" << "a2" << "a3"); + QCOMPARE(query.activities(), QStringList() << QStringLiteral("a1") << QStringLiteral("a2") << QStringLiteral("a3")); query.clearActivities(); - QCOMPARE(query.activities(), QStringList() << ":current"); + QCOMPARE(query.activities(), QStringList() << QStringLiteral(":current")); } void QueryTest::testNormalSyntaxOrderingManipulation() { - TEST_CHUNK("Testing normal syntax manipulation: Activities") + TEST_CHUNK(QStringLiteral("Testing normal syntax manipulation: Activities")) Query query; @@ -165,27 +165,27 @@ void QueryTest::testFancySyntaxBasic() { - TEST_CHUNK("Testing the fancy syntax, non c++11") + TEST_CHUNK(QStringLiteral("Testing the fancy syntax, non c++11")) auto query = LinkedResources - | Type("text") - | Type("image") - | Agent("test") + | Type(QStringLiteral("text")) + | Type(QStringLiteral("image")) + | Agent(QStringLiteral("test")) | RecentlyCreatedFirst; QCOMPARE(query.selection(), LinkedResources); - QCOMPARE(query.types(), QStringList() << "text" << "image"); - QCOMPARE(query.agents(), QStringList() << "test"); - QCOMPARE(query.activities(), QStringList() << ":current"); + QCOMPARE(query.types(), QStringList() << QStringLiteral("text") << QStringLiteral("image")); + QCOMPARE(query.agents(), QStringList() << QStringLiteral("test")); + QCOMPARE(query.activities(), QStringList() << QStringLiteral(":current")); QCOMPARE(query.ordering(), RecentlyCreatedFirst); #ifdef Q_COMPILER_INITIALIZER_LISTS - TEST_CHUNK("Testing the fancy syntax, c++11") + TEST_CHUNK(QStringLiteral("Testing the fancy syntax, c++11")) // Testing the fancy c++11 syntax auto queryCXX11 = LinkedResources - | Type{"text", "image"} - | Agent{"test"} + | Type{QStringLiteral("text"), QStringLiteral("image")} + | Agent{QStringLiteral("test")} | RecentlyCreatedFirst; QCOMPARE(query, queryCXX11); @@ -194,82 +194,82 @@ void QueryTest::testFancySyntaxAgentDefinition() { - TEST_CHUNK("Testing the fancy syntax, agent definition") + TEST_CHUNK(QStringLiteral("Testing the fancy syntax, agent definition")) { auto query = LinkedResources | OrderByUrl; - QCOMPARE(query.agents(), QStringList() << ":current"); + QCOMPARE(query.agents(), QStringList() << QStringLiteral(":current")); } { - auto query = LinkedResources | Agent("gvim"); - QCOMPARE(query.agents(), QStringList() << "gvim"); + auto query = LinkedResources | Agent(QStringLiteral("gvim")); + QCOMPARE(query.agents(), QStringList() << QStringLiteral("gvim")); } { - auto query = LinkedResources | Agent("gvim") | Agent("kate"); - QCOMPARE(query.agents(), QStringList() << "gvim" << "kate"); + auto query = LinkedResources | Agent(QStringLiteral("gvim")) | Agent(QStringLiteral("kate")); + QCOMPARE(query.agents(), QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); } { - auto query = LinkedResources | Agent(QStringList() << "gvim" << "kate"); - QCOMPARE(query.agents(), QStringList() << "gvim" << "kate"); + auto query = LinkedResources | Agent(QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); + QCOMPARE(query.agents(), QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); } } void QueryTest::testFancySyntaxTypeDefinition() { - TEST_CHUNK("Testing the fancy syntax, type definition") + TEST_CHUNK(QStringLiteral("Testing the fancy syntax, type definition")) { auto query = LinkedResources | OrderByUrl; - QCOMPARE(query.types(), QStringList() << ":any"); + QCOMPARE(query.types(), QStringList() << QStringLiteral(":any")); } { - auto query = LinkedResources | Type("text/plain"); - QCOMPARE(query.types(), QStringList() << "text/plain"); + auto query = LinkedResources | Type(QStringLiteral("text/plain")); + QCOMPARE(query.types(), QStringList() << QStringLiteral("text/plain")); } { - auto query = LinkedResources | Type("text/plain") | Type("text/html"); - QCOMPARE(query.types(), QStringList() << "text/plain" << "text/html"); + auto query = LinkedResources | Type(QStringLiteral("text/plain")) | Type(QStringLiteral("text/html")); + QCOMPARE(query.types(), QStringList() << QStringLiteral("text/plain") << QStringLiteral("text/html")); } { - auto query = LinkedResources | Type(QStringList() << "text/plain" << "text/html"); - QCOMPARE(query.types(), QStringList() << "text/plain" << "text/html"); + auto query = LinkedResources | Type(QStringList() << QStringLiteral("text/plain") << QStringLiteral("text/html")); + QCOMPARE(query.types(), QStringList() << QStringLiteral("text/plain") << QStringLiteral("text/html")); } } void QueryTest::testFancySyntaxActivityDefinition() { - TEST_CHUNK("Testing the fancy syntax, activity definition") + TEST_CHUNK(QStringLiteral("Testing the fancy syntax, activity definition")) { auto query = LinkedResources | OrderByUrl; - QCOMPARE(query.activities(), QStringList() << ":current"); + QCOMPARE(query.activities(), QStringList() << QStringLiteral(":current")); } { - auto query = LinkedResources | Activity("gvim"); - QCOMPARE(query.activities(), QStringList() << "gvim"); + auto query = LinkedResources | Activity(QStringLiteral("gvim")); + QCOMPARE(query.activities(), QStringList() << QStringLiteral("gvim")); } { - auto query = LinkedResources | Activity("gvim") | Activity("kate"); - QCOMPARE(query.activities(), QStringList() << "gvim" << "kate"); + auto query = LinkedResources | Activity(QStringLiteral("gvim")) | Activity(QStringLiteral("kate")); + QCOMPARE(query.activities(), QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); } { - auto query = LinkedResources | Activity(QStringList() << "gvim" << "kate"); - QCOMPARE(query.activities(), QStringList() << "gvim" << "kate"); + auto query = LinkedResources | Activity(QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); + QCOMPARE(query.activities(), QStringList() << QStringLiteral("gvim") << QStringLiteral("kate")); } } void QueryTest::testFancySyntaxOrderingDefinition() { - TEST_CHUNK("Testing the fancy syntax, activity definition") + TEST_CHUNK(QStringLiteral("Testing the fancy syntax, activity definition")) { auto query = LinkedResources | OrderByUrl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/autotests/ResultSetQuickCheckTest.cpp new/kactivities-stats-5.51.0/autotests/ResultSetQuickCheckTest.cpp --- old/kactivities-stats-5.50.0/autotests/ResultSetQuickCheckTest.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/autotests/ResultSetQuickCheckTest.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -80,15 +80,15 @@ { return item.targettedResource - + ':' + resourceTitle(item.targettedResource) - + '(' + QString::number(item.cachedScore) + ')'; + + QLatin1Char(':') + resourceTitle(item.targettedResource) + + QLatin1Char('(') + QString::number(item.cachedScore) + QLatin1Char(')'); } QString toQString(const ResourceLink::Item &item) { return item.targettedResource - + ':' + resourceTitle(item.targettedResource) + + QLatin1Char(':') + resourceTitle(item.targettedResource) // + '(' + QString::number(0/* item.score */) + ')' ; } @@ -97,8 +97,8 @@ { return item.resource() - + ':' + item.title() - + '(' + QString::number(item.score()) + ')'; + + QLatin1Char(':') + item.title() + + QLatin1Char('(') + QString::number(item.score()) + QLatin1Char(')'); } bool operator==(const ResourceScoreCache::Item &left, @@ -136,7 +136,7 @@ auto rightString = toQString(*rightIt); if (*leftIt == *rightIt) { - rightString.fill('.'); + rightString.fill(QLatin1Char('.')); } else { equal = false; @@ -144,10 +144,10 @@ int longer = qMax(leftString.length(), rightString.length()); leftString = leftString.leftJustified(longer); - rightString = rightString.leftJustified(longer, '.'); + rightString = rightString.leftJustified(longer, QLatin1Char('.')); - leftLine += " " + leftString; - rightLine += " " + rightString; + leftLine += QStringLiteral(" ") + leftString; + rightLine += QStringLiteral(" ") + rightString; } // So far, we are equal, but do we have the same number @@ -155,18 +155,18 @@ if (leftIt != leftEnd) { for (; leftIt != leftEnd; ++leftIt) { auto item = toQString(*leftIt); - leftLine += " " + item; - item.fill('X'); - rightLine += " " + item; + leftLine += QStringLiteral(" ") + item; + item.fill(QLatin1Char('X')); + rightLine += QStringLiteral(" ") + item; } equal = false; } else if (rightIt != rightEnd) { for (; rightIt != rightEnd; ++rightIt) { auto item = toQString(*leftIt); - rightLine += " " + item; - item.fill('X'); - leftLine += " " + item; + rightLine += QStringLiteral(" ") + item; + item.fill(QLatin1Char('X')); + leftLine += QStringLiteral(" ") + item; } equal = false; } @@ -193,25 +193,25 @@ QString databaseFile; - int dbArgIndex = QCoreApplication::arguments().indexOf("--ResultSetQuickCheckDatabase"); + int dbArgIndex = QCoreApplication::arguments().indexOf(QStringLiteral("--ResultSetQuickCheckDatabase")); if (dbArgIndex > 0) { databaseFile = QCoreApplication::arguments()[dbArgIndex+1]; - qDebug() << "Using an existing database: " + databaseFile; + qDebug() << "Using an existing database: " << databaseFile; Common::ResourcesDatabaseSchema::overridePath(databaseFile); pullFromDatabase(); } else { - QTemporaryDir dir(QDir::tempPath() + "/KActivitiesStatsTest_ResultSetQuickCheckTest_XXXXXX"); + QTemporaryDir dir(QDir::tempPath() + QStringLiteral("/KActivitiesStatsTest_ResultSetQuickCheckTest_XXXXXX")); dir.setAutoRemove(false); if (!dir.isValid()) { qFatal("Can not create a temporary directory"); } - databaseFile = dir.path() + "/database"; + databaseFile = dir.path() + QStringLiteral("/database"); qDebug() << "Creating database in " << databaseFile; Common::ResourcesDatabaseSchema::overridePath(databaseFile); @@ -232,30 +232,30 @@ pushToDatabase(); } - if (QCoreApplication::arguments().contains("--show-data")) { + if (QCoreApplication::arguments().contains(QLatin1String("--show-data"))) { QString rscs; for (const auto& rsc: resourceScoreCaches) { - rscs += '(' + rsc.targettedResource + - ',' + rsc.usedActivity + - ',' + rsc.initiatingAgent + - ',' + rsc.cachedScore + - ')'; + rscs += QLatin1Char('(') + rsc.targettedResource + + QLatin1Char(',') + rsc.usedActivity + + QLatin1Char(',') + rsc.initiatingAgent + + QLatin1Char(',') + QString::number(rsc.cachedScore) + + QLatin1Char(')'); } QString ris; for (const auto& ri: resourceInfos) { - ris += '(' + ri.targettedResource + - ',' + ri.title + - ',' + ri.mimetype + - ')'; + ris += QLatin1Char('(') + ri.targettedResource + + QLatin1Char(',') + ri.title + + QLatin1Char(',') + ri.mimetype + + QLatin1Char(')'); } QString rls; for (const auto& rl: resourceLinks) { - rls += '(' + rl.targettedResource + - ',' + rl.usedActivity + - ',' + rl.initiatingAgent + - ')'; + rls += QLatin1Char('(') + rl.targettedResource + + QLatin1Char(',') + rl.usedActivity + + QLatin1Char(',') + rl.initiatingAgent + + QLatin1Char(')'); } qDebug() << "\nUsed data: -----------------------------" @@ -287,35 +287,35 @@ void ResultSetQuickCheckTest::generateAgentsList() { for (int i = 0; i < NUMBER_AGENTS; ++i) { - agentsList << "Agent_" + QString::number(i); + agentsList << QStringLiteral("Agent_") + QString::number(i); } } void ResultSetQuickCheckTest::generateTypesList() { typesList - << "application/postscript" - << "application/pdf" - << "image/x-psd" - << "image/x-sgi" - << "image/x-tga" - << "image/x-xbitmap" - << "image/x-xwindowdump" - << "image/x-xcf" - << "image/x-compressed-xcf" - << "image/tiff" - << "image/jpeg" - << "image/x-psp" - << "image/png" - << "image/x-icon" - << "image/x-xpixmap" - << "image/svg+xml" - << "application/pdf" - << "image/x-wmf" - << "image/jp2" - << "image/jpeg2000" - << "image/jpx" - << "image/x-xcursor"; + << QStringLiteral("application/postscript") + << QStringLiteral("application/pdf") + << QStringLiteral("image/x-psd") + << QStringLiteral("image/x-sgi") + << QStringLiteral("image/x-tga") + << QStringLiteral("image/x-xbitmap") + << QStringLiteral("image/x-xwindowdump") + << QStringLiteral("image/x-xcf") + << QStringLiteral("image/x-compressed-xcf") + << QStringLiteral("image/tiff") + << QStringLiteral("image/jpeg") + << QStringLiteral("image/x-psp") + << QStringLiteral("image/png") + << QStringLiteral("image/x-icon") + << QStringLiteral("image/x-xpixmap") + << QStringLiteral("image/svg+xml") + << QStringLiteral("application/pdf") + << QStringLiteral("image/x-wmf") + << QStringLiteral("image/jp2") + << QStringLiteral("image/jpeg2000") + << QStringLiteral("image/jpx") + << QStringLiteral("image/x-xcursor"); } void ResultSetQuickCheckTest::generateResourcesList() @@ -323,7 +323,7 @@ for (int i = 0; i < NUMBER_RESOURCES; ++i) { resourcesList << ( QStringLiteral("/r") - + (i < 10 ? "0" : "") + + (i < 10 ? QStringLiteral("0") : QString()) + QString::number(i) ); } @@ -337,7 +337,7 @@ ResourceInfo::Item ri; ri.targettedResource = resource; - ri.title = "Title_" + QString::number(qrand() % 100); + ri.title = QStringLiteral("Title_") + QString::number(qrand() % 100); ri.mimetype = randItem(typesList); resourceInfos.insert(ri); @@ -388,28 +388,28 @@ Common::ResourcesDatabaseSchema::initSchema(*database); // Inserting activities, so that a test can be replicated - database->execQuery("CREATE TABLE Activity (activity TEXT)"); + database->execQuery(QStringLiteral("CREATE TABLE Activity (activity TEXT)")); for (const auto& activity: activitiesList) { database->execQuery(QStringLiteral("INSERT INTO Activity VALUES ('%1')") .arg(activity)); } // Inserting agent, so that a test can be replicated - database->execQuery("CREATE TABLE Agent (agent TEXT)"); + database->execQuery(QStringLiteral("CREATE TABLE Agent (agent TEXT)")); for (const auto& agent: agentsList) { database->execQuery(QStringLiteral("INSERT INTO Agent VALUES ('%1')") .arg(agent)); } // Inserting types, so that a test can be replicated - database->execQuery("CREATE TABLE Type (type TEXT)"); + database->execQuery(QStringLiteral("CREATE TABLE Type (type TEXT)")); for (const auto& type: typesList) { database->execQuery(QStringLiteral("INSERT INTO Type VALUES ('%1')") .arg(type)); } // Inserting resources, so that a test can be replicated - database->execQuery("CREATE TABLE Resource (resource TEXT)"); + database->execQuery(QStringLiteral("CREATE TABLE Resource (resource TEXT)")); for (const auto& resource: resourcesList) { database->execQuery(QStringLiteral("INSERT INTO Resource VALUES ('%1')") .arg(resource)); @@ -523,57 +523,57 @@ Common::Database::ReadWrite ); - auto activityQuery = database->execQuery("SELECT * FROM Activity"); + auto activityQuery = database->execQuery(QStringLiteral("SELECT * FROM Activity")); for (const auto& activity: activityQuery) { activitiesList << activity[0].toString(); } - auto agentQuery = database->execQuery("SELECT * FROM Agent"); + auto agentQuery = database->execQuery(QStringLiteral("SELECT * FROM Agent")); for (const auto& agent: agentQuery) { agentsList << agent[0].toString(); } - auto typeQuery = database->execQuery("SELECT * FROM Type"); + auto typeQuery = database->execQuery(QStringLiteral("SELECT * FROM Type")); for (const auto& type: typeQuery) { typesList << type[0].toString(); } - auto resourceQuery = database->execQuery("SELECT * FROM Resource"); + auto resourceQuery = database->execQuery(QStringLiteral("SELECT * FROM Resource")); for (const auto& resource: resourceQuery) { resourcesList << resource[0].toString(); } - auto rscQuery = database->execQuery("SELECT * FROM ResourceScoreCache"); + auto rscQuery = database->execQuery(QStringLiteral("SELECT * FROM ResourceScoreCache")); for (const auto &rsc: rscQuery) { ResourceScoreCache::Item item; - item.usedActivity = rsc["usedActivity"].toString(); - item.initiatingAgent = rsc["initiatingAgent"].toString(); - item.targettedResource = rsc["targettedResource"].toString(); - item.cachedScore = rsc["cachedScore"].toDouble(); - item.firstUpdate = rsc["firstUpdate"].toInt(); - item.lastUpdate = rsc["lastUpdate"].toInt(); + item.usedActivity = rsc[QStringLiteral("usedActivity")].toString(); + item.initiatingAgent = rsc[QStringLiteral("initiatingAgent")].toString(); + item.targettedResource = rsc[QStringLiteral("targettedResource")].toString(); + item.cachedScore = rsc[QStringLiteral("cachedScore")].toDouble(); + item.firstUpdate = rsc[QStringLiteral("firstUpdate")].toInt(); + item.lastUpdate = rsc[QStringLiteral("lastUpdate")].toInt(); resourceScoreCaches.insert(item); } - auto riQuery = database->execQuery("SELECT * FROM ResourceInfo"); + auto riQuery = database->execQuery(QStringLiteral("SELECT * FROM ResourceInfo")); for (const auto& ri: riQuery) { ResourceInfo::Item item; - item.targettedResource = ri["targettedResource"].toString(); - item.title = ri["title"].toString(); - item.mimetype = ri["mimetype"].toString(); + item.targettedResource = ri[QStringLiteral("targettedResource")].toString(); + item.title = ri[QStringLiteral("title")].toString(); + item.mimetype = ri[QStringLiteral("mimetype")].toString(); resourceInfos.insert(item); } - auto rlQuery = database->execQuery("SELECT * FROM ResourceLink"); + auto rlQuery = database->execQuery(QStringLiteral("SELECT * FROM ResourceLink")); for (const auto& rl: rlQuery) { ResourceLink::Item item; - item.targettedResource = rl["targettedResource"].toString(); - item.usedActivity = rl["usedActivity"].toString(); - item.initiatingAgent = rl["initiatingAgent"].toString(); + item.targettedResource = rl[QStringLiteral("targettedResource")].toString(); + item.usedActivity = rl[QStringLiteral("usedActivity")].toString(); + item.initiatingAgent = rl[QStringLiteral("initiatingAgent")].toString(); resourceLinks.insert(item); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/autotests/ResultSetTest.cpp new/kactivities-stats-5.51.0/autotests/ResultSetTest.cpp --- old/kactivities-stats-5.50.0/autotests/ResultSetTest.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/autotests/ResultSetTest.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -48,7 +48,7 @@ namespace { QString getBarredUri(const KAStats::ResultSet::Result &result) { - return result.resource() + "|"; + return result.resource() + QStringLiteral("|"); } QString concatenateResults(const KAStats::ResultSet &results) @@ -89,7 +89,7 @@ qDebug() << "Agent: " << QCoreApplication::instance()->applicationName(); - TEST_CHUNK("Getting the used resources by the highest score, default query") + TEST_CHUNK(QStringLiteral("Getting the used resources by the highest score, default query")) { ResultSet result(UsedResources); @@ -111,18 +111,18 @@ concatenateResults(result)); } - TEST_CHUNK("Getting the used resources by the highest score, gvim") + TEST_CHUNK(QStringLiteral("Getting the used resources by the highest score, gvim")) { ResultSet result(UsedResources | HighScoredFirst - | Agent{"gvim"} + | Agent{QStringLiteral("gvim")} ); QCOMPARE(result.at(0).resource(), QStringLiteral("/path/high1_act1_gvim")); QCOMPARE(result.at(1).resource(), QStringLiteral("/path/high4_act1_gvim")); } - TEST_CHUNK("Getting the used resources by the highest score, global agent") + TEST_CHUNK(QStringLiteral("Getting the used resources by the highest score, global agent")) { ResultSet result(UsedResources | HighScoredFirst @@ -134,7 +134,7 @@ QCOMPARE(result.at(2).resource(), QStringLiteral("/path/mid8_act1_glob")); } - TEST_CHUNK("Getting the used resources by the highest score, any agent") + TEST_CHUNK(QStringLiteral("Getting the used resources by the highest score, any agent")) { ResultSet result(UsedResources | HighScoredFirst @@ -150,14 +150,14 @@ void ResultSetTest::initTestCase() { - QTemporaryDir dir(QDir::tempPath() + "/KActivitiesStatsTest_ResultSetTest_XXXXXX"); + QTemporaryDir dir(QDir::tempPath() + QStringLiteral("/KActivitiesStatsTest_ResultSetTest_XXXXXX")); dir.setAutoRemove(false); if (!dir.isValid()) { qFatal("Can not create a temporary directory"); } - const auto databaseFile = dir.path() + "/database"; + const auto databaseFile = dir.path() + QStringLiteral("/database"); Common::ResourcesDatabaseSchema::overridePath(databaseFile); qDebug() << "Creating database in " << databaseFile; @@ -169,7 +169,7 @@ Common::ResourcesDatabaseSchema::initSchema(*database); database->execQuery( - "INSERT INTO ResourceScoreCache (usedActivity, initiatingAgent, targettedResource, scoreType, cachedScore, firstUpdate, lastUpdate) VALUES " + QStringLiteral("INSERT INTO ResourceScoreCache (usedActivity, initiatingAgent, targettedResource, scoreType, cachedScore, firstUpdate, lastUpdate) VALUES " " ('activity1' , 'gvim' , '/path/high1_act1_gvim' , '0' , '800' , '-1' , '1421446599')" " , ('activity2' , 'kate' , '/path/high2_act2_kate' , '0' , '700' , '-1' , '1421439442')" @@ -191,7 +191,7 @@ " , ('activity1' , 'gvim' , '/path/low3_act1_gvim' , '0' , '6' , '-1' , '1421434704')" " , ('activity1' , 'kate' , '/path/low2_act1_kate' , '0' , '3' , '-1' , '1421433266')" - " , ('activity1' , 'kate' , '/path/low1_act1_kate' , '0' , '2' , '-1' , '1421433254')" + " , ('activity1' , 'kate' , '/path/low1_act1_kate' , '0' , '2' , '-1' , '1421433254')") ); @@ -203,13 +203,13 @@ } database->execQuery( - "UPDATE ResourceScoreCache SET usedActivity = '" + QStringLiteral("UPDATE ResourceScoreCache SET usedActivity = '") + kamd.currentActivity() - + "' WHERE usedActivity = 'activity1'"); + + QStringLiteral("' WHERE usedActivity = 'activity1'")); database->execQuery( - "INSERT INTO ResourceLink (usedActivity, initiatingAgent, targettedResource) VALUES " + QStringLiteral("INSERT INTO ResourceLink (usedActivity, initiatingAgent, targettedResource) VALUES " "('activity1' , 'gvim' , '/path/mid1_a1')" ", ('activity1' , 'gvim' , '/path/mid2_a1')" @@ -218,7 +218,7 @@ ", ('activity2' , 'gvim' , '/path/link5_a2')" ", ('activity1' , 'kate' , '/path/link6_a1')" ", ('activity1' , 'kate' , '/path/link7_a1')" - ", ('activity1' , 'kate' , '/path/link8_a1')" + ", ('activity1' , 'kate' , '/path/link8_a1')") ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/autotests/ResultWatcherTest.cpp new/kactivities-stats-5.51.0/autotests/ResultWatcherTest.cpp --- old/kactivities-stats-5.50.0/autotests/ResultWatcherTest.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/autotests/ResultWatcherTest.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -89,19 +89,19 @@ LinkedResources | Agent::global() | Activity::any()); - watcher.linkToActivity(QUrl("test://link1"), Activity::current()); + watcher.linkToActivity(QUrl(QStringLiteral("test://link1")), Activity::current()); // A signal should arrive soon, waiting for 5 seconds at most CHECK_SIGNAL_RESULT(&watcher, &KAStats::ResultWatcher::resultLinked, 5, (const QString &uri), - QCOMPARE(QString("test://link1"), uri)); + QCOMPARE(QStringLiteral("test://link1"), uri)); - watcher.unlinkFromActivity(QUrl("test://link1"), Activity::current()); + watcher.unlinkFromActivity(QUrl(QStringLiteral("test://link1")), Activity::current()); // A signal should arrive soon, waiting for 5 seconds at most CHECK_SIGNAL_RESULT(&watcher, &KAStats::ResultWatcher::resultUnlinked, 5, (const QString &uri), - QCOMPARE(QString("test://link1"), uri)); + QCOMPARE(QStringLiteral("test://link1"), uri)); } void ResultWatcherTest::testUsedResources() @@ -116,7 +116,7 @@ // Openning a resource for a few seconds { KActivities::ResourceInstance resource(0); - resource.setUri(QUrl("test://test1")); + resource.setUri(QUrl(QStringLiteral("test://test1"))); liveSleep(3); } @@ -124,7 +124,7 @@ // A signal should arrive soon, waiting for 5 seconds at most CHECK_SIGNAL_RESULT(&watcher, &KAStats::ResultWatcher::resultScoreUpdated, 5, (const QString &uri, double), - QCOMPARE(QString("test://test1"), uri)); + QCOMPARE(QStringLiteral("test://test1"), uri)); } void ResultWatcherTest::initTestCase() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/autotests/main.cpp new/kactivities-stats-5.51.0/autotests/main.cpp --- old/kactivities-stats-5.50.0/autotests/main.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/autotests/main.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -98,8 +98,8 @@ #define ADD_TEST(TestName) \ qDebug() << "Test " << #TestName << " is enabled " \ - << (all || app.arguments().contains(#TestName)); \ - if (all || app.arguments().contains(#TestName)) { \ + << (all || app.arguments().contains(QLatin1String(#TestName))); \ + if (all || app.arguments().contains(QLatin1String(#TestName))) { \ runner << new TestName##Test(); \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/autotests/quickcheck/tables/ResourceLink.h new/kactivities-stats-5.51.0/autotests/quickcheck/tables/ResourceLink.h --- old/kactivities-stats-5.50.0/autotests/quickcheck/tables/ResourceLink.h 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/autotests/quickcheck/tables/ResourceLink.h 2018-10-07 12:03:39.000000000 +0200 @@ -46,8 +46,8 @@ { return groupBy(range, &Item::targettedResource, [](Item &acc, const Item &item) { - acc.usedActivity += item.usedActivity + ' '; - acc.initiatingAgent += item.initiatingAgent + ' '; + acc.usedActivity += item.usedActivity + QLatin1Char(' '); + acc.initiatingAgent += item.initiatingAgent + QLatin1Char(' '); }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/cleaning.cpp new/kactivities-stats-5.51.0/src/cleaning.cpp --- old/kactivities-stats-5.50.0/src/cleaning.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/cleaning.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -58,9 +58,9 @@ KAMD_DBUS_DECL_INTERFACE(scoring, Resources/Scoring, ResourcesScoring); for (const auto& activity: activities.values) { scoring.call(QStringLiteral("DeleteRecentStats"), activity, count, - what == Hours ? "h" : - what == Days ? "d" : - "m" + what == Hours ? QStringLiteral("h") : + what == Days ? QStringLiteral("d") : + QStringLiteral("m") ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/common/database/Database.cpp new/kactivities-stats-5.51.0/src/common/database/Database.cpp --- old/kactivities-stats-5.50.0/src/common/database/Database.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/common/database/Database.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -71,11 +71,11 @@ : m_open(false) { m_connectionName = - "kactivities_db_resources_" + QStringLiteral("kactivities_db_resources_") // Adding the thread number to the database name + QString::number((quintptr)info.thread) // And whether it is read-only or read-write - + (info.openMode == Database::ReadOnly ? "_readonly" : "_readwrite"); + + (info.openMode == Database::ReadOnly ? QStringLiteral("_readonly") : QStringLiteral("_readwrite")); m_database = QSqlDatabase::contains(m_connectionName) @@ -201,7 +201,7 @@ // Maybe we should use the write-ahead log auto walResult = ptr->pragma(QStringLiteral("journal_mode = WAL")); - if (walResult != "wal") { + if (walResult != QLatin1String("wal")) { qWarning("KActivities: Database can not be opened in WAL mode. Check the " "SQLite version (required >3.7.0). And whether your filesystem " "supports shared memory"); @@ -282,7 +282,7 @@ QVariant Database::pragma(const QString &pragma) const { - return value("PRAGMA " + pragma); + return value(QStringLiteral("PRAGMA ") + pragma); } QVariant Database::value(const QString &query) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/common/database/Database.h new/kactivities-stats-5.51.0/src/common/database/Database.h --- old/kactivities-stats-5.50.0/src/common/database/Database.h 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/common/database/Database.h 2018-10-07 12:03:39.000000000 +0200 @@ -108,11 +108,11 @@ // Just skip the current character isEscaped = false; - } else if (*currentPosition == '\\') { + } else if (*currentPosition == QLatin1Char('\\')) { // Skip two characters isEscaped = true; - } else if (*currentPosition == '*') { + } else if (*currentPosition == QLatin1Char('*')) { // Replacing the star with the sql like joker - % resultPattern.append(escape(stringFromIterators( currentStart, currentPosition)) + joker); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/common/database/schema/ResourcesDatabaseSchema.cpp new/kactivities-stats-5.51.0/src/common/database/schema/ResourcesDatabaseSchema.cpp --- old/kactivities-stats-5.50.0/src/common/database/schema/ResourcesDatabaseSchema.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/common/database/schema/ResourcesDatabaseSchema.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -183,18 +183,18 @@ // When the activity field was empty, it meant the file was // linked to all activities (aka :global) - database.execQuery("UPDATE ResourceLink " + updateActivity); + database.execQuery(QStringLiteral("UPDATE ResourceLink ") + updateActivity); // When the agent field was empty, it meant the file was not // linked to a specified agent (aka :global) - database.execQuery("UPDATE ResourceLink " + updateAgent); + database.execQuery(QStringLiteral("UPDATE ResourceLink ") + updateAgent); // These were not supposed to be empty, but in the case they were, // deal with them as well - database.execQuery("UPDATE ResourceEvent " + updateActivity); - database.execQuery("UPDATE ResourceEvent " + updateAgent); - database.execQuery("UPDATE ResourceScoreCache " + updateActivity); - database.execQuery("UPDATE ResourceScoreCache " + updateAgent); + database.execQuery(QStringLiteral("UPDATE ResourceEvent ") + updateActivity); + database.execQuery(QStringLiteral("UPDATE ResourceEvent ") + updateAgent); + database.execQuery(QStringLiteral("UPDATE ResourceScoreCache ") + updateActivity); + database.execQuery(QStringLiteral("UPDATE ResourceScoreCache ") + updateAgent); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/query.cpp new/kactivities-stats-5.51.0/src/query.cpp --- old/kactivities-stats-5.50.0/src/query.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/query.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -136,10 +136,10 @@ d->What.clear(); \ } -IMPLEMENT_QUERY_LIST_FIELD(Types, types, QStringList(":any")) -IMPLEMENT_QUERY_LIST_FIELD(Agents, agents, QStringList(":current")) -IMPLEMENT_QUERY_LIST_FIELD(Activities, activities, QStringList(":current")) -IMPLEMENT_QUERY_LIST_FIELD(UrlFilters, urlFilters, QStringList("*")) +IMPLEMENT_QUERY_LIST_FIELD(Types, types, QStringList(QStringLiteral(":any"))) +IMPLEMENT_QUERY_LIST_FIELD(Agents, agents, QStringList(QStringLiteral(":current"))) +IMPLEMENT_QUERY_LIST_FIELD(Activities, activities, QStringList(QStringLiteral(":current"))) +IMPLEMENT_QUERY_LIST_FIELD(UrlFilters, urlFilters, QStringList(QStringLiteral("*"))) #undef IMPLEMENT_QUERY_LIST_FIELD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/resultmodel.cpp new/kactivities-stats-5.51.0/src/resultmodel.cpp --- old/kactivities-stats-5.50.0/src/resultmodel.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/resultmodel.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -92,7 +92,7 @@ , m_clientId(clientId) { if (!m_clientId.isEmpty()) { - m_configFile = KSharedConfig::openConfig("kactivitymanagerd-statsrc"); + m_configFile = KSharedConfig::openConfig(QStringLiteral("kactivitymanagerd-statsrc")); } } @@ -205,7 +205,7 @@ m_orderingConfig = KConfigGroup(m_configFile, - "ResultModel-OrderingFor-" + m_clientId + activityTag); + QStringLiteral("ResultModel-OrderingFor-") + m_clientId + activityTag); if (m_orderingConfig.hasKey("kactivitiesLinkedItemsOrder")) { // If we have the ordering defined, use it @@ -504,7 +504,7 @@ // Check whether we got an item representing a non-existent file, // if so, schedule its removal from the database for (const auto &item: newItems) { - if (item.resource().startsWith('/') && !QFile(item.resource()).exists()) { + if (item.resource().startsWith(QLatin1Char('/')) && !QFile(item.resource()).exists()) { d->q->forgetResource(item.resource()); } } @@ -756,8 +756,8 @@ const QString activityTag = query.activities().contains(CURRENT_ACTIVITY_TAG) - ? ("-ForActivity-" + activities.currentActivity()) - : "-ForAllActivities"; + ? (QStringLiteral("-ForActivity-") + activities.currentActivity()) + : QStringLiteral("-ForAllActivities"); cache.loadOrderingConfig(activityTag); @@ -824,8 +824,8 @@ ResultSet::Result result; result.setResource(resource); - result.setTitle(" "); - result.setMimetype(" "); + result.setTitle(QStringLiteral(" ")); + result.setMimetype(QStringLiteral(" ")); fillTitleAndMimetype(result); result.setScore(score); @@ -894,18 +894,18 @@ if (!database) return; auto query = database->execQuery( - "SELECT " + QStringLiteral("SELECT " "title, mimetype " "FROM " "ResourceInfo " "WHERE " - "targettedResource = '" + result.resource() + "'" + "targettedResource = '") + result.resource() + QStringLiteral("'") ); // Only one item at most for (const auto &item: query) { - result.setTitle(item["title"].toString()); - result.setMimetype(item["mimetype"].toString()); + result.setTitle(item[QStringLiteral("title")].toString()); + result.setMimetype(item[QStringLiteral("mimetype")].toString()); } } @@ -995,10 +995,10 @@ const auto &result = d->cache[row]; - return role == Qt::DisplayRole ? ( - result.title() + " " + - result.resource() + " - " + - QString::number(result.linkStatus()) + " - " + + return role == Qt::DisplayRole ? QString( + result.title() + QStringLiteral(" ") + + result.resource() + QStringLiteral(" - ") + + QString::number(result.linkStatus()) + QStringLiteral(" - ") + QString::number(result.score()) ) : role == ResourceRole ? result.resource() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/resultset.cpp new/kactivities-stats-5.51.0/src/resultset.cpp --- old/kactivities-stats-5.50.0/src/resultset.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/resultset.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -142,20 +142,20 @@ { if (agent == QLatin1String(":any")) return QStringLiteral("1"); - return "agent = '" + ( + return QStringLiteral("agent = '") + ( agent == QLatin1String(":current") ? QCoreApplication::instance()->applicationName() : agent - ) + "'"; + ) + QStringLiteral("'"); } QString activityClause(const QString &activity) const { if (activity == QLatin1String(":any")) return QStringLiteral("1"); - return "activity = '" + ( + return QStringLiteral("activity = '") + ( activity == QLatin1String(":current") ? ActivitiesSync::currentActivity(activities) : activity - ) + "'"; + ) + QStringLiteral("'"); } inline QString starPattern(const QString &pattern) const @@ -169,14 +169,14 @@ { if (urlFilter == QLatin1String("*")) return QStringLiteral("1"); - return "resource LIKE '" + Common::starPatternToLike(urlFilter) + "' ESCAPE '\\'"; + return QStringLiteral("resource LIKE '") + Common::starPatternToLike(urlFilter) + QStringLiteral("' ESCAPE '\\'"); } QString mimetypeClause(const QString &mimetype) const { if (mimetype == QLatin1String(":any") || mimetype == QLatin1String("*")) return QStringLiteral("1"); - return "mimetype LIKE '" + Common::starPatternToLike(mimetype) + "' ESCAPE '\\'"; + return QStringLiteral("mimetype LIKE '") + Common::starPatternToLike(mimetype) + QStringLiteral("' ESCAPE '\\'"); } /** @@ -203,11 +203,11 @@ const int limit = queryDefinition.limit(); if (limit > 0) { - result += " LIMIT " + QString::number(limit); + result += QStringLiteral(" LIMIT ") + QString::number(limit); const int offset = queryDefinition.offset(); if (offset > 0) { - result += " OFFSET " + QString::number(offset); + result += QStringLiteral(" OFFSET ") + QString::number(offset); } } @@ -245,8 +245,8 @@ auto queryString = _query; - queryString.replace("ORDER_BY_CLAUSE", "ORDER BY $orderingColumn resource ASC") - .replace("LIMIT_CLAUSE", limitOffsetSuffix()); + queryString.replace(QStringLiteral("ORDER_BY_CLAUSE"), QStringLiteral("ORDER BY $orderingColumn resource ASC")) + .replace(QStringLiteral("LIMIT_CLAUSE"), limitOffsetSuffix()); return kamd::utils::debug_and_return(DEBUG_QUERIES, "Query: ", queryString @@ -264,7 +264,7 @@ // since the cache was last updated, although, for this query, // scores are not that important. static const QString queryString = - R"sql( + QStringLiteral(R"sql( SELECT rl.targettedResource as resource , SUM(rsc.cachedScore) as score @@ -297,7 +297,7 @@ ORDER_BY_CLAUSE LIMIT_CLAUSE - )sql" + )sql") ; return queryString; @@ -308,7 +308,7 @@ // TODO: We need to correct the scores based on the time that passed // since the cache was last updated static const QString queryString = - R"sql( + QStringLiteral(R"sql( SELECT rsc.targettedResource as resource , SUM(rsc.cachedScore) as score @@ -336,7 +336,7 @@ ORDER_BY_CLAUSE LIMIT_CLAUSE - )sql" + )sql") ; return queryString; @@ -348,7 +348,7 @@ // since the cache was last updated, although, for this query, // scores are not that important. static const QString queryString = - R"sql( + QStringLiteral(R"sql( WITH LinkedResourcesResults AS ( SELECT rl.targettedResource as resource @@ -426,7 +426,7 @@ ORDER_BY_CLAUSE LIMIT_CLAUSE - )sql" + )sql") ; return queryString; @@ -451,13 +451,13 @@ auto linkedActivitiesQuery = database->createQuery(); - linkedActivitiesQuery.prepare(R"sql( + linkedActivitiesQuery.prepare(QStringLiteral(R"sql( SELECT usedActivity FROM ResourceLink WHERE targettedResource = :resource - )sql"); + )sql")); - linkedActivitiesQuery.bindValue(":resource", result.resource()); + linkedActivitiesQuery.bindValue(QStringLiteral(":resource"), result.resource()); linkedActivitiesQuery.exec(); QStringList linkedActivities; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/resultwatcher.cpp new/kactivities-stats-5.51.0/src/resultwatcher.cpp --- old/kactivities-stats-5.50.0/src/resultwatcher.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/resultwatcher.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -166,8 +166,8 @@ if (!database) return QString(); auto query - = database->execQuery("SELECT mimetype FROM ResourceInfo WHERE " - "targettedResource = '" + resource + "'"); + = database->execQuery(QStringLiteral("SELECT mimetype FROM ResourceInfo WHERE " + "targettedResource = '") + resource + QStringLiteral("'")); for (const auto &item : query) { return item[0].toString(); @@ -241,7 +241,7 @@ const QString &resource, double score, uint lastUpdate, uint firstUpdate) { - Q_ASSERT_X(activity == "00000000-0000-0000-0000-000000000000" || + Q_ASSERT_X(activity == QLatin1String("00000000-0000-0000-0000-000000000000") || !QUuid(activity).isNull(), "ResultWatcher::onResourceScoreUpdated", "The activity should be always specified here, no magic values"); @@ -278,7 +278,7 @@ if (query.selection() == Terms::LinkedResources) return; if (activityMatches(activity) && agentMatches(agent)) { - if (resource.contains('*')) { + if (resource.contains(QLatin1Char('*'))) { scheduleResultsInvalidation(); } else if (typeMatches(resource)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/src/terms.cpp new/kactivities-stats-5.51.0/src/terms.cpp --- old/kactivities-stats-5.50.0/src/terms.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/src/terms.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -42,21 +42,21 @@ } IMPLEMENT_TERM_CONSTRUCTORS(Type) -IMPLEMENT_SPECIAL_TERM_VALUE(Type, any, ":any") +IMPLEMENT_SPECIAL_TERM_VALUE(Type, any, QStringLiteral(":any")) IMPLEMENT_TERM_CONSTRUCTORS(Agent) -IMPLEMENT_SPECIAL_TERM_VALUE(Agent, any, ":any") -IMPLEMENT_SPECIAL_TERM_VALUE(Agent, global, ":global") -IMPLEMENT_SPECIAL_TERM_VALUE(Agent, current, ":current") +IMPLEMENT_SPECIAL_TERM_VALUE(Agent, any, QStringLiteral(":any")) +IMPLEMENT_SPECIAL_TERM_VALUE(Agent, global, QStringLiteral(":global")) +IMPLEMENT_SPECIAL_TERM_VALUE(Agent, current, QStringLiteral(":current")) IMPLEMENT_TERM_CONSTRUCTORS(Activity) -IMPLEMENT_SPECIAL_TERM_VALUE(Activity, any, ":any") -IMPLEMENT_SPECIAL_TERM_VALUE(Activity, global, ":global") -IMPLEMENT_SPECIAL_TERM_VALUE(Activity, current, ":current") +IMPLEMENT_SPECIAL_TERM_VALUE(Activity, any, QStringLiteral(":any")) +IMPLEMENT_SPECIAL_TERM_VALUE(Activity, global, QStringLiteral(":global")) +IMPLEMENT_SPECIAL_TERM_VALUE(Activity, current, QStringLiteral(":current")) IMPLEMENT_TERM_CONSTRUCTORS(Url) -IMPLEMENT_SPECIAL_TERM_VALUE(Url, localFile, "/*") -IMPLEMENT_SPECIAL_TERM_VALUE(Url, file, QStringList() << "/*" << "smb:*" << "fish:*" << "sftp:*" << "ftp:*") +IMPLEMENT_SPECIAL_TERM_VALUE(Url, localFile, QStringLiteral("/*")) +IMPLEMENT_SPECIAL_TERM_VALUE(Url, file, QStringList() << QStringLiteral("/*") << QStringLiteral("smb:*") << QStringLiteral("fish:*") << QStringLiteral("sftp:*") << QStringLiteral("ftp:*")) #undef IMPLEMENT_TERM_CONSTRUCTORS #undef IMPLEMENT_SPECIAL_TERM_VALUE @@ -78,12 +78,12 @@ Terms::Url Terms::Url::startsWith(const QString &prefix) { - return Url(prefix + "*"); + return Url(prefix + QStringLiteral("*")); } Terms::Url Terms::Url::contains(const QString &infix) { - return Url("*" + infix + "*"); + return Url(QStringLiteral("*") + infix + QStringLiteral("*")); } } // namespace Stats diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/tests/model/modeltest.h new/kactivities-stats-5.51.0/tests/model/modeltest.h --- old/kactivities-stats-5.50.0/tests/model/modeltest.h 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/tests/model/modeltest.h 2018-10-07 12:03:39.000000000 +0200 @@ -52,7 +52,7 @@ Q_OBJECT public: - ModelTest( QAbstractItemModel *model, QObject *parent = 0 ); + ModelTest( QAbstractItemModel *model, QObject *parent = nullptr ); private Q_SLOTS: void nonDestructiveBasicTest(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-stats-5.50.0/tests/model/window.cpp new/kactivities-stats-5.51.0/tests/model/window.cpp --- old/kactivities-stats-5.50.0/tests/model/window.cpp 2018-09-01 00:19:29.000000000 +0200 +++ new/kactivities-stats-5.51.0/tests/model/window.cpp 2018-10-07 12:03:39.000000000 +0200 @@ -73,7 +73,7 @@ // Painting the score painter->drawText(titleRect, - "Score: " + QString::number(index.data(ResultModel::ScoreRole).toDouble()), + QStringLiteral("Score: ") + QString::number(index.data(ResultModel::ScoreRole).toDouble()), QTextOption(Qt::AlignRight)); // Painting the moification and creation times @@ -95,10 +95,10 @@ titleRect.moveTop(titleRect.top() + lineHeight); painter->drawText(titleRect, - "Modified: " + lastUpdate.toString() + QStringLiteral("Modified: ") + lastUpdate.toString() ); painter->drawText(titleRect, - "Created: " + firstUpdate.toString(), + QStringLiteral("Created: ") + firstUpdate.toString(), QTextOption(Qt::AlignRight)); painter->restore(); @@ -134,32 +134,32 @@ this, SLOT(updateRowCount())); for (const auto &activity : - (QStringList() << ":current" - << ":any" - << ":global") + activities->activities()) { + (QStringList() << QStringLiteral(":current") + << QStringLiteral(":any") + << QStringLiteral(":global")) + activities->activities()) { ui->comboActivity->addItem(activity); } foreach (const auto &arg, QCoreApplication::arguments()) { - if (arg == "--used") { + if (arg == QLatin1String("--used")) { ui->radioSelectUsedResources->setChecked(true); - } else if (arg == "--linked") { + } else if (arg == QLatin1String("--linked")) { ui->radioSelectLinkedResources->setChecked(true); - } else if (arg == "--combined") { + } else if (arg == QLatin1String("--combined")) { ui->radioSelectAllResources->setChecked(true); - } else if (arg.startsWith("--activity=")) { - ui->comboActivity->setCurrentText(arg.split("=")[1]); + } else if (arg.startsWith(QLatin1String("--activity="))) { + ui->comboActivity->setCurrentText(arg.split(QLatin1String("="))[1]); - } else if (arg.startsWith("--agent=")) { - ui->textAgent->setText(arg.split("=")[1]); + } else if (arg.startsWith(QLatin1String("--agent="))) { + ui->textAgent->setText(arg.split(QLatin1String("="))[1]); - } else if (arg.startsWith("--mimetype=")) { - ui->textMimetype->setText(arg.split("=")[1]); + } else if (arg.startsWith(QLatin1String("--mimetype="))) { + ui->textMimetype->setText(arg.split(QLatin1String("="))[1]); - } else if (arg == "--select") { + } else if (arg == QLatin1String("--select")) { updateResults(); } @@ -188,39 +188,39 @@ | Activity::current(); presets = { - { "kicker-favorites", + { QStringLiteral("kicker-favorites"), LinkedResources | Agent { - "org.kde.plasma.favorites.applications", - "org.kde.plasma.favorites.documents", - "org.kde.plasma.favorites.contacts" + QStringLiteral("org.kde.plasma.favorites.applications"), + QStringLiteral("org.kde.plasma.favorites.documents"), + QStringLiteral("org.kde.plasma.favorites.contacts") } | Type::any() | Activity::current() | Activity::global() | Limit(15) }, - { "kicker-recent-apps-n-docs", - recentQueryBase | Url::startsWith("applications:") | Url::file() | Limit(30) + { QStringLiteral("kicker-recent-apps-n-docs"), + recentQueryBase | Url::startsWith(QStringLiteral("applications:")) | Url::file() | Limit(30) }, - { "kicker-recent-apps", - recentQueryBase | Url::startsWith("applications:") | Limit(15) + { QStringLiteral("kicker-recent-apps"), + recentQueryBase | Url::startsWith(QStringLiteral("applications:")) | Limit(15) }, - { "kicker-recent-docs", + { QStringLiteral("kicker-recent-docs"), recentQueryBase | Url::file() | Limit(15) }, - { "kicker-popular-apps-n-docs", - popularQueryBase | Url::startsWith("applications:") | Url::file() | Limit(30) + { QStringLiteral("kicker-popular-apps-n-docs"), + popularQueryBase | Url::startsWith(QStringLiteral("applications:")) | Url::file() | Limit(30) }, - { "kicker-popular-apps", - popularQueryBase | Url::startsWith("applications:") | Limit(15) + { QStringLiteral("kicker-popular-apps"), + popularQueryBase | Url::startsWith(QStringLiteral("applications:")) | Limit(15) }, - { "kicker-popular-docs", + { QStringLiteral("kicker-popular-docs"), popularQueryBase | Url::file() | Limit(15) } }; - ui->comboPreset->addItem("Choose a preset", QVariant()); + ui->comboPreset->addItem(QStringLiteral("Choose a preset"), QVariant()); for (const auto& presetId: presets.keys()) { ui->comboPreset->addItem(presetId, presetId); } @@ -259,19 +259,19 @@ // Agents qDebug() << "\tAgents:" << query.agents(); - ui->textAgent->setText(query.agents().join(',')); + ui->textAgent->setText(query.agents().join(QLatin1Char(','))); // Types qDebug() << "\tTypes:" << query.types(); - ui->textMimetype->setText(query.types().join(',')); + ui->textMimetype->setText(query.types().join(QLatin1Char(','))); // Activities qDebug() << "\tActivities:" << query.activities(); - ui->comboActivity->setEditText(query.activities().join(',')); + ui->comboActivity->setEditText(query.activities().join(QLatin1Char(','))); // Url filters qDebug() << "\tUrl filters:" << query.urlFilters(); - ui->textUrl->setText(query.urlFilters().join(',')); + ui->textUrl->setText(query.urlFilters().join(QLatin1Char(','))); // Limit ui->spinLimitCount->setValue(query.limit()); @@ -298,13 +298,13 @@ ui->textLog->setText( accumulate(ResultSet(query), QString(), [] (const QString &acc, const ResultSet::Result &result) { - return acc + result.title() + " (" + result.resource() + ")\n"; + return acc + result.title() + QStringLiteral(" (") + result.resource() + QStringLiteral(")\n"); }) ); model.reset(new ResultModel(query)); - if (QCoreApplication::arguments().contains("--enable-model-test")) { + if (QCoreApplication::arguments().contains(QLatin1String("--enable-model-test"))) { modelTest.reset(); modelTest.reset(new ModelTest(new ResultModel(query))); } @@ -316,9 +316,9 @@ auto context = ui->viewResultsQML->rootContext(); ui->viewResultsQML->setResizeMode(QQuickWidget::SizeRootObjectToView); - context->setContextProperty("kamdmodel", model.get()); + context->setContextProperty(QStringLiteral("kamdmodel"), model.get()); - ui->viewResultsQML->setSource(QUrl("qrc:/main.qml")); + ui->viewResultsQML->setSource(QUrl(QStringLiteral("qrc:/main.qml"))); } void Window::updateResults() @@ -343,16 +343,16 @@ ) | // Which agents? - Agent(ui->textAgent->text().split(',')) | + Agent(ui->textAgent->text().split(QLatin1Char(','))) | // Which mime? - Type(ui->textMimetype->text().split(',')) | + Type(ui->textMimetype->text().split(QLatin1Char(','))) | // Which activities? - Activity(ui->comboActivity->currentText().split(',')) | + Activity(ui->comboActivity->currentText().split(QLatin1Char(','))) | // And URL filters - Url(ui->textUrl->text().split(',', QString::SkipEmptyParts)) | + Url(ui->textUrl->text().split(QLatin1Char(','), QString::SkipEmptyParts)) | // And how many items Limit(ui->spinLimitCount->value())
