[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=5efb87d

The following commit has been merged in the master branch:
commit 5efb87d57c71a8a4e9f46bbf64994d54b4fb3901
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Feb 20 00:06:33 2012 +0530

    KGenericFactory is deprecated, use KPluginFactory instead
---
 plugins/butterfly/butterfly-account-ui-plugin.cpp | 2 +-
 plugins/gabble/gabble-account-ui-plugin.cpp       | 2 +-
 plugins/haze/haze-account-ui-plugin.cpp           | 2 +-
 plugins/idle/idle-account-ui-plugin.cpp           | 2 +-
 plugins/rakia/rakia-account-ui-plugin.cpp         | 2 +-
 plugins/salut/salut-account-ui-plugin.cpp         | 2 +-
 plugins/sunshine/sunshine-account-ui-plugin.cpp   | 2 +-
 src/KCMTelepathyAccounts/plugin-macros.h          | 2 +-
 src/kcm-telepathy-accounts.cpp                    | 3 ++-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/butterfly/butterfly-account-ui-plugin.cpp b/plugins/butterfly/butterfly-account-ui-plugin.cpp
index 7e22266..25333e4 100644
--- a/plugins/butterfly/butterfly-account-ui-plugin.cpp
+++ b/plugins/butterfly/butterfly-account-ui-plugin.cpp
@@ -22,7 +22,7 @@
 
 #include "butterfly-account-ui.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 #include <QtCore/QVariantList>
 
diff --git a/plugins/gabble/gabble-account-ui-plugin.cpp b/plugins/gabble/gabble-account-ui-plugin.cpp
index b9566c1..aa810de 100644
--- a/plugins/gabble/gabble-account-ui-plugin.cpp
+++ b/plugins/gabble/gabble-account-ui-plugin.cpp
@@ -21,7 +21,7 @@
 #include "gabble-account-ui-plugin.h"
 #include "gabble-account-ui.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 #include <QtCore/QVariantList>
 
diff --git a/plugins/haze/haze-account-ui-plugin.cpp b/plugins/haze/haze-account-ui-plugin.cpp
index addfba2..8a4b241 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -27,7 +27,7 @@
 #include "haze-aim-account.h"
 #include "haze-msn-account.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 #include <QtCore/QVariantList>
 
diff --git a/plugins/idle/idle-account-ui-plugin.cpp b/plugins/idle/idle-account-ui-plugin.cpp
index 3bc3c8c..7cbad3c 100644
--- a/plugins/idle/idle-account-ui-plugin.cpp
+++ b/plugins/idle/idle-account-ui-plugin.cpp
@@ -22,7 +22,7 @@
 
 #include "idle-account-ui.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 #include <QtCore/QVariantList>
 
diff --git a/plugins/rakia/rakia-account-ui-plugin.cpp b/plugins/rakia/rakia-account-ui-plugin.cpp
index f29f494..4340661 100644
--- a/plugins/rakia/rakia-account-ui-plugin.cpp
+++ b/plugins/rakia/rakia-account-ui-plugin.cpp
@@ -21,7 +21,7 @@
 #include "rakia-account-ui-plugin.h"
 #include "rakia-account-ui.h"
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KDebug>
 
 #include <QtCore/QVariantList>
diff --git a/plugins/salut/salut-account-ui-plugin.cpp b/plugins/salut/salut-account-ui-plugin.cpp
index a6b7f38..79c969a 100644
--- a/plugins/salut/salut-account-ui-plugin.cpp
+++ b/plugins/salut/salut-account-ui-plugin.cpp
@@ -23,7 +23,7 @@
 
 #include <KCMTelepathyAccounts/PluginMacros>
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KDebug>
 
 #include <QtCore/QVariantList>
diff --git a/plugins/sunshine/sunshine-account-ui-plugin.cpp b/plugins/sunshine/sunshine-account-ui-plugin.cpp
index d1dfbb5..46f170c 100644
--- a/plugins/sunshine/sunshine-account-ui-plugin.cpp
+++ b/plugins/sunshine/sunshine-account-ui-plugin.cpp
@@ -23,7 +23,7 @@
 
 #include <KCMTelepathyAccounts/PluginMacros>
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 #include <QtCore/QVariantList>
 
diff --git a/src/KCMTelepathyAccounts/plugin-macros.h b/src/KCMTelepathyAccounts/plugin-macros.h
index 6c5d6e0..a258fc7 100644
--- a/src/KCMTelepathyAccounts/plugin-macros.h
+++ b/src/KCMTelepathyAccounts/plugin-macros.h
@@ -22,7 +22,7 @@
 #define LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MACROS_H
 
 #include <kdemacros.h>
-#include <KGenericFactory>
+#include <KPluginFactory>
 
 #define KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT(libname,classname) \
   K_PLUGIN_FACTORY(factory,registerPlugin<classname>();) \
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 2e98575..8e7ac24 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -34,13 +34,14 @@
 #include <QtGui/QLabel>
 #include <QtGui/QSortFilterProxyModel>
 
-#include <KGenericFactory>
+#include <KPluginFactory>
 #include <KIcon>
 #include <KLocale>
 #include <KMessageBox>
 #include <KAboutData>
 #include <KMessageWidget>
 #include <KPixmapSequenceOverlayPainter>
+#include <KDebug>
 
 #include <TelepathyQt/Account>
 #include <TelepathyQt/AccountFactory>

-- 
ktp-accounts-kcm packaging