Remove macro string magic

src/common/dbus/common.h

@@ -14,11 +14,11 @@
     QStringLiteral("org.kde.ActivityManager")
 
 #define KAMD_DBUS_OBJECT_PATH(A)                                               \
-    (sizeof(#A) > 2 ? QLatin1String("/ActivityManager/" #A)                    \
-                    : QLatin1String("/ActivityManager"))
+    (sizeof(A) > 2 ? QLatin1String("/ActivityManager/" A)                      \
+                   : QLatin1String("/ActivityManager"))
 
 #define KAMD_DBUS_OBJECT(A)                                                    \
-    QLatin1String("org.kde.ActivityManager." #A)
+    QLatin1String("org.kde.ActivityManager." A)
 
 #define KAMD_DBUS_INTERFACE(OBJECT_PATH, OBJECT, PARENT)                       \
     QDBusInterface(KAMD_DBUS_SERVICE,                                          \

src/service/Activities.cpp

@@ -481,7 +481,7 @@ Activities::Activities(QObject *parent)
 
     new ActivitiesAdaptor(this);
     QDBusConnection::sessionBus().registerObject(
-        KAMD_DBUS_OBJECT_PATH(Activities), this);
+        KAMD_DBUS_OBJECT_PATH("Activities"), this);
 
     // Initializing config
 

src/service/Features.cpp

@@ -27,7 +27,7 @@ Features::Features(QObject *parent)
 {
     new FeaturesAdaptor(this);
     QDBusConnection::sessionBus().registerObject(
-        KAMD_DBUS_OBJECT_PATH(Features), this);
+        KAMD_DBUS_OBJECT_PATH("Features"), this);
 }
 
 Features::~Features()

src/service/Resources.cpp

@@ -257,7 +257,7 @@ Resources::Resources(QObject *parent)
 
     new ResourcesAdaptor(this);
     QDBusConnection::sessionBus().registerObject(
-        KAMD_DBUS_OBJECT_PATH(Resources), this);
+        KAMD_DBUS_OBJECT_PATH("Resources"), this);
 
     connect(KWindowSystem::self(), &KWindowSystem::windowRemoved,
             d.operator->(),        &Resources::Private::windowClosed);