summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-03-29 16:00:31 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:26 +0100
commit107ae82d047d3519c3fd649186e235a03afd8bfe (patch)
tree7808f642d69e11c30dfeeb2e78fd4e00ba8c1c7d
parente8f277a1602c1f5fa1445c1e28ead396ef6d643c (diff)
Fix deprecated include
-rw-r--r--doc-dev/t3/tutorialpreferences.cpp2
-rw-r--r--kopete/chatwindow/chatview.cpp2
-rw-r--r--kopete/chatwindow/kopeteemailwindow.cpp2
-rw-r--r--kopete/config/status/statusconfig.cpp2
-rw-r--r--plugins/addbookmarks/addbookmarksplugin.h2
-rw-r--r--plugins/addbookmarks/addbookmarkspreferences.cpp2
-rw-r--r--plugins/alias/aliasplugin.cpp2
-rw-r--r--plugins/alias/aliaspreferences.cpp2
-rw-r--r--plugins/autoreplace/autoreplaceplugin.cpp2
-rw-r--r--plugins/autoreplace/autoreplacepreferences.cpp2
-rw-r--r--plugins/contactnotes/contactnotesplugin.cpp3
-rw-r--r--plugins/cryptography/cryptographyplugin.cpp2
-rw-r--r--plugins/highlight/highlightplugin.cpp2
-rw-r--r--plugins/highlight/highlightpreferences.cpp2
-rw-r--r--plugins/history/historyguiclient.cpp2
-rw-r--r--plugins/history/historyplugin.cpp2
-rw-r--r--plugins/history/historypreferences.cpp2
-rw-r--r--plugins/history2/history2guiclient.cpp2
-rw-r--r--plugins/history2/history2plugin.cpp2
-rw-r--r--plugins/history2/history2preferences.cpp2
-rw-r--r--plugins/latex/latexplugin.cpp2
-rw-r--r--plugins/latex/latexpreferences.cpp2
-rw-r--r--plugins/otr/otrplugin.cpp2
-rw-r--r--plugins/privacy/privacyguiclient.cpp3
-rw-r--r--plugins/privacy/privacyplugin.cpp4
-rw-r--r--plugins/privacy/privacypreferences.cpp4
-rw-r--r--plugins/statistics/statisticsplugin.cpp4
-rw-r--r--plugins/texteffect/texteffectplugin.cpp2
-rw-r--r--plugins/texteffect/texteffectpreferences.cpp2
-rw-r--r--plugins/translator/translatorplugin.cpp2
-rw-r--r--plugins/translator/translatorpreferences.cpp3
-rw-r--r--plugins/urlpicpreview/urlpicpreviewplugin.cpp2
-rw-r--r--plugins/urlpicpreview/urlpicpreviewpreferences.cpp2
-rw-r--r--plugins/webpresence/webpresenceplugin.cpp2
-rw-r--r--plugins/webpresence/webpresencepreferences.cpp2
-rw-r--r--protocols/bonjour/bonjourprotocol.cpp2
-rw-r--r--protocols/gadu/gaduprotocol.cpp2
-rw-r--r--protocols/groupwise/gwprotocol.cpp2
-rw-r--r--protocols/irc/ircprotocol.cpp2
-rw-r--r--protocols/irc/ui/networkconfigwidget.cpp2
-rw-r--r--protocols/jabber/jabberprotocol.cpp2
-rw-r--r--protocols/meanwhile/meanwhileprotocol.cpp2
-rw-r--r--protocols/oscar/aim/aimprotocol.cpp2
-rw-r--r--protocols/oscar/icq/icqprotocol.cpp2
-rw-r--r--protocols/qq/qqprotocol.cpp3
-rw-r--r--protocols/skype/skypechatsession.cpp2
-rw-r--r--protocols/skype/skypeprotocol.cpp2
-rw-r--r--protocols/sms/smsprotocol.cpp2
-rw-r--r--protocols/testbed/testbedprotocol.cpp2
-rw-r--r--protocols/winpopup/wpprotocol.cpp2
-rw-r--r--protocols/wlm/wlmprotocol.cpp2
-rw-r--r--protocols/yahoo/yahooprotocol.cpp2
52 files changed, 62 insertions, 52 deletions
diff --git a/doc-dev/t3/tutorialpreferences.cpp b/doc-dev/t3/tutorialpreferences.cpp
index d050024..cf4cdb9 100644
--- a/doc-dev/t3/tutorialpreferences.cpp
+++ b/doc-dev/t3/tutorialpreferences.cpp
@@ -19,7 +19,7 @@
#include "tutorialpreferences.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
typedef KGenericFactory<TutorialPreferences> TutorialPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY(kcm_kopete_tutorialplugin, TutorialPreferencesFactory("kcm_kopete_tutorialplugin"))
diff --git a/kopete/chatwindow/chatview.cpp b/kopete/chatwindow/chatview.cpp
index fb2d555..8ee4cfd 100644
--- a/kopete/chatwindow/chatview.cpp
+++ b/kopete/chatwindow/chatview.cpp
@@ -44,7 +44,7 @@
#include <kstringhandler.h>
#include <kwindowsystem.h>
#include <kglobalsettings.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <khtmlview.h>
#include <kxmlguifactory.h>
#include <kpluginfactory.h>
diff --git a/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/chatwindow/kopeteemailwindow.cpp
index aac4c6e..5601e02 100644
--- a/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/chatwindow/kopeteemailwindow.cpp
@@ -49,7 +49,7 @@
#include <QPushButton>
#include <ktextedit.h>
#include <kwindowsystem.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kxmlguifactory.h>
#include <kpluginfactory.h>
#include <kvbox.h>
diff --git a/kopete/config/status/statusconfig.cpp b/kopete/config/status/statusconfig.cpp
index 9ac39c2..8564636 100644
--- a/kopete/config/status/statusconfig.cpp
+++ b/kopete/config/status/statusconfig.cpp
@@ -21,7 +21,7 @@
#include <QVBoxLayout>
#include <QTabWidget>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kpluginfactory.h>
#include "kopetestatussettings.h"
diff --git a/plugins/addbookmarks/addbookmarksplugin.h b/plugins/addbookmarks/addbookmarksplugin.h
index e3494c0..1ad7c0f 100644
--- a/plugins/addbookmarks/addbookmarksplugin.h
+++ b/plugins/addbookmarks/addbookmarksplugin.h
@@ -17,7 +17,7 @@
#include <kopeteplugin.h>
#include <kopetemessage.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kbookmarkmanager.h>
#include <kio/job.h>
#include <kurl.h>
diff --git a/plugins/addbookmarks/addbookmarkspreferences.cpp b/plugins/addbookmarks/addbookmarkspreferences.cpp
index f033765..9a84a3c 100644
--- a/plugins/addbookmarks/addbookmarkspreferences.cpp
+++ b/plugins/addbookmarks/addbookmarkspreferences.cpp
@@ -13,7 +13,7 @@
#include "ui_addbookmarksprefsui.h"
#include "addbookmarksplugin.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kopetepluginmanager.h>
#include <kopetecontactlist.h>
diff --git a/plugins/alias/aliasplugin.cpp b/plugins/alias/aliasplugin.cpp
index 45d4570..1711fd7 100644
--- a/plugins/alias/aliasplugin.cpp
+++ b/plugins/alias/aliasplugin.cpp
@@ -9,7 +9,7 @@
#include "aliasplugin.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "kopetechatsessionmanager.h"
diff --git a/plugins/alias/aliaspreferences.cpp b/plugins/alias/aliaspreferences.cpp
index 3a330e9..fbc156f 100644
--- a/plugins/alias/aliaspreferences.cpp
+++ b/plugins/alias/aliaspreferences.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <QLineEdit>
#include <kglobal.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kmessagebox.h>
#include <kconfig.h>
#include <qregexp.h>
diff --git a/plugins/autoreplace/autoreplaceplugin.cpp b/plugins/autoreplace/autoreplaceplugin.cpp
index c3d2265..a73cde9 100644
--- a/plugins/autoreplace/autoreplaceplugin.cpp
+++ b/plugins/autoreplace/autoreplaceplugin.cpp
@@ -17,7 +17,7 @@
#include "autoreplaceplugin.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kopetecontact.h>
diff --git a/plugins/autoreplace/autoreplacepreferences.cpp b/plugins/autoreplace/autoreplacepreferences.cpp
index 5b39611..c4b4d8b 100644
--- a/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/plugins/autoreplace/autoreplacepreferences.cpp
@@ -25,7 +25,7 @@
#include <KLocalizedString>
#include <QLineEdit>
#include <kglobal.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "ui_autoreplaceprefs.h"
#include "autoreplaceconfig.h"
diff --git a/plugins/contactnotes/contactnotesplugin.cpp b/plugins/contactnotes/contactnotesplugin.cpp
index c8c5905..df57796 100644
--- a/plugins/contactnotes/contactnotesplugin.cpp
+++ b/plugins/contactnotes/contactnotesplugin.cpp
@@ -19,8 +19,9 @@
#include <QAction>
#include "plugin_contactnotes_debug.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <qicon.h>
+#include <KLocalizedString>
#include "kopetemetacontact.h"
#include "kopetecontactlist.h"
diff --git a/plugins/cryptography/cryptographyplugin.cpp b/plugins/cryptography/cryptographyplugin.cpp
index 18a4136..1709fe6 100644
--- a/plugins/cryptography/cryptographyplugin.cpp
+++ b/plugins/cryptography/cryptographyplugin.cpp
@@ -25,7 +25,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kaction.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kaboutdata.h>
#include <kiconloader.h>
#include <kmessagebox.h>
diff --git a/plugins/highlight/highlightplugin.cpp b/plugins/highlight/highlightplugin.cpp
index 09429e7..7244905 100644
--- a/plugins/highlight/highlightplugin.cpp
+++ b/plugins/highlight/highlightplugin.cpp
@@ -17,7 +17,7 @@
#include <qregexp.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "kopetechatsessionmanager.h"
#include "kopeteview.h"
diff --git a/plugins/highlight/highlightpreferences.cpp b/plugins/highlight/highlightpreferences.cpp
index 9e4d06f..89c527a 100644
--- a/plugins/highlight/highlightpreferences.cpp
+++ b/plugins/highlight/highlightpreferences.cpp
@@ -26,7 +26,7 @@
#include <QLineEdit>
#include <KLocalizedString>
#include <kdialog.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kservicetypetrader.h>
#include <kcolorbutton.h>
#include <qinputdialog.h>
diff --git a/plugins/history/historyguiclient.cpp b/plugins/history/historyguiclient.cpp
index 7173a48..41745bf 100644
--- a/plugins/history/historyguiclient.cpp
+++ b/plugins/history/historyguiclient.cpp
@@ -24,7 +24,7 @@
#include <QAction>
#include <kstandardaction.h>
#include <klocale.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <QIcon>
#include <kactioncollection.h>
diff --git a/plugins/history/historyplugin.cpp b/plugins/history/historyplugin.cpp
index ace4fbf..f752144 100644
--- a/plugins/history/historyplugin.cpp
+++ b/plugins/history/historyplugin.cpp
@@ -20,7 +20,7 @@
#include <QtCore/QList>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kaboutdata.h>
#include <QAction>
#include <kmessagebox.h>
diff --git a/plugins/history/historypreferences.cpp b/plugins/history/historypreferences.cpp
index 99bb306..4c3c71f 100644
--- a/plugins/history/historypreferences.cpp
+++ b/plugins/history/historypreferences.cpp
@@ -24,7 +24,7 @@
#include <kcolorbutton.h>
#include <knuminput.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "historyconfig.h"
#include "ui_historyprefsui.h"
diff --git a/plugins/history2/history2guiclient.cpp b/plugins/history2/history2guiclient.cpp
index 9d4e006..75de50b 100644
--- a/plugins/history2/history2guiclient.cpp
+++ b/plugins/history2/history2guiclient.cpp
@@ -24,7 +24,7 @@
#include <kaction.h>
#include <kstandardaction.h>
#include <klocale.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kicon.h>
#include <kactioncollection.h>
diff --git a/plugins/history2/history2plugin.cpp b/plugins/history2/history2plugin.cpp
index 86b02b3..da16647 100644
--- a/plugins/history2/history2plugin.cpp
+++ b/plugins/history2/history2plugin.cpp
@@ -20,7 +20,7 @@
#include <QtCore/QList>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kaboutdata.h>
#include <kaction.h>
#include <kmessagebox.h>
diff --git a/plugins/history2/history2preferences.cpp b/plugins/history2/history2preferences.cpp
index 472c868..dca2aa8 100644
--- a/plugins/history2/history2preferences.cpp
+++ b/plugins/history2/history2preferences.cpp
@@ -25,7 +25,7 @@
#include <kcolorbutton.h>
#include <knuminput.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "history2import.h"
#include "history2config.h"
diff --git a/plugins/latex/latexplugin.cpp b/plugins/latex/latexplugin.cpp
index 4629a45..da191b1 100644
--- a/plugins/latex/latexplugin.cpp
+++ b/plugins/latex/latexplugin.cpp
@@ -23,7 +23,7 @@
#include <qbuffer.h>
#include <QTextDocument>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kprocess.h>
diff --git a/plugins/latex/latexpreferences.cpp b/plugins/latex/latexpreferences.cpp
index 6daffe2..630a51a 100644
--- a/plugins/latex/latexpreferences.cpp
+++ b/plugins/latex/latexpreferences.cpp
@@ -21,7 +21,7 @@
//#include <kparts/componentfactory.h>
#include <KLocalizedString>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include <KUrl>
#include <knuminput.h>
diff --git a/plugins/otr/otrplugin.cpp b/plugins/otr/otrplugin.cpp
index 4ffec0f..172585d 100644
--- a/plugins/otr/otrplugin.cpp
+++ b/plugins/otr/otrplugin.cpp
@@ -32,7 +32,7 @@
#include "plugin_otr_debug.h"
#include <qaction.h>
#include <kconfig.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kselectaction.h>
#include <kactioncollection.h>
diff --git a/plugins/privacy/privacyguiclient.cpp b/plugins/privacy/privacyguiclient.cpp
index 8c4f6d1..b749b51 100644
--- a/plugins/privacy/privacyguiclient.cpp
+++ b/plugins/privacy/privacyguiclient.cpp
@@ -23,8 +23,9 @@
#include <QAction>
#include <kstandardaction.h>
#include <KLocalizedString>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <qicon.h>
+#include <KDebug>
#include <QList>
#include <kactioncollection.h>
diff --git a/plugins/privacy/privacyplugin.cpp b/plugins/privacy/privacyplugin.cpp
index 9f54ac7..49fe07e 100644
--- a/plugins/privacy/privacyplugin.cpp
+++ b/plugins/privacy/privacyplugin.cpp
@@ -16,11 +16,13 @@
#include "privacyplugin.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <QIcon>
#include <QAction>
#include <knotification.h>
#include <kplugininfo.h>
+#include <KDebug>
+#include <KLocalizedString>
#include "kopeteaccount.h"
#include "kopetecontact.h"
diff --git a/plugins/privacy/privacypreferences.cpp b/plugins/privacy/privacypreferences.cpp
index 006d9cd..82530bd 100644
--- a/plugins/privacy/privacypreferences.cpp
+++ b/plugins/privacy/privacypreferences.cpp
@@ -21,9 +21,11 @@
#include <QHeaderView>
#include <QPointer>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdialog.h>
#include <kvbox.h>
+#include <KLocalizedString>
+#include <KDebug>
#include "kopeteuiglobal.h"
#include "kopetemetacontact.h"
diff --git a/plugins/statistics/statisticsplugin.cpp b/plugins/statistics/statisticsplugin.cpp
index 6504bda..5a57457 100644
--- a/plugins/statistics/statisticsplugin.cpp
+++ b/plugins/statistics/statisticsplugin.cpp
@@ -23,11 +23,13 @@
#include <QList>
#include <qtimer.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kaboutdata.h>
#include <QAction>
#include <kactioncollection.h>
#include <kmessagebox.h>
+#include <KDebug>
+#include <KLocalizedString>
#include <kapplication.h>
diff --git a/plugins/texteffect/texteffectplugin.cpp b/plugins/texteffect/texteffectplugin.cpp
index 367b748..53c256e 100644
--- a/plugins/texteffect/texteffectplugin.cpp
+++ b/plugins/texteffect/texteffectplugin.cpp
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include "plugin_texteffect_debug.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <QColor>
#include "kopetechatsessionmanager.h"
diff --git a/plugins/texteffect/texteffectpreferences.cpp b/plugins/texteffect/texteffectpreferences.cpp
index 60fdd86..3b64509 100644
--- a/plugins/texteffect/texteffectpreferences.cpp
+++ b/plugins/texteffect/texteffectpreferences.cpp
@@ -27,7 +27,7 @@
#include <KLocalizedString>
#include <QColorDialog>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "plugin_texteffect_debug.h"
#include "ui_texteffectprefs.h"
diff --git a/plugins/translator/translatorplugin.cpp b/plugins/translator/translatorplugin.cpp
index 04e8c47..df6ece9 100644
--- a/plugins/translator/translatorplugin.cpp
+++ b/plugins/translator/translatorplugin.cpp
@@ -29,7 +29,7 @@
#include <qmetaobject.h>
#include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kglobal.h>
#include <kconfig.h>
#include <kdeversion.h>
diff --git a/plugins/translator/translatorpreferences.cpp b/plugins/translator/translatorpreferences.cpp
index a152d45..fff0f8a 100644
--- a/plugins/translator/translatorpreferences.cpp
+++ b/plugins/translator/translatorpreferences.cpp
@@ -23,11 +23,12 @@
#include <qboxlayout.h>
#include <qwidget.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kopetepluginmanager.h>
#include "translatorplugin.h"
#include "translatorconfig.h"
+#include <KDebug>
#include "ui_translatorprefsbase.h"
K_PLUGIN_FACTORY(TranslatorPreferencesFactory, registerPlugin<TranslatorPreferences>();
diff --git a/plugins/urlpicpreview/urlpicpreviewplugin.cpp b/plugins/urlpicpreview/urlpicpreviewplugin.cpp
index 82ba7e3..bb9b0d1 100644
--- a/plugins/urlpicpreview/urlpicpreviewplugin.cpp
+++ b/plugins/urlpicpreview/urlpicpreviewplugin.cpp
@@ -26,7 +26,7 @@
#include <kimageio.h>
#include <ktemporaryfile.h>
#include <kapplication.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
// KIO
#include <kio/netaccess.h>
diff --git a/plugins/urlpicpreview/urlpicpreviewpreferences.cpp b/plugins/urlpicpreview/urlpicpreviewpreferences.cpp
index 291de1e..2a1d078 100644
--- a/plugins/urlpicpreview/urlpicpreviewpreferences.cpp
+++ b/plugins/urlpicpreview/urlpicpreviewpreferences.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <knuminput.h>
#include <kapplication.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
// Kopete
#include "urlpicpreviewconfig.h"
#include "ui_urlpicpreviewprefsbase.h"
diff --git a/plugins/webpresence/webpresenceplugin.cpp b/plugins/webpresence/webpresenceplugin.cpp
index d667d8c..cbe0ae1 100644
--- a/plugins/webpresence/webpresenceplugin.cpp
+++ b/plugins/webpresence/webpresenceplugin.cpp
@@ -29,7 +29,7 @@
#include <QtXml/QDomDocument>
#include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kio/job.h>
#include <kmessagebox.h>
#include <ktemporaryfile.h>
diff --git a/plugins/webpresence/webpresencepreferences.cpp b/plugins/webpresence/webpresencepreferences.cpp
index f3e5550..08e2c7b 100644
--- a/plugins/webpresence/webpresencepreferences.cpp
+++ b/plugins/webpresence/webpresencepreferences.cpp
@@ -17,7 +17,7 @@
#include "webpresencepreferences.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kurlrequester.h>
#include "ui_webpresenceprefs.h"
diff --git a/protocols/bonjour/bonjourprotocol.cpp b/protocols/bonjour/bonjourprotocol.cpp
index c8267f6..349f697 100644
--- a/protocols/bonjour/bonjourprotocol.cpp
+++ b/protocols/bonjour/bonjourprotocol.cpp
@@ -17,7 +17,7 @@
#include "bonjourprotocol.h"
#include <QList>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include <kopeteaccountmanager.h>
diff --git a/protocols/gadu/gaduprotocol.cpp b/protocols/gadu/gaduprotocol.cpp
index 6bc6fb8..0bec6a6 100644
--- a/protocols/gadu/gaduprotocol.cpp
+++ b/protocols/gadu/gaduprotocol.cpp
@@ -22,7 +22,7 @@
#include "gaduprotocol.h"
#include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kconfig.h>
#include <libgadu.h>
diff --git a/protocols/groupwise/gwprotocol.cpp b/protocols/groupwise/gwprotocol.cpp
index f143a1d..8251921 100644
--- a/protocols/groupwise/gwprotocol.cpp
+++ b/protocols/groupwise/gwprotocol.cpp
@@ -26,7 +26,7 @@
#include <QTextStream>
#include <QByteArray>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include "kopeteaccountmanager.h"
diff --git a/protocols/irc/ircprotocol.cpp b/protocols/irc/ircprotocol.cpp
index 037c047..57780a7 100644
--- a/protocols/irc/ircprotocol.cpp
+++ b/protocols/irc/ircprotocol.cpp
@@ -44,7 +44,7 @@
#include <QAction>
#include <kcharsets.h>
#include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kglobal.h>
#include <kinputdialog.h>
#include <kiconloader.h>
diff --git a/protocols/irc/ui/networkconfigwidget.cpp b/protocols/irc/ui/networkconfigwidget.cpp
index 77f60c8..779483f 100644
--- a/protocols/irc/ui/networkconfigwidget.cpp
+++ b/protocols/irc/ui/networkconfigwidget.cpp
@@ -35,7 +35,7 @@
#include <QAction>
#include <kcharsets.h>
#include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kglobal.h>
#include <kinputdialog.h>
#include <kiconloader.h>
diff --git a/protocols/jabber/jabberprotocol.cpp b/protocols/jabber/jabberprotocol.cpp
index b9bc354..8cf2d27 100644
--- a/protocols/jabber/jabberprotocol.cpp
+++ b/protocols/jabber/jabberprotocol.cpp
@@ -19,7 +19,7 @@
#include "jabberprotocol.h"
#include "jabber_protocol_debug.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kconfig.h>
#include <qmap.h>
diff --git a/protocols/meanwhile/meanwhileprotocol.cpp b/protocols/meanwhile/meanwhileprotocol.cpp
index c261ffd..dfd1e45 100644
--- a/protocols/meanwhile/meanwhileprotocol.cpp
+++ b/protocols/meanwhile/meanwhileprotocol.cpp
@@ -18,7 +18,7 @@
#include "meanwhileaddcontactpage.h"
#include "meanwhileeditaccountwidget.h"
#include "meanwhileaccount.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "kopeteaccountmanager.h"
#include "kopeteglobal.h"
#include "kopeteonlinestatusmanager.h"
diff --git a/protocols/oscar/aim/aimprotocol.cpp b/protocols/oscar/aim/aimprotocol.cpp
index 7b7bc7f..4f48dbb 100644
--- a/protocols/oscar/aim/aimprotocol.cpp
+++ b/protocols/oscar/aim/aimprotocol.cpp
@@ -17,7 +17,7 @@
#include "aimprotocol.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include "aimaccount.h"
#include "aimstatusmanager.h"
diff --git a/protocols/oscar/icq/icqprotocol.cpp b/protocols/oscar/icq/icqprotocol.cpp
index 7444b6c..4b8e350 100644
--- a/protocols/oscar/icq/icqprotocol.cpp
+++ b/protocols/oscar/icq/icqprotocol.cpp
@@ -21,7 +21,7 @@
#include <qcombobox.h>
#include <kdialog.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <KLocalizedString>
#include <kconfig.h>
#include <kmessagebox.h>
diff --git a/protocols/qq/qqprotocol.cpp b/protocols/qq/qqprotocol.cpp
index 036e37c..fba71ea 100644
--- a/protocols/qq/qqprotocol.cpp
+++ b/protocols/qq/qqprotocol.cpp
@@ -16,7 +16,7 @@
#include "qqprotocol.h"
#include <QList>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include "kopeteaccountmanager.h"
@@ -24,6 +24,7 @@
#include "qqcontact.h"
#include "qqaddcontactpage.h"
#include "ui/qqeditaccountwidget.h"
+#include <KLocalizedString>
K_PLUGIN_FACTORY( QQProtocolFactory, registerPlugin<QQProtocol>(); )
K_EXPORT_PLUGIN( QQProtocolFactory( "kopete_qq" ) )
diff --git a/protocols/skype/skypechatsession.cpp b/protocols/skype/skypechatsession.cpp
index 0daefa1..db93218 100644
--- a/protocols/skype/skypechatsession.cpp
+++ b/protocols/skype/skypechatsession.cpp
@@ -32,7 +32,7 @@
#include <kactionmenu.h>
#include <kactioncollection.h>
#include <klocale.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
static Kopete::MetaContact *dummyContacts = new Kopete::MetaContact();
diff --git a/protocols/skype/skypeprotocol.cpp b/protocols/skype/skypeprotocol.cpp
index cabd7f3..3db22b3 100644
--- a/protocols/skype/skypeprotocol.cpp
+++ b/protocols/skype/skypeprotocol.cpp
@@ -24,7 +24,7 @@
#include "skypecontact.h"
#include <kopeteonlinestatusmanager.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <qstring.h>
#include <qstringlist.h>
#include <kdebug.h>
diff --git a/protocols/sms/smsprotocol.cpp b/protocols/sms/smsprotocol.cpp
index 0e4f454..89a9e4d 100644
--- a/protocols/sms/smsprotocol.cpp
+++ b/protocols/sms/smsprotocol.cpp
@@ -16,7 +16,7 @@
#include "smsprotocol.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include <kconfig.h>
#include <kmessagebox.h>
diff --git a/protocols/testbed/testbedprotocol.cpp b/protocols/testbed/testbedprotocol.cpp
index b6bfe8a..7df2c6c 100644
--- a/protocols/testbed/testbedprotocol.cpp
+++ b/protocols/testbed/testbedprotocol.cpp
@@ -17,7 +17,7 @@
#include "testbedprotocol.h"
#include <QList>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <KLocalizedString>
#include <kdebug.h>
diff --git a/protocols/winpopup/wpprotocol.cpp b/protocols/winpopup/wpprotocol.cpp
index 49c8506..2a035e6 100644
--- a/protocols/winpopup/wpprotocol.cpp
+++ b/protocols/winpopup/wpprotocol.cpp
@@ -27,7 +27,7 @@
// KDE Includes
#include <kdebug.h>
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kmessagebox.h>
#include <kconfig.h>
#include <kstandarddirs.h>
diff --git a/protocols/wlm/wlmprotocol.cpp b/protocols/wlm/wlmprotocol.cpp
index e559e4f..6146ffd 100644
--- a/protocols/wlm/wlmprotocol.cpp
+++ b/protocols/wlm/wlmprotocol.cpp
@@ -20,7 +20,7 @@
#include "wlmaddcontactpage.h"
#include "wlmeditaccountwidget.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kdebug.h>
#include <KAboutData>
#include "kopeteaccountmanager.h"
diff --git a/protocols/yahoo/yahooprotocol.cpp b/protocols/yahoo/yahooprotocol.cpp
index 8864e50..6f2f6a8 100644
--- a/protocols/yahoo/yahooprotocol.cpp
+++ b/protocols/yahoo/yahooprotocol.cpp
@@ -22,7 +22,7 @@
/* KDE Includes */
#include "yahoo_protocol_debug.h"
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
#include <kconfig.h>
/* Local Includes */