generic: replace now gone KGenericFactory with KPluginFactory

diff --git a/about-distro/src/main.cpp b/about-distro/src/main.cpp
index dfab957..1135660 100644 (file)
--- a/about-distro/src/main.cpp
+++ b/about-distro/src/main.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <KGenericFactory>
 #include <KPluginFactory>
 
 #include "Module.h"

diff --git a/akregator/configuration/akregator_config_advanced.cpp b/akregator/configuration/akregator_config_advanced.cpp
index 40451c7..6e3a5c8 100644 (file)
--- a/akregator/configuration/akregator_config_advanced.cpp
+++ b/akregator/configuration/akregator_config_advanced.cpp
@@ -28,7 +28,7 @@
 
 #include <KAboutData>
 #include <KConfigDialogManager>
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KLocalizedString>
 #include <kdemacros.h>
 

diff --git a/akregator/configuration/akregator_config_appearance.cpp b/akregator/configuration/akregator_config_appearance.cpp
index 97d5309..68e2f78 100644 (file)
--- a/akregator/configuration/akregator_config_appearance.cpp
+++ b/akregator/configuration/akregator_config_appearance.cpp
@@ -26,7 +26,7 @@
 
 #include <KAboutData>
 #include <KConfigDialogManager>
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KLocalizedString>
 #include <kdemacros.h>
 

diff --git a/akregator/configuration/akregator_config_archive.cpp b/akregator/configuration/akregator_config_archive.cpp
index b538ff4..437d428 100644 (file)
--- a/akregator/configuration/akregator_config_archive.cpp
+++ b/akregator/configuration/akregator_config_archive.cpp
@@ -27,7 +27,7 @@
 #include <KAboutData>
 #include <KConfigDialogManager>
 #include <KDebug>
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KLocalizedString>
 #include <kdemacros.h>
 

diff --git a/akregator/configuration/akregator_config_browser.cpp b/akregator/configuration/akregator_config_browser.cpp
index 79a6bc4..689cbf1 100644 (file)
--- a/akregator/configuration/akregator_config_browser.cpp
+++ b/akregator/configuration/akregator_config_browser.cpp
@@ -28,7 +28,7 @@
 
 #include <KAboutData>
 #include <KConfigDialogManager>
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KLocalizedString>
 #include <kdemacros.h>
 

diff --git a/akregator/configuration/akregator_config_general.cpp b/akregator/configuration/akregator_config_general.cpp
index ad9fb06..10cdfe7 100644 (file)
--- a/akregator/configuration/akregator_config_general.cpp
+++ b/akregator/configuration/akregator_config_general.cpp
@@ -28,7 +28,7 @@
 
 #include <KAboutData>
 #include <KConfigDialogManager>
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KLocalizedString>
 #include <kdemacros.h>
 

diff --git a/akregator/plugins/sharemicroblog/sharemicroblogplugin.cpp b/akregator/plugins/sharemicroblog/sharemicroblogplugin.cpp
index be442e9..d3c4b3d 100644 (file)
--- a/akregator/plugins/sharemicroblog/sharemicroblogplugin.cpp
+++ b/akregator/plugins/sharemicroblog/sharemicroblogplugin.cpp
@@ -32,7 +32,7 @@
 #include <KXMLGUIClient>
 #include <Plasma/DataEngineManager>
 #include <Plasma/ServiceJob>
-
+#include <KDebug>
 
 K_PLUGIN_FACTORY(SharePluginFactory, registerPlugin<SharePluginIface>();)
 K_EXPORT_PLUGIN(SharePluginFactory("akregator_sharemicroblog_plugin"))

diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index 04752d4..f009f94 100644 (file)
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -19,7 +19,7 @@ email                : markey@web.de
 #include <vector>
 #include <QString>
 
-#include <klibloader.h>
+#include <kpluginfactory.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

diff --git a/filelight/src/app/mainWindow.cpp b/filelight/src/app/mainWindow.cpp
index a3a7ae0..1e01203 100644 (file)
--- a/filelight/src/app/mainWindow.cpp
+++ b/filelight/src/app/mainWindow.cpp
@@ -34,7 +34,6 @@
 #include <QLineEdit>
 #include <KStandardShortcut>
 #include <KFileDialog>
-#include <KLibLoader>
 #include <KLocale>
 #include <KMessageBox>
 #include <KShell>
@@ -50,6 +49,8 @@
 #include <KSharedConfig>
 #include <KStandardAction>
 #include <KActionCollection>
+#include <KPluginLoader>
+#include <KPluginFactory>
 
 namespace Filelight {
 

diff --git a/kget/extensions/konqueror/kget_plug_in.cpp b/kget/extensions/konqueror/kget_plug_in.cpp
index bbbb28a..c8bbae0 100644 (file)
--- a/kget/extensions/konqueror/kget_plug_in.cpp
+++ b/kget/extensions/konqueror/kget_plug_in.cpp
@@ -27,7 +27,7 @@
 #include <KDE/KRun>
 #include <KDE/KIcon>
 #include <KDE/KToolInvocation>
-#include <KDE/KGenericFactory>
+#include <KDE/KPluginFactory>
 #include <KDE/KProtocolInfo>
 #include <KDE/KFileItem>
 #include <KDE/KParts/Part>

diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index c01cc50..e09b709 100644 (file)
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -27,7 +27,6 @@
 #include <kencodingfiledialog.h>
 #include <kiconloader.h>
 #include <kshortcutsdialog.h>
-#include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kparts/componentfactory.h>

diff --git a/krfb/framebuffers/qt/qtframebufferplugin.cpp b/krfb/framebuffers/qt/qtframebufferplugin.cpp
index 0931087..64e3449 100644 (file)
--- a/krfb/framebuffers/qt/qtframebufferplugin.cpp
+++ b/krfb/framebuffers/qt/qtframebufferplugin.cpp
@@ -22,7 +22,7 @@
 
 #include "qtframebuffer.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 
 QtFrameBufferPlugin::QtFrameBufferPlugin(QObject *parent, const QVariantList &args)

diff --git a/krfb/framebuffers/x11/x11framebufferplugin.cpp b/krfb/framebuffers/x11/x11framebufferplugin.cpp
index b6b5550..670ebb8 100644 (file)
--- a/krfb/framebuffers/x11/x11framebufferplugin.cpp
+++ b/krfb/framebuffers/x11/x11framebufferplugin.cpp
@@ -22,7 +22,7 @@
 
 #include "x11framebuffer.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 
 X11FrameBufferPlugin::X11FrameBufferPlugin(QObject *parent, const QVariantList &args)

diff --git a/lokalize/src/catalog/gettext/gettextimport.cpp b/lokalize/src/catalog/gettext/gettextimport.cpp
index 868eee2..d337cec 100644 (file)
--- a/lokalize/src/catalog/gettext/gettextimport.cpp
+++ b/lokalize/src/catalog/gettext/gettextimport.cpp
@@ -50,7 +50,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <klocale.h>
 
 #include "catalogitem.h"

diff --git a/okular/core/document.cpp b/okular/core/document.cpp
index 4589335..55ea8ad 100644 (file)
--- a/okular/core/document.cpp
+++ b/okular/core/document.cpp
@@ -41,7 +41,6 @@
 #include <kcomponentdata.h>
 #include <kconfigdialog.h>
 #include <kdebug.h>
-#include <klibloader.h>
 #include <klocale.h>
 #include <kmacroexpander.h>
 #include <kmessagebox.h>

diff --git a/print-manager/print-manager-kded/PrintManagerKded.cpp b/print-manager/print-manager-kded/PrintManagerKded.cpp
index bdf4164..51d5492 100644 (file)
--- a/print-manager/print-manager-kded/PrintManagerKded.cpp
+++ b/print-manager/print-manager-kded/PrintManagerKded.cpp
@@ -24,7 +24,7 @@
 
 #include <QTimer>
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 K_PLUGIN_FACTORY(PrintDFactory, registerPlugin<PrintManagerKded>();)
 K_EXPORT_PLUGIN(PrintDFactory("printmanager", "print-manager"))

diff --git a/print-manager/printer-manager-kcm/PrintKCM.cpp b/print-manager/printer-manager-kcm/PrintKCM.cpp
index 823b12e..c02cdb4 100644 (file)
--- a/print-manager/printer-manager-kcm/PrintKCM.cpp
+++ b/print-manager/printer-manager-kcm/PrintKCM.cpp
@@ -30,16 +30,16 @@
 #include "PrinterDescription.h"
 
 #include <KMessageBox>
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KAboutData>
 #include <KToolInvocation>
 #include <KIcon>
-
-#include <QMenu>
 #include <KCupsRequest.h>
 #include <KCupsServer.h>
 #include <NoSelectionRectDelegate.h>
 
+#include <QMenu>
+
 #include <cups/cups.h>
 
 K_PLUGIN_FACTORY(PrintKCMFactory, registerPlugin<PrintKCM>();)

diff --git a/svgpart/svgpart.cpp b/svgpart/svgpart.cpp
index 07cee57..7a14b15 100644 (file)
--- a/svgpart/svgpart.cpp
+++ b/svgpart/svgpart.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kaboutdata.h>
 #include <kactioncollection.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 #include <kstandardaction.h>
 
 // Local