[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kactivities] /: Make compile with strict compile flags
From: Laurent Montel <null () kde ! org>
Date: 2018-09-13 6:20:03
Message-ID: E1g0Kyx-00059z-K4 () code ! kde ! org
[Download RAW message or body]
Git commit f18e63746478900f698c8951aeb40e4d268a2fc4 by Laurent Montel.
Committed on 13/09/2018 at 06:20.
Pushed by mlaurent into branch 'master'.
Make compile with strict compile flags
M +6 -0 CMakeLists.txt
M +8 -8 src/cli/main.cpp
M +1 -1 src/cli/utils.h
M +3 -3 src/imports/activityinfo.cpp
M +4 -4 src/imports/activitymodel.cpp
M +1 -1 src/imports/resourceinstance.cpp
M +1 -1 src/lib/activitiesmodel.cpp
M +3 -3 src/lib/manager_p.cpp
M +2 -2 tests/activities-model/window.cpp
https://commits.kde.org/kactivities/f18e63746478900f698c8951aeb40e4d268a2fc4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e84c65f..dcdbd89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,12 @@ ecm_setup_version (
SOVERSION 5
)
+add_definitions(-DQT_NO_CAST_FROM_ASCII)
+add_definitions(-DQT_NO_CAST_TO_ASCII)
+add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DQT_USE_QSTRINGBUILDER)
+
add_subdirectory (src)
if (BUILD_TESTING)
add_subdirectory (autotests)
diff --git a/src/cli/main.cpp b/src/cli/main.cpp
index 827818d..2e7a95a 100644
--- a/src/cli/main.cpp
+++ b/src/cli/main.cpp
@@ -107,9 +107,9 @@ DEFINE_COMMAND(setActivityProperty, 3)
const auto value = args(3);
awaitFuture(
- what == "name" ? controller->setActivityName(id, value) :
- what == "description" ? controller->setActivityDescription(id, value) :
- what == "icon" ? controller->setActivityIcon(id, value) :
+ what == QLatin1String("name") ? controller->setActivityName(id, \
value) : + what == QLatin1String("description") ? \
controller->setActivityDescription(id, value) : + what == \
QLatin1String("icon") ? controller->setActivityIcon(id, value) : \
QFuture<void>() );
@@ -124,9 +124,9 @@ DEFINE_COMMAND(activityProperty, 2)
KActivities::Info info(id);
out << (
- what == "name" ? info.name() :
- what == "description" ? info.description() :
- what == "icon" ? info.icon() :
+ what == QLatin1String("name") ? info.name() :
+ what == QLatin1String("description") ? info.description() :
+ what == QLatin1String("icon") ? info.icon() :
QString()
) << "\n";
@@ -246,7 +246,7 @@ int main(int argc, char *argv[])
}
#define MATCH_COMMAND(Command) \
- else if (args[argId] == QStringLiteral("--") + toDashes(#Command)) \
+ else if (args[argId] == QStringLiteral("--") + \
toDashes(QStringLiteral(#Command))) \
{ \
argId += 1 + Command##_command({ args, argId })(); \
}
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
printHelp();
} else for (int argId = 1; argId < args.count(); ) {
- if (args[argId] == "--help") {
+ if (args[argId] == QLatin1String("--help")) {
printHelp();
argId++;
}
diff --git a/src/cli/utils.h b/src/cli/utils.h
index 836c180..742e7e8 100644
--- a/src/cli/utils.h
+++ b/src/cli/utils.h
@@ -74,7 +74,7 @@ QString toDashes(const QString &command)
if (result[i].isLower() &&
result[i+1].isUpper()) {
result[i+1] = result[i+1].toLower();
- result.insert(i+1, "-");
+ result.insert(i+1, QStringLiteral("-"));
}
}
diff --git a/src/imports/activityinfo.cpp b/src/imports/activityinfo.cpp
index 144c761..a170c5c 100644
--- a/src/imports/activityinfo.cpp
+++ b/src/imports/activityinfo.cpp
@@ -48,7 +48,7 @@ void ActivityInfo::setCurrentActivity(const QString &id)
void ActivityInfo::setActivityId(const QString &id)
{
- m_showCurrentActivity = (id == ":current");
+ m_showCurrentActivity = (id == QStringLiteral(":current"));
setIdInternal(m_showCurrentActivity ?
m_service.currentActivity() : id);
@@ -74,7 +74,7 @@ void ActivityInfo::setIdInternal(const QString &id)
#define CREATE_GETTER_AND_SETTER(WHAT, What) \
QString ActivityInfo::What() const \
{ \
- return m_info ? m_info->What() : ""; \
+ return m_info ? m_info->What() : QString(); \
} \
\
void ActivityInfo::set##WHAT(const QString &value) \
@@ -93,7 +93,7 @@ CREATE_GETTER_AND_SETTER(Icon, icon)
QString ActivityInfo::activityId() const
{
- return m_info ? m_info->id() : "";
+ return m_info ? m_info->id() : QString();
}
bool ActivityInfo::valid() const
diff --git a/src/imports/activitymodel.cpp b/src/imports/activitymodel.cpp
index 9aa8c13..5cd81e9 100644
--- a/src/imports/activitymodel.cpp
+++ b/src/imports/activitymodel.cpp
@@ -143,7 +143,7 @@ public:
public:
BackgroundCache()
: initialized(false)
- , plasmaConfig("plasma-org.kde.plasma.desktop-appletsrc")
+ , plasmaConfig(QStringLiteral("plasma-org.kde.plasma.desktop-appletsrc"))
{
using namespace std::placeholders;
@@ -229,7 +229,7 @@ public:
// Ignore if we have already found the background
if (newBackgrounds.contains(activityId) &&
- newBackgrounds[activityId][0] != '#') continue;
+ newBackgrounds[activityId][0] != QLatin1Char('#')) continue;
auto newBackground = backgroundFromConfig(config);
@@ -506,7 +506,7 @@ void ActivityModel::setShownStates(const QString &states)
m_shownStates.clear();
m_shownStatesString = states;
- for (const auto &state: states.split(',')) {
+ for (const auto &state: states.split(QLatin1Char(','))) {
if (state == QStringLiteral("Running")) {
m_shownStates.insert(Running);
@@ -562,7 +562,7 @@ QVariant ActivityModel::data(const QModelIndex &index, int role) \
const const QString &icon = item->icon();
// We need a default icon for activities
- return icon.isEmpty() ? "preferences-activities" : icon;
+ return icon.isEmpty() ? QStringLiteral("preferences-activities") : icon;
}
case ActivityDescription:
diff --git a/src/imports/resourceinstance.cpp b/src/imports/resourceinstance.cpp
index a6e2251..734ad73 100644
--- a/src/imports/resourceinstance.cpp
+++ b/src/imports/resourceinstance.cpp
@@ -53,7 +53,7 @@ void ResourceInstance::syncWid()
m_resourceInstance.reset(new KActivities::ResourceInstance(wid, m_uri, \
m_mimetype, m_title)); } else {
- if (m_uri.scheme().startsWith(QLatin1String("http")) && !m_uri.hasQuery() && \
m_uri.path().endsWith('/')) { + if \
(m_uri.scheme().startsWith(QLatin1String("http")) && !m_uri.hasQuery() && \
m_uri.path().endsWith(QLatin1Char('/'))) { const QString &oldPath = m_uri.path();
m_uri.setPath(oldPath.left(oldPath.length() - 1));
diff --git a/src/lib/activitiesmodel.cpp b/src/lib/activitiesmodel.cpp
index aef2811..85bafc1 100644
--- a/src/lib/activitiesmodel.cpp
+++ b/src/lib/activitiesmodel.cpp
@@ -400,7 +400,7 @@ QVariant ActivitiesModel::data(const QModelIndex &index, int \
role) const const QString &icon = item->icon();
// We need a default icon for activities
- return icon.isEmpty() ? "preferences-activities" : icon;
+ return icon.isEmpty() ? QStringLiteral("preferences-activities") : \
icon; }
case ActivityDescription:
diff --git a/src/lib/manager_p.cpp b/src/lib/manager_p.cpp
index b4967da..e4e49c1 100644
--- a/src/lib/manager_p.cpp
+++ b/src/lib/manager_p.cpp
@@ -125,7 +125,7 @@ void Manager::serviceOwnerChanged(const QString &serviceName, \
const QString &old return;
}
- auto split = serviceVersion->split('.');
+ auto split = serviceVersion->split(QLatin1Char('.'));
QList<int> version;
// We require kactivitymanagerd version to be at least the
@@ -143,8 +143,8 @@ void Manager::serviceOwnerChanged(const QString &serviceName, \
const QString &old version.cbegin(), version.cend(),
std::begin(requiredVersion), std::end(requiredVersion)
)) {
- QString libraryVersion = QString::number(requiredVersion[0]) \
+ '.'
- + QString::number(requiredVersion[1]) \
+ '.' + QString libraryVersion = \
QString::number(requiredVersion[0]) + QLatin1Char('.') + \
+ QString::number(requiredVersion[1]) + QLatin1Char('.')
+ \
QString::number(requiredVersion[2]);
qDebug() << "KActivities service version: " << \
serviceVersion.get();
diff --git a/tests/activities-model/window.cpp b/tests/activities-model/window.cpp
index ddb36b6..d551539 100644
--- a/tests/activities-model/window.cpp
+++ b/tests/activities-model/window.cpp
@@ -101,11 +101,11 @@ Window::Window()
{
ui->setupUi(this);
- modelRunningActivities->setObjectName("RUNNING");
+ modelRunningActivities->setObjectName(QStringLiteral("RUNNING"));
ui->listRunningActivities->setModel(modelRunningActivities);
ui->listRunningActivities->setItemDelegate(new Delegate());
- modelStoppedActivities->setObjectName("STOPPED");
+ modelStoppedActivities->setObjectName(QStringLiteral("STOPPED"));
ui->listStoppedActivities->setModel(modelStoppedActivities);
ui->listStoppedActivities->setItemDelegate(new Delegate());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic