kdecore: move K_EXPORT_PLUGIN() macro to kpluginfactory header [ci reset]

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

kdecore/util/kpluginfactory.h

@@ -27,6 +27,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
+#include <QtCore/qplugin.h>
 #include <kcomponentdata.h>
 #include <kglobal.h>
 
@@ -69,6 +70,17 @@ KComponentData name::componentData() \
     K_PLUGIN_FACTORY_DECLARATION_WITH_BASEFACTORY(name, baseFactory) \
     K_PLUGIN_FACTORY_DEFINITION_WITH_BASEFACTORY(name, baseFactory, pluginRegistrations)
 
+/**
+ * \relates KPluginLoader
+ * This macro exports the main object of the plugin. Most times, this will be a KPluginFactory
+ * or derived class, but any QObject derived class can be used.
+ * Take a look at the documentation of Q_EXPORT_PLUGIN2 for some details.
+ *
+ * @ingroup KDEMacros
+ */
+#define K_EXPORT_PLUGIN(factory) \
+Q_EXPORT_PLUGIN(factory)
+
 /**
  * \relates KPluginFactory
  * Defines a KPluginFactory subclass with two constructors and a static componentData function.

kdecore/util/kpluginloader.h

@@ -22,7 +22,6 @@
 #include <kdeversion.h>
 
 #include <QtCore/QPluginLoader>
-#include <QtCore/qplugin.h>
 
 class KComponentData;
 class KPluginFactory;
@@ -133,15 +132,4 @@ private:
     KPluginLoaderPrivate *const d_ptr;
 };
 
-/**
- * \relates KPluginLoader
- * This macro exports the main object of the plugin. Most times, this will be a KPluginFactory
- * or derived class, but any QObject derived class can be used.
- * Take a look at the documentation of Q_EXPORT_PLUGIN2 for some details.
- *
- * @ingroup KDEMacros
- */
-#define K_EXPORT_PLUGIN(factory) \
-Q_EXPORT_PLUGIN(factory)
-
 #endif

kfile/kfilemodule.cpp

@@ -21,7 +21,6 @@
 #include "kfilewidget.h"
 #include "kdirselectdialog.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 
 K_PLUGIN_FACTORY(KFileModuleFactory, registerPlugin<KFileModule>();)
 K_EXPORT_PLUGIN(KFileModuleFactory("kfilemodule", "kio4"))

kio/metadata/kfilemetadata_epub.cpp

@@ -18,7 +18,6 @@
 
 #include "kfilemetadata_epub.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kdebug.h"
 
 #include <epub.h>

kio/metadata/kfilemetadata_exiv2.cpp

@@ -18,7 +18,6 @@
 
 #include "kfilemetadata_exiv2.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kexiv2.h"
 
 #include <QDebug>

kio/metadata/kfilemetadata_ffmpeg.cpp

@@ -18,7 +18,6 @@
 
 #include "kfilemetadata_ffmpeg.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kmimetype.h"

kio/metadata/kfilemetadata_poppler.cpp

@@ -18,7 +18,6 @@
 
 #include "kfilemetadata_poppler.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kdatetime.h"

kio/metadata/kfilemetadata_spectre.cpp

@@ -18,7 +18,6 @@
 
 #include "kfilemetadata_spectre.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kdebug.h"
 
 #include <libspectre/spectre.h>

kio/metadata/kfilemetadata_taglib.cpp

@@ -18,7 +18,6 @@
 
 #include "kfilemetadata_taglib.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kdebug.h"

kutils/kmediaplayer/kded/kaudioplayer.cpp

@@ -18,7 +18,6 @@
 
 #include "kaudioplayer.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 
 K_PLUGIN_FACTORY(KAudioPlayerModuleFactory, registerPlugin<KAudioPlayerModule>();)
 K_EXPORT_PLUGIN(KAudioPlayerModuleFactory("kaudioplayer"))

kutils/kpasswdstore/kded/kded_kpasswdstore.cpp

@@ -18,7 +18,6 @@
 
 #include "kded_kpasswdstore.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 
 K_PLUGIN_FACTORY(KPasswdStoreModuleFactory, registerPlugin<KPasswdStoreModule>();)
 K_EXPORT_PLUGIN(KPasswdStoreModuleFactory("kpasswdstore"))

kutils/kpowermanager/kded/kded_kpowermanager.cpp

@@ -18,7 +18,6 @@
 
 #include "kded_kpowermanager.h"
 #include "kpluginfactory.h"
-#include "kpluginloader.h"
 #include "kpowermanager.h"
 #include "kdebug.h"