Commit 1dbe39bf authored by Alexander Lohnau's avatar Alexander Lohnau 💬
Browse files

Remove KAMD_EXPORT_PLUGIN macro in favor of K_PLUGIN_CLASS_WITH_JSON

The custom macro is no longer needed and the libname is  KDE4 leftover.

Task: https://phabricator.kde.org/T14542
parent 1297cd13
Pipeline #197312 passed with stage
in 1 minute and 50 seconds
......@@ -39,7 +39,6 @@ include (ECMConfiguredInstall)
include (ECMGenerateDBusServiceFile)
include (ECMGenerateHeaders)
include (ECMQtDeclareLoggingCategory)
include (ECMSetupQtPluginMacroNames)
include (KDEClangFormat)
include (KDEGitCommitHooks)
......
......@@ -55,6 +55,4 @@ ecm_qt_declare_logging_category(debug_SRCS
DEFAULT_SEVERITY Warning
DESCRIPTION "KActivities Application" EXPORT KACTIVITYMANAGERD)
ecm_setup_qtplugin_macro_names(JSON_ARG3 "KAMD_EXPORT_PLUGIN")
add_subdirectory (service)
......@@ -24,8 +24,6 @@
#include "Event.h"
#include "Module.h"
#define KAMD_EXPORT_PLUGIN(libname, classname, jsonFile) K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin<classname>();)
/**
*
*/
......
......@@ -18,7 +18,7 @@
// Local
#include "templatesadaptor.h"
KAMD_EXPORT_PLUGIN(templatesplugin, TemplatesPlugin, "kactivitymanagerd-plugin-activitytemplates.json")
K_PLUGIN_CLASS_WITH_JSON(TemplatesPlugin, "kactivitymanagerd-plugin-activitytemplates.json")
TemplatesPlugin::TemplatesPlugin(QObject *parent, const QVariantList &args)
: Plugin(parent)
......
......@@ -14,7 +14,7 @@
#include <KDirWatch>
#include <KRecentDocument>
KAMD_EXPORT_PLUGIN(eventspyplugin, EventSpyPlugin, "kactivitymanagerd-plugin-eventspy.json")
K_PLUGIN_CLASS_WITH_JSON(EventSpyPlugin, "kactivitymanagerd-plugin-eventspy.json")
EventSpyPlugin::EventSpyPlugin(QObject *parent, const QVariantList &args)
: Plugin(parent)
......
......@@ -15,7 +15,7 @@
#include <KGlobalAccel>
#include <KLocalizedString>
KAMD_EXPORT_PLUGIN(globalshortcutsplugin, GlobalShortcutsPlugin, "kactivitymanagerd-plugin-globalshortcuts.json")
K_PLUGIN_CLASS_WITH_JSON(GlobalShortcutsPlugin, "kactivitymanagerd-plugin-globalshortcuts.json")
const auto objectNamePattern = QStringLiteral("switch-to-activity-%1");
const auto objectNamePatternLength = objectNamePattern.length() - 2;
......
......@@ -18,7 +18,7 @@
#include "DebugPluginGtkEventSpy.h"
KAMD_EXPORT_PLUGIN(GtkEventSpyPlugin, GtkEventSpyPlugin, "kactivitymanagerd-plugin-gtk-eventspy.json")
K_PLUGIN_CLASS_WITH_JSON(GtkEventSpyPlugin, "kactivitymanagerd-plugin-gtk-eventspy.json")
GtkEventSpyPlugin::GtkEventSpyPlugin(QObject *parent, const QVariantList &args)
: Plugin(parent)
......
......@@ -11,7 +11,7 @@
#include <KLocalizedString>
#include <krunner1adaptor.h>
KAMD_EXPORT_PLUGIN(activityrunner, ActivityRunner, "kactivitymanagerd-plugin-activityrunner.json")
K_PLUGIN_CLASS_WITH_JSON(ActivityRunner, "kactivitymanagerd-plugin-activityrunner.json")
ActivityRunner::ActivityRunner(QObject *parent, const QVariantList &args)
: Plugin(parent)
......
......@@ -25,7 +25,7 @@ enum ActivityState {
};
}
KAMD_EXPORT_PLUGIN(runapplicationplugin, RunApplicationPlugin, "kactivitymanagerd-plugin-runapplication.json")
K_PLUGIN_CLASS_WITH_JSON(RunApplicationPlugin, "kactivitymanagerd-plugin-runapplication.json")
RunApplicationPlugin::RunApplicationPlugin(QObject *parent, const QVariantList &args)
: Plugin(parent)
......
......@@ -13,7 +13,7 @@
// Local
#include "slcadaptor.h"
KAMD_EXPORT_PLUGIN(slcplugin, SlcPlugin, "kactivitymanagerd-plugin-slc.json")
K_PLUGIN_CLASS_WITH_JSON(SlcPlugin, "kactivitymanagerd-plugin-slc.json")
SlcPlugin::SlcPlugin(QObject *parent, const QVariantList &args)
: Plugin(parent)
......
......@@ -30,7 +30,7 @@
#include "common/specialvalues.h"
#include "resourcescoringadaptor.h"
KAMD_EXPORT_PLUGIN(sqliteplugin, StatsPlugin, "kactivitymanagerd-plugin-sqlite.json")
K_PLUGIN_CLASS_WITH_JSON(StatsPlugin, "kactivitymanagerd-plugin-sqlite.json")
StatsPlugin *StatsPlugin::s_instance = nullptr;
......
......@@ -15,7 +15,7 @@
#include <kwindowsystem.h>
KAMD_EXPORT_PLUGIN(virtualdesktopswitchplugin, VirtualDesktopSwitchPlugin, "kactivitymanagerd-plugin-virtualdesktopswitch.json")
K_PLUGIN_CLASS_WITH_JSON(VirtualDesktopSwitchPlugin, "kactivitymanagerd-plugin-virtualdesktopswitch.json")
const auto configPattern = QStringLiteral("desktop-for-%1");
const auto kwinName = QStringLiteral("org.kde.KWin");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment