diff --git a/src/plasma/applet.h b/src/plasma/applet.h index 8153401b4..51cc28dca 100644 --- a/src/plasma/applet.h +++ b/src/plasma/applet.h @@ -789,12 +789,10 @@ private: */ /* clang-format off */ #define K_EXPORT_PLASMA_APPLET(libname, classname) \ - K_PLUGIN_FACTORY(factory, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY(factory, registerPlugin();) #define K_EXPORT_PLASMA_APPLET_WITH_JSON(libname, classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) /* clang-format on */ #endif // multiple inclusion guard diff --git a/src/plasma/containmentactions.h b/src/plasma/containmentactions.h index bef97048b..274614ac6 100644 --- a/src/plasma/containmentactions.h +++ b/src/plasma/containmentactions.h @@ -155,8 +155,7 @@ private: */ /* clang-format off */ #define K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(libname, classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) /* clang-format on */ #endif // PLASMA_CONTAINMENTACTIONS_H diff --git a/src/plasma/dataengine.h b/src/plasma/dataengine.h index 4d6e14589..86ca95a1f 100644 --- a/src/plasma/dataengine.h +++ b/src/plasma/dataengine.h @@ -458,12 +458,10 @@ private: */ /* clang-format off */ #define K_EXPORT_PLASMA_DATAENGINE(libname, classname) \ - K_PLUGIN_FACTORY(factory, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY(factory, registerPlugin();) #define K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(libname, classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) /* clang-format on */ #endif // multiple inclusion guard diff --git a/src/plasma/packagestructure.h b/src/plasma/packagestructure.h index 7350565cd..284115083 100644 --- a/src/plasma/packagestructure.h +++ b/src/plasma/packagestructure.h @@ -90,12 +90,10 @@ private: /* clang-format off */ #define K_EXPORT_PLASMA_PACKAGE(libname, classname) \ - K_PLUGIN_FACTORY(factory, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY(factory, registerPlugin();) #define K_EXPORT_PLASMA_PACKAGE_WITH_JSON(classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) /* clang-format on */ #endif // PLASMA_ENABLE_DEPRECATED_SINCE(5, 6) diff --git a/src/plasma/scripting/appletscript.h b/src/plasma/scripting/appletscript.h index 79fc01b37..889265db4 100644 --- a/src/plasma/scripting/appletscript.h +++ b/src/plasma/scripting/appletscript.h @@ -163,9 +163,7 @@ private: #define K_EXPORT_PLASMA_APPLETSCRIPTENGINE(libname, classname) K_PLUGIN_FACTORY(factory, registerPlugin();) -#define K_EXPORT_PLASMA_APPLETSCRIPTENGINE_WITH_JSON(libname, classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) +#define K_EXPORT_PLASMA_APPLETSCRIPTENGINE_WITH_JSON(libname, classname, jsonFile) K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) } // Plasma namespace #endif diff --git a/src/plasma/scripting/dataenginescript.h b/src/plasma/scripting/dataenginescript.h index eb1d1a027..147c88d90 100644 --- a/src/plasma/scripting/dataenginescript.h +++ b/src/plasma/scripting/dataenginescript.h @@ -146,8 +146,7 @@ private: #define K_EXPORT_PLASMA_DATAENGINESCRIPTENGINE(libname, classname) K_PLUGIN_FACTORY(factory, registerPlugin();) #define K_EXPORT_PLASMA_DATAENGINESCRIPTENGINE_WITH_JSON(libname, classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) } // Plasma namespace #endif diff --git a/src/plasma/service.h b/src/plasma/service.h index 293015993..5b8247e6c 100644 --- a/src/plasma/service.h +++ b/src/plasma/service.h @@ -211,12 +211,8 @@ private: /** * Register a service when it is contained in a loadable module */ -#define K_EXPORT_PLASMA_SERVICE(libname, classname) \ - K_PLUGIN_FACTORY(factory, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) +#define K_EXPORT_PLASMA_SERVICE(libname, classname) K_PLUGIN_FACTORY(factory, registerPlugin();) -#define K_EXPORT_PLASMA_SERVICE_WITH_JSON(libname, classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) +#define K_EXPORT_PLASMA_SERVICE_WITH_JSON(libname, classname, jsonFile) K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin();) #endif // multiple inclusion guard