Hello community,
here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2018-10-22 11:08:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old)
and /work/SRC/openSUSE:Factory/.kactivities5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5"
Mon Oct 22 11:08:35 2018 rev:58 rq:642293 version:5.51.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2018-10-01 08:04:55.630400605 +0200
+++ /work/SRC/openSUSE:Factory/.kactivities5.new/kactivities5.changes 2018-10-22 11:09:04.719985505 +0200
@@ -1,0 +2,18 @@
+Tue Oct 16 08:01:46 UTC 2018 - Luca Beltrame
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Mon Oct 15 11:51:46 UTC 2018 - lbeltrame@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:
+ * USe directly KDEFrameworkCompilerSettings
+ * Fix dangling reference with "auto" becoming "QStringBuilder"
+ * Make compile with strict compile flags
+ * Fix minor EBN issues
+
+-------------------------------------------------------------------
Old:
----
kactivities-5.50.0.tar.xz
New:
----
kactivities-5.51.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kactivities5.spec ++++++
--- /var/tmp/diff_new_pack.1ikFER/_old 2018-10-22 11:09:06.227984266 +0200
+++ /var/tmp/diff_new_pack.1ikFER/_new 2018-10-22 11:09:06.227984266 +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 libKF5Activities5
-%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: kactivities5
-Version: 5.50.0
+Version: 5.51.0
Release: 0
Summary: KDE Plasma Activities support
License: GPL-2.0-or-later
Group: System/GUI/KDE
-URL: http://www.kde.org
+URL: https://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-%{version}.tar.xz
Source1: baselibs.conf
BuildRequires: cmake >= 3.0
++++++ kactivities-5.50.0.tar.xz -> kactivities-5.51.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/CMakeLists.txt new/kactivities-5.51.0/CMakeLists.txt
--- old/kactivities-5.50.0/CMakeLists.txt 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/CMakeLists.txt 2018-10-07 12:03:32.000000000 +0200
@@ -3,8 +3,8 @@
cmake_minimum_required(VERSION 3.0)
# KDE Frameworks
-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 (KActivities VERSION ${KF5_VERSION})
option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF)
@@ -24,7 +24,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)
@@ -32,7 +32,7 @@
include (KDEInstallDirs)
include (KDECMakeSettings)
-include (KDECompilerSettings NO_POLICY_SCOPE)
+include (KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include (GenerateExportHeader)
include (ECMGenerateHeaders)
include (ECMAddQch)
@@ -69,6 +69,8 @@
SOVERSION 5
)
+add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+
add_subdirectory (src)
if (BUILD_TESTING)
add_subdirectory (autotests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/autotests/core/Process.cpp new/kactivities-5.51.0/autotests/core/Process.cpp
--- old/kactivities-5.50.0/autotests/core/Process.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/autotests/core/Process.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -28,8 +28,6 @@
#include <QProcess>
#include <QRegularExpression>
-#include <QDBusConnection>
-
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/cli/main.cpp new/kactivities-5.51.0/src/cli/main.cpp
--- old/kactivities-5.50.0/src/cli/main.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/cli/main.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -107,9 +107,9 @@
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 @@
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 @@
}
#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 @@
printHelp();
} else for (int argId = 1; argId < args.count(); ) {
- if (args[argId] == "--help") {
+ if (args[argId] == QLatin1String("--help")) {
printHelp();
argId++;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/cli/utils.h new/kactivities-5.51.0/src/cli/utils.h
--- old/kactivities-5.50.0/src/cli/utils.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/cli/utils.h 2018-10-07 12:03:32.000000000 +0200
@@ -19,6 +19,9 @@
* If not, see http://www.gnu.org/licenses/.
*/
+#ifndef KACTIVITIES_UTILS_H
+#define KACTIVITIES_UTILS_H
+
QTextStream out(stdout);
class StringListView {
@@ -71,7 +74,7 @@
if (result[i].isLower() &&
result[i+1].isUpper()) {
result[i+1] = result[i+1].toLower();
- result.insert(i+1, "-");
+ result.insert(i+1, QStringLiteral("-"));
}
}
@@ -166,3 +169,4 @@
\
int Command##_command::operator()()
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/common/dbus/org.kde.ActivityManager.Activities.h new/kactivities-5.51.0/src/common/dbus/org.kde.ActivityManager.Activities.h
--- old/kactivities-5.50.0/src/common/dbus/org.kde.ActivityManager.Activities.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/common/dbus/org.kde.ActivityManager.Activities.h 2018-10-07 12:03:32.000000000 +0200
@@ -19,8 +19,8 @@
* If not, see http://www.gnu.org/licenses/.
*/
-#ifndef KAMD_ACTIVITIES_DBUS_H
-#define KAMD_ACTIVITIES_DBUS_H
+#ifndef KAMD_ORG_KDE_ACTIVITYMANAGER_ACTIVITIES_H
+#define KAMD_ORG_KDE_ACTIVITYMANAGER_ACTIVITIES_H
#include <QString>
#include <QList>
@@ -58,4 +58,4 @@
QDebug operator<<(QDebug dbg, const ActivityInfo &r);
-#endif // KAMD_ACTIVITIES_DBUS_H
+#endif // KAMD_ORG_KDE_ACTIVITYMANAGER_ACTIVITIES_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/imports/activitiesextensionplugin.h new/kactivities-5.51.0/src/imports/activitiesextensionplugin.h
--- old/kactivities-5.50.0/src/imports/activitiesextensionplugin.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/imports/activitiesextensionplugin.h 2018-10-07 12:03:32.000000000 +0200
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KACTIVITIES_IMPORTS_PLUGIN_H
-#define KACTIVITIES_IMPORTS_PLUGIN_H
+#ifndef KACTIVITIES_ACTIVITIES_EXTENSION_PLUGIN_H
+#define KACTIVITIES_ACTIVITIES_EXTENSION_PLUGIN_H
#include <QQmlExtensionPlugin>
@@ -31,5 +31,5 @@
void registerTypes(const char *uri) override;
};
-#endif // KACTIVITIES_IMPORTS_PLUGIN_H
+#endif // KACTIVITIES_ACTIVITIES_EXTENSION_PLUGIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/imports/activityinfo.cpp new/kactivities-5.51.0/src/imports/activityinfo.cpp
--- old/kactivities-5.50.0/src/imports/activityinfo.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/imports/activityinfo.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -48,7 +48,7 @@
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 @@
#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 @@
QString ActivityInfo::activityId() const
{
- return m_info ? m_info->id() : "";
+ return m_info ? m_info->id() : QString();
}
bool ActivityInfo::valid() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/imports/activitymodel.cpp new/kactivities-5.51.0/src/imports/activitymodel.cpp
--- old/kactivities-5.50.0/src/imports/activitymodel.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/imports/activitymodel.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -59,7 +59,7 @@
DECLARE_RAII_MODEL_UPDATERS(ActivityModel)
/**
- * Returns whether the the activity has a desired state.
+ * Returns whether the activity has a desired state.
* If the state is 0, returns true
*/
template <typename T>
@@ -143,13 +143,13 @@
public:
BackgroundCache()
: initialized(false)
- , plasmaConfig("plasma-org.kde.plasma.desktop-appletsrc")
+ , plasmaConfig(QStringLiteral("plasma-org.kde.plasma.desktop-appletsrc"))
{
using namespace std::placeholders;
- const auto configFile = QStandardPaths::writableLocation(
- QStandardPaths::GenericConfigLocation) +
- QLatin1Char('/') + plasmaConfig.name();
+ const QString configFile = QStandardPaths::writableLocation(
+ QStandardPaths::GenericConfigLocation) +
+ QLatin1Char('/') + plasmaConfig.name();
KDirWatch::self()->addFile(configFile);
@@ -229,7 +229,7 @@
// 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);
@@ -460,15 +460,15 @@
}
}
-#define CREATE_SIGNAL_EMITTER(What, Role) \
+#define CREATE_SIGNAL_EMITTER(What,Role) \
void ActivityModel::onActivity##What##Changed(const QString &) \
{ \
Private::emitActivityUpdated(this, m_shownActivities, sender(), Role); \
}
-CREATE_SIGNAL_EMITTER(Name, Qt::DisplayRole)
-CREATE_SIGNAL_EMITTER(Description, ActivityDescription)
-CREATE_SIGNAL_EMITTER(Icon, Qt::DecorationRole)
+CREATE_SIGNAL_EMITTER(Name,Qt::DisplayRole)
+CREATE_SIGNAL_EMITTER(Description,ActivityDescription)
+CREATE_SIGNAL_EMITTER(Icon,Qt::DecorationRole)
#undef CREATE_SIGNAL_EMITTER
@@ -506,7 +506,7 @@
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 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/imports/resourceinstance.cpp new/kactivities-5.51.0/src/imports/resourceinstance.cpp
--- old/kactivities-5.50.0/src/imports/resourceinstance.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/imports/resourceinstance.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -53,7 +53,7 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/imports/resourcemodel.cpp new/kactivities-5.51.0/src/imports/resourcemodel.cpp
--- old/kactivities-5.50.0/src/imports/resourcemodel.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/imports/resourcemodel.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -116,10 +116,10 @@
connect(&m_service, &KActivities::Consumer::currentActivityChanged,
this, &ResourceModel::onCurrentActivityChanged);
- connect(m_linker.get(), SIGNAL(ResourceLinkedToActivity(QString, QString, QString)),
- this, SLOT(onResourceLinkedToActivity(QString, QString, QString)));
- connect(m_linker.get(), SIGNAL(ResourceUnlinkedFromActivity(QString, QString, QString)),
- this, SLOT(onResourceUnlinkedFromActivity(QString, QString, QString)));
+ connect(m_linker.get(), SIGNAL(ResourceLinkedToActivity(QString,QString,QString)),
+ this, SLOT(onResourceLinkedToActivity(QString,QString,QString)));
+ connect(m_linker.get(), SIGNAL(ResourceUnlinkedFromActivity(QString,QString,QString)),
+ this, SLOT(onResourceUnlinkedFromActivity(QString,QString,QString)));
setDynamicSortFilter(true);
sort(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/lib/activitiescache_p.cpp new/kactivities-5.51.0/src/lib/activitiescache_p.cpp
--- old/kactivities-5.50.0/src/lib/activitiescache_p.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/lib/activitiescache_p.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -147,13 +147,13 @@
auto call = Manager::self()->activities()->asyncCall(
QStringLiteral("CurrentActivity"));
- onCallFinished(call, SLOT(setCurrentActivityFromReply(QDBusPendingCallWatcher *)));
+ onCallFinished(call, SLOT(setCurrentActivityFromReply(QDBusPendingCallWatcher*)));
// Loading all the activities
call = Manager::self()->activities()->asyncCall(
QStringLiteral("ListActivitiesWithInformation"));
- onCallFinished(call, SLOT(setAllActivitiesFromReply(QDBusPendingCallWatcher *)));
+ onCallFinished(call, SLOT(setAllActivitiesFromReply(QDBusPendingCallWatcher*)));
}
void ActivitiesCache::updateActivity(const QString &id)
@@ -163,7 +163,7 @@
auto call = Manager::self()->activities()->asyncCall(
QStringLiteral("ActivityInformation"), id);
- onCallFinished(call, SLOT(setActivityInfoFromReply(QDBusPendingCallWatcher *)));
+ onCallFinished(call, SLOT(setActivityInfoFromReply(QDBusPendingCallWatcher*)));
}
void ActivitiesCache::updateActivityState(const QString &id, int state)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/lib/activitiesmodel.cpp new/kactivities-5.51.0/src/lib/activitiesmodel.cpp
--- old/kactivities-5.50.0/src/lib/activitiesmodel.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/lib/activitiesmodel.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -67,7 +67,7 @@
};
/**
- * Returns whether the the activity has a desired state.
+ * Returns whether the activity has a desired state.
* If the state is 0, returns true
*/
template <typename T>
@@ -324,15 +324,15 @@
}
}
-#define CREATE_SIGNAL_EMITTER(What, Role) \
+#define CREATE_SIGNAL_EMITTER(What,Role) \
void ActivitiesModelPrivate::onActivity##What##Changed(const QString &) \
{ \
Private::emitActivityUpdated(this, shownActivities, sender(), Role); \
}
-CREATE_SIGNAL_EMITTER(Name, Qt::DisplayRole)
-CREATE_SIGNAL_EMITTER(Description, ActivitiesModel::ActivityDescription)
-CREATE_SIGNAL_EMITTER(Icon, Qt::DecorationRole)
+CREATE_SIGNAL_EMITTER(Name,Qt::DisplayRole)
+CREATE_SIGNAL_EMITTER(Description,ActivitiesModel::ActivityDescription)
+CREATE_SIGNAL_EMITTER(Icon,Qt::DecorationRole)
#undef CREATE_SIGNAL_EMITTER
@@ -400,7 +400,7 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/lib/activitiesmodel_p.h new/kactivities-5.51.0/src/lib/activitiesmodel_p.h
--- old/kactivities-5.50.0/src/lib/activitiesmodel_p.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/lib/activitiesmodel_p.h 2018-10-07 12:03:32.000000000 +0200
@@ -19,8 +19,8 @@
* If not, see http://www.gnu.org/licenses/.
*/
-#ifndef ACTIVITIES_ACTIVITYMODEL_P_H
-#define ACTIVITIES_ACTIVITYMODEL_P_H
+#ifndef ACTIVITIES_ACTIVITIESMODEL_P_H
+#define ACTIVITIES_ACTIVITIESMODEL_P_H
#include "activitiesmodel.h"
@@ -83,5 +83,5 @@
} // namespace KActivities
-#endif // ACTIVITIES_ACTIVITYMODEL_P_H
+#endif // ACTIVITIES_ACTIVITIESMODEL_P_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/lib/consumer.h new/kactivities-5.51.0/src/lib/consumer.h
--- old/kactivities-5.50.0/src/lib/consumer.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/lib/consumer.h 2018-10-07 12:03:32.000000000 +0200
@@ -140,7 +140,7 @@
/**
* This signal is emitted when the activity service goes online or offline,
- * or when the class manages to synchronise the data with the service.
+ * or when the class manages to synchronize the data with the service.
* @param status new status of the service
*/
void serviceStatusChanged(Consumer::ServiceStatus status);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/lib/info.cpp new/kactivities-5.51.0/src/lib/info.cpp
--- old/kactivities-5.50.0/src/lib/info.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/lib/info.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -104,25 +104,25 @@
, d(new InfoPrivate(this, activity))
{
// qDebug() << "Created an instance of Info: " << (void*)this;
-#define PASS_SIGNAL_HANDLER(SIGNAL_NAME, SLOT_NAME) \
+#define PASS_SIGNAL_HANDLER(SIGNAL_NAME,SLOT_NAME) \
connect(d->cache.get(), SIGNAL(SIGNAL_NAME(QString)), \
this, SLOT(SLOT_NAME(QString)));
- PASS_SIGNAL_HANDLER(activityAdded, added)
- PASS_SIGNAL_HANDLER(activityRemoved, removed)
+ PASS_SIGNAL_HANDLER(activityAdded,added)
+ PASS_SIGNAL_HANDLER(activityRemoved,removed)
// PASS_SIGNAL_HANDLER(started)
// PASS_SIGNAL_HANDLER(stopped)
- PASS_SIGNAL_HANDLER(activityChanged, infoChanged)
+ PASS_SIGNAL_HANDLER(activityChanged,infoChanged)
#undef PASS_SIGNAL_HANDLER
-#define PASS_SIGNAL_HANDLER(SIGNAL_NAME, SLOT_NAME, TYPE) \
- connect(d->cache.get(), SIGNAL(SIGNAL_NAME(QString, TYPE)), \
- this, SLOT(SLOT_NAME(QString, TYPE))); \
+#define PASS_SIGNAL_HANDLER(SIGNAL_NAME,SLOT_NAME,TYPE) \
+ connect(d->cache.get(), SIGNAL(SIGNAL_NAME(QString,TYPE)), \
+ this, SLOT(SLOT_NAME(QString,TYPE))); \
- PASS_SIGNAL_HANDLER(activityStateChanged, activityStateChanged, int);
- PASS_SIGNAL_HANDLER(activityNameChanged, nameChanged, QString);
- PASS_SIGNAL_HANDLER(activityDescriptionChanged, descriptionChanged, QString);
- PASS_SIGNAL_HANDLER(activityIconChanged, iconChanged, QString);
+ PASS_SIGNAL_HANDLER(activityStateChanged,activityStateChanged,int);
+ PASS_SIGNAL_HANDLER(activityNameChanged,nameChanged,QString);
+ PASS_SIGNAL_HANDLER(activityDescriptionChanged,descriptionChanged,QString);
+ PASS_SIGNAL_HANDLER(activityIconChanged,iconChanged,QString);
#undef PASS_SIGNAL_HANDLER
connect(d->cache.get(), SIGNAL(currentActivityChanged(QString)),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/lib/manager_p.cpp new/kactivities-5.51.0/src/lib/manager_p.cpp
--- old/kactivities-5.50.0/src/lib/manager_p.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/lib/manager_p.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -125,7 +125,7 @@
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 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/utils/model_updaters.h new/kactivities-5.51.0/src/utils/model_updaters.h
--- old/kactivities-5.50.0/src/utils/model_updaters.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/utils/model_updaters.h 2018-10-07 12:03:32.000000000 +0200
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef KACTIVITIES_IMPORTS_UTILS_P_H
-#define KACTIVITIES_IMPORTS_UTILS_P_H
+#ifndef KACTIVITIES_MODEL_UPDATERS_H
+#define KACTIVITIES_MODEL_UPDATERS_H
// -----------------------------------------
// RAII classes for model updates ----------
@@ -72,5 +72,5 @@
// -----------------------------------------
-#endif // KACTIVITIES_IMPORTS_UTILS_P_H
+#endif // KACTIVITIES_MODEL_UPDATERS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/src/utils/optional_view.h new/kactivities-5.51.0/src/utils/optional_view.h
--- old/kactivities-5.50.0/src/utils/optional_view.h 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/src/utils/optional_view.h 2018-10-07 12:03:32.000000000 +0200
@@ -19,8 +19,8 @@
* If not, see http://www.gnu.org/licenses/.
*/
-#ifndef UTILS_OPTIONAL_H
-#define UTILS_OPTIONAL_H
+#ifndef UTILS_OPTIONAL_VIEW_H
+#define UTILS_OPTIONAL_VIEW_H
namespace kamd {
namespace utils {
@@ -76,5 +76,5 @@
} // namespace kamd
-#endif // UTILS_OPTIONAL_H
+#endif // UTILS_OPTIONAL_VIEW_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.50.0/tests/activities-model/window.cpp new/kactivities-5.51.0/tests/activities-model/window.cpp
--- old/kactivities-5.50.0/tests/activities-model/window.cpp 2018-09-01 00:19:24.000000000 +0200
+++ new/kactivities-5.51.0/tests/activities-model/window.cpp 2018-10-07 12:03:32.000000000 +0200
@@ -101,11 +101,11 @@
{
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());