Remove KActivities DBUS string macro magic

activities/common/dbus/common.h

@@ -28,11 +28,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,                                          \

activities/fileitemplugin/FileItemLinkingPlugin.cpp

@@ -83,9 +83,7 @@ void FileItemLinkingPlugin::Private::actionTriggered()
     bool link = action->property("link").toBool();
     QString activity = action->property("activity").toString();
 
-    // clang-format off
-    KAMD_DBUS_DECL_INTERFACE(service, Resources/Linking, ResourcesLinking);
-    // clang-format on
+    KAMD_DBUS_DECL_INTERFACE(service, "Resources/Linking", "ResourcesLinking");
 
     const auto urlList = items.urlList();
     for (const auto &item : urlList) {