File kamd-rename.patch of Package kactivities-stats
diff -ur a/src/common/dbus/common.h b/src/common/dbus/common.h
--- a/src/common/dbus/common.h 2016-03-02 15:28:08.000000000 +0100
+++ b/src/common/dbus/common.h 2016-03-09 10:22:40.000000000 +0100
@@ -10,11 +10,11 @@
#include <QDBusConnection>
#include <QDBusInterface>
-#define KAMD_DBUS_SERVICE QStringLiteral("org.kde.ActivityManager")
+#define KAMD_DBUS_SERVICE QStringLiteral("org.kde.ActivityManager5")
#define KAMD_DBUS_OBJECT_PATH(A) (sizeof(A) > 2 ? QLatin1String("/ActivityManager/" A) : QLatin1String("/ActivityManager"))
-#define KAMD_DBUS_OBJECT(A) QLatin1String("org.kde.ActivityManager." A)
+#define KAMD_DBUS_OBJECT(A) QLatin1String("org.kde.ActivityManager5." A)
#define KAMD_DBUS_INTERFACE(OBJECT_PATH, OBJECT, PARENT) \
QDBusInterface(KAMD_DBUS_SERVICE, KAMD_DBUS_OBJECT_PATH(OBJECT_PATH), KAMD_DBUS_OBJECT(OBJECT), QDBusConnection::sessionBus(), PARENT)
@@ -48,6 +48,6 @@
QDBusInterface VAR(KAMD_DBUS_SERVICE, KAMD_DBUS_OBJECT_PATH(OBJECT_PATH), KAMD_DBUS_OBJECT(OBJECT), QDBusConnection::sessionBus(), nullptr)
#define KAMD_DBUS_CLASS_INTERFACE(OBJECT_PATH, OBJECT, PARENT) \
- org::kde::ActivityManager::OBJECT(KAMD_DBUS_SERVICE, KAMD_DBUS_OBJECT_PATH(OBJECT_PATH), QDBusConnection::sessionBus(), PARENT)
+ org::kde::ActivityManager5::OBJECT(KAMD_DBUS_SERVICE, KAMD_DBUS_OBJECT_PATH(OBJECT_PATH), QDBusConnection::sessionBus(), PARENT)
#endif // DBUS_COMMON_H
diff -ur a/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml b/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml
--- a/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml 2016-03-02 15:28:08.000000000 +0100
+++ b/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml 2016-03-09 10:21:50.000000000 +0100
@@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
- <interface name="org.kde.ActivityManager.ResourcesLinking">
+ <interface name="org.kde.ActivityManager5.ResourcesLinking">
<method name="LinkResourceToActivity">
<arg name="agent" type="s" direction="in"/>
diff -ur a/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml b/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml
--- a/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml 2016-03-02 15:28:08.000000000 +0100
+++ b/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml 2016-03-09 10:21:50.000000000 +0100
@@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
- <interface name="org.kde.ActivityManager.ResourcesScoring">
+ <interface name="org.kde.ActivityManager5.ResourcesScoring">
<signal name="ResourceScoreUpdated">
<arg name="activity" type="s" direction="out"/>
diff -ur a/src/resultwatcher.cpp b/src/resultwatcher.cpp
--- a/src/resultwatcher.cpp 2016-03-02 15:28:08.000000000 +0100
+++ b/src/resultwatcher.cpp 2016-03-09 14:41:55.000000000 +0100
@@ -274,8 +274,8 @@
m_resultInvalidationTimer.start();
}
- std::unique_ptr<org::kde::ActivityManager::ResourcesLinking> linking;
- std::unique_ptr<org::kde::ActivityManager::ResourcesScoring> scoring;
+ std::unique_ptr<org::kde::ActivityManager5::ResourcesLinking> linking;
+ std::unique_ptr<org::kde::ActivityManager5::ResourcesScoring> scoring;
ResultWatcher *const q;
Query query;
@@ -285,7 +285,7 @@
: QObject(parent)
, d(new ResultWatcherPrivate(this, query))
{
- using namespace org::kde::ActivityManager;
+ using namespace org::kde::ActivityManager5;
using namespace std::placeholders;
// There is no need for private slots, when we have bind