Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wolfi323:branches:KDE:Frameworks5
kactivities5
kamd-rename.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kamd-rename.patch of Package kactivities5
diff -ur kactivities-5.92.0.old/autotests/core/Process.cpp kactivities-5.92.0/autotests/core/Process.cpp --- kactivities-5.92.0.old/autotests/core/Process.cpp +++ kactivities-5.92.0/autotests/core/Process.cpp @@ -66,7 +66,7 @@ // qDebug() << env; s_process->setEnvironment(env); - const QString exec = QStandardPaths::findExecutable(QStringLiteral("kactivitymanagerd")); + const QString exec = QStandardPaths::findExecutable(QStringLiteral("kactivitymanagerd5")); QVERIFY(!exec.isEmpty()); s_process->start(exec, QStringList()); s_process->waitForStarted(); diff -ur kactivities-5.17.0.old/contrib/zsh/kamd-functions kactivities-5.17.0/contrib/zsh/kamd-functions --- kactivities-5.17.0.old/contrib/zsh/kamd-functions 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/contrib/zsh/kamd-functions 2015-12-13 22:41:14.000000000 +0100 @@ -5,15 +5,15 @@ colors # Defining aliases for common kamd dbus objects -alias kamd_dbus="qdbus org.kde.ActivityManager" +alias kamd_dbus="qdbus org.kde.ActivityManager5" -alias kamd_activities="qdbus org.kde.ActivityManager /ActivityManager/Activities" -alias kamd_resources="qdbus org.kde.ActivityManager /ActivityManager/Resources" -alias kamd_resources_linking="qdbus org.kde.ActivityManager /ActivityManager/Resources/Linking" -alias kamd_features="qdbus org.kde.ActivityManager /ActivityManager/Features" +alias kamd_activities="qdbus org.kde.ActivityManager5 /ActivityManager/Activities" +alias kamd_resources="qdbus org.kde.ActivityManager5 /ActivityManager/Resources" +alias kamd_resources_linking="qdbus org.kde.ActivityManager5 /ActivityManager/Resources/Linking" +alias kamd_features="qdbus org.kde.ActivityManager5 /ActivityManager/Features" -alias kamd_addactivity="qdbus org.kde.ActivityManager /ActivityManager/Activities AddActivity" -alias kamd_removeactivity="qdbus org.kde.ActivityManager /ActivityManager/Activities RemoveActivity" +alias kamd_addactivity="qdbus org.kde.ActivityManager5 /ActivityManager/Activities AddActivity" +alias kamd_removeactivity="qdbus org.kde.ActivityManager5 /ActivityManager/Activities RemoveActivity" # Open the KAMD database alias kamd_database="sqlite3 ~/.local/share/kactivitymanagerd/resources/database" @@ -21,11 +21,11 @@ # Lists the existing activities, along with their state function kamd_listactivities() { echo -n "Service version: " - qdbus org.kde.ActivityManager /ActivityManager serviceVersion + qdbus org.kde.ActivityManager5 /ActivityManager serviceVersion - CURRENT_ACTIVITY=`qdbus org.kde.ActivityManager /ActivityManager/Activities CurrentActivity` + CURRENT_ACTIVITY=`qdbus org.kde.ActivityManager5 /ActivityManager/Activities CurrentActivity` - for activity in `qdbus org.kde.ActivityManager /ActivityManager/Activities ListActivities`; do + for activity in `qdbus org.kde.ActivityManager5 /ActivityManager/Activities ListActivities`; do STATE="" @@ -33,7 +33,7 @@ STATE="$fg[green][CURRENT]" else - STATE=`qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityState $activity` + STATE=`qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityState $activity` case "state$STATE" in state0) @@ -56,9 +56,9 @@ echo -n "$STATE$reset_color $activity " - ACTIVITY_NAME=`qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityName $activity` - ACTIVITY_DESC=`qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityDescription $activity` - ACTIVITY_ICON=`qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityIcon $activity` + ACTIVITY_NAME=`qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityName $activity` + ACTIVITY_DESC=`qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityDescription $activity` + ACTIVITY_ICON=`qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityIcon $activity` if [ -n "$ACTIVITY_DESC" ]; then echo "$ACTIVITY_NAME ($ACTIVITY_DESC, $ACTIVITY_ICON)" @@ -70,8 +70,8 @@ # Shows the information about the current activity function kamd_currentactivity() { - for activity in `qdbus org.kde.ActivityManager /ActivityManager/Activities CurrentActivity`; do - STATE=`qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityState $activity` + for activity in `qdbus org.kde.ActivityManager5 /ActivityManager/Activities CurrentActivity`; do + STATE=`qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityState $activity` case "state$STATE" in state0) @@ -92,19 +93,19 @@ esac echo -n "$STATE $activity " - qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityName $activity + qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityName $activity done } # Returns the current activity ID function kamd_get_currentactivity_id() { - qdbus org.kde.ActivityManager /ActivityManager/Activities CurrentActivity + qdbus org.kde.ActivityManager5 /ActivityManager/Activities CurrentActivity } # Returns the current activity name function kamd_get_currentactivity_name() { CURRENT_ACTIVITY_ID=$(kamd_get_currentactivity_id) - qdbus org.kde.ActivityManager /ActivityManager/Activities ActivityName $CURRENT_ACTIVITY_ID + qdbus org.kde.ActivityManager5 /ActivityManager/Activities ActivityName $CURRENT_ACTIVITY_ID } # Returns the current activity name diff -ur kactivities-5.17.0.old/src/common/dbus/common.h kactivities-5.17.0/src/common/dbus/common.h --- kactivities-5.17.0.old/src/common/dbus/common.h 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/common.h 2015-12-13 22:41:14.000000000 +0100 @@ -13,14 +13,14 @@ // clang-format off #define KAMD_DBUS_SERVICE \ - QStringLiteral("org.kde.ActivityManager") + 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) + QLatin1String("org.kde.ActivityManager5." A) #define KAMD_DBUS_INTERFACE(OBJECT_PATH, OBJECT, PARENT) \ QDBusInterface(KAMD_DBUS_SERVICE, \ @@ -37,7 +37,7 @@ nullptr) #define KAMD_DBUS_CLASS_INTERFACE(OBJECT_PATH, OBJECT, PARENT) \ - org::kde::ActivityManager::OBJECT( \ + org::kde::ActivityManager5::OBJECT( \ KAMD_DBUS_SERVICE, \ KAMD_DBUS_OBJECT_PATH(OBJECT_PATH), \ QDBusConnection::sessionBus(), \ diff -ur kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Activities.xml kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Activities.xml --- kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Activities.xml 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Activities.xml 2015-12-13 22:41:14.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.Activities"> + <interface name="org.kde.ActivityManager5.Activities"> <method name="CurrentActivity"> <arg type="s" direction="out"/> diff -ur kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Application.xml kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Application.xml --- kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Application.xml 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Application.xml 2015-12-13 22:41:14.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.Application"> + <interface name="org.kde.ActivityManager5.Application"> <method name="quit"> </method> <method name="serviceVersion"> diff -ur kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Features.xml kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Features.xml --- kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Features.xml 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Features.xml 2015-12-13 22:41:14.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.Features"> + <interface name="org.kde.ActivityManager5.Features"> <method name="IsFeatureOperational"> <arg type="b" direction="out"/> <arg name="feature" type="s" direction="in"/> diff -ur kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml --- kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml 2015-12-13 22:41:14.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 kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml --- kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.ResourcesScoring.xml 2015-12-13 22:41:14.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 kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Resources.xml kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Resources.xml --- kactivities-5.17.0.old/src/common/dbus/org.kde.ActivityManager.Resources.xml 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/common/dbus/org.kde.ActivityManager.Resources.xml 2015-12-13 22:41:14.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.Resources"> + <interface name="org.kde.ActivityManager5.Resources"> <method name="RegisterResourceEvent"> <arg name="application" type="s" direction="in"/> diff -ur kactivities-5.17.0.old/src/lib/activitiescache_p.cpp kactivities-5.17.0/src/lib/activitiescache_p.cpp --- kactivities-5.17.0.old/src/lib/activitiescache_p.cpp 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/lib/activitiescache_p.cpp 2015-12-13 22:41:14.000000000 +0100 @@ -41,7 +41,7 @@ : m_status(Consumer::NotRunning) { // qDebug() << "ActivitiesCache: Creating a new instance"; - using org::kde::ActivityManager::Activities; + using org::kde::ActivityManager5::Activities; auto activities = Manager::self()->activities(); diff -ur kactivities-5.17.0.old/src/lib/manager_p.h kactivities-5.17.0/src/lib/manager_p.h --- kactivities-5.17.0.old/src/lib/manager_p.h 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/src/lib/manager_p.h 2015-12-13 22:41:14.000000000 +0100 @@ -17,7 +17,7 @@ #include <QDBusServiceWatcher> -namespace Service = org::kde::ActivityManager; +namespace Service = org::kde::ActivityManager5; namespace KActivities { diff -ur kactivities-5.17.0.old/tests/slc-interface/window.cpp kactivities-5.17.0/tests/slc-interface/window.cpp --- kactivities-5.17.0.old/tests/slc-interface/window.cpp 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/tests/slc-interface/window.cpp 2015-12-13 22:41:14.000000000 +0100 @@ -12,11 +12,11 @@ Window::Window() : ui(new Ui::MainWindow()) - , slc(new org::kde::ActivityManager::SLC("org.kde.ActivityManager", "/SLC", QDBusConnection::sessionBus(), this)) + , slc(new org::kde::ActivityManager5::SLC("org.kde.ActivityManager5", "/SLC", QDBusConnection::sessionBus(), this)) { ui->setupUi(this); - connect(slc, &org::kde::ActivityManager::SLC::focusChanged, this, &Window::focusChanged); + connect(slc, &org::kde::ActivityManager5::SLC::focusChanged, this, &Window::focusChanged); } Window::~Window() diff -ur kactivities-5.17.0.old/tests/slc-interface/window.h kactivities-5.17.0/tests/slc-interface/window.h --- kactivities-5.17.0.old/tests/slc-interface/window.h 2015-12-06 22:15:31.000000000 +0100 +++ kactivities-5.17.0/tests/slc-interface/window.h 2015-12-13 22:41:14.000000000 +0100 @@ -27,5 +27,5 @@ private: Ui::MainWindow *ui; - org::kde::ActivityManager::SLC *slc; + org::kde::ActivityManager5::SLC *slc; };
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
