[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=537ac46

The following commit has been merged in the master branch:
commit 537ac469fcad33448e3ea179dfab89d0430d3e1c
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Tue Feb 22 01:39:01 2011 +0100

    Cleanup K_PLUGIN_FACTORY and K_EXPORT_PLUGIN usage.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 butterfly/butterfly-account-ui-plugin.cpp | 10 ++--------
 gabble/gabble-account-ui-plugin.cpp       |  8 ++------
 haze/haze-account-ui-plugin.cpp           |  9 ++-------
 idle/idle-account-ui-plugin.cpp           | 10 ++--------
 rakia/rakia-account-ui-plugin.cpp         |  5 +----
 5 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/butterfly/butterfly-account-ui-plugin.cpp b/butterfly/butterfly-account-ui-plugin.cpp
index 05fa40b..ba40ce3 100644
--- a/butterfly/butterfly-account-ui-plugin.cpp
+++ b/butterfly/butterfly-account-ui-plugin.cpp
@@ -22,8 +22,6 @@
 
 #include "butterfly-account-ui.h"
 
-#include <KCMTelepathyAccounts/PluginMacros>
-
 #include <KDebug>
 #include <KGenericFactory>
 
@@ -57,11 +55,7 @@ AbstractAccountUi* ButterflyAccountUiPlugin::accountUi(const QString &connection
     return 0;
 }
 
-
-//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("butterfly", "ButterflyAccountUiPlugin")
-  K_PLUGIN_FACTORY(factory, registerPlugin<ButterflyAccountUiPlugin>();) \
-  K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_butterfly"))
-
+K_PLUGIN_FACTORY(factory, registerPlugin<ButterflyAccountUiPlugin>();)
+K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_butterfly"))
 
 #include "butterfly-account-ui-plugin.moc"
-
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index 62f2e8a..12b58e5 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -57,11 +57,7 @@ AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionMan
     return 0;
 }
 
-
-//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("gabble", "GabbleAccountUiPlugin")
-  K_PLUGIN_FACTORY(factory, registerPlugin<GabbleAccountUiPlugin>();) \
-  K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_gabble"))
-
+K_PLUGIN_FACTORY(factory, registerPlugin<GabbleAccountUiPlugin>();)
+K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_gabble"))
 
 #include "gabble-account-ui-plugin.moc"
-
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 415ebaa..47551fe 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -23,8 +23,6 @@
 #include "haze-icq-account.h"
 #include "haze-yahoo-account.h"
 
-#include <KCMTelepathyAccounts/PluginMacros>
-
 #include <KDebug>
 #include <KGenericFactory>
 
@@ -63,10 +61,7 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
 }
 
 
-//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("haze", "HazeAccountUiPlugin")
-  K_PLUGIN_FACTORY(factory, registerPlugin<HazeAccountUiPlugin>();) \
-  K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_haze"))
-
+K_PLUGIN_FACTORY(factory, registerPlugin<HazeAccountUiPlugin>();) \
+K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_haze"))
 
 #include "haze-account-ui-plugin.moc"
-
diff --git a/idle/idle-account-ui-plugin.cpp b/idle/idle-account-ui-plugin.cpp
index 10de160..c3ff4a1 100644
--- a/idle/idle-account-ui-plugin.cpp
+++ b/idle/idle-account-ui-plugin.cpp
@@ -22,8 +22,6 @@
 
 #include "idle-account-ui.h"
 
-#include <KCMTelepathyAccounts/PluginMacros>
-
 #include <KDebug>
 #include <KGenericFactory>
 
@@ -56,11 +54,7 @@ AbstractAccountUi* IdleAccountUiPlugin::accountUi(const QString &connectionManag
     return 0;
 }
 
-
-//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("idle", "IdleAccountUiPlugin")
-  K_PLUGIN_FACTORY(factory, registerPlugin<IdleAccountUiPlugin>();) \
-  K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_idle"))
-
+K_PLUGIN_FACTORY(factory, registerPlugin<IdleAccountUiPlugin>();)
+K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_idle"))
 
 #include "idle-account-ui-plugin.moc"
-
diff --git a/rakia/rakia-account-ui-plugin.cpp b/rakia/rakia-account-ui-plugin.cpp
index e466a8d..f61bb4c 100644
--- a/rakia/rakia-account-ui-plugin.cpp
+++ b/rakia/rakia-account-ui-plugin.cpp
@@ -21,8 +21,6 @@
 #include "rakia-account-ui-plugin.h"
 #include "rakia-account-ui.h"
 
-#include <KCMTelepathyAccounts/PluginMacros>
-
 #include <KDebug>
 #include <KGenericFactory>
 
@@ -63,8 +61,7 @@ AbstractAccountUi* RakiaAccountUiPlugin::accountUi(const QString &connectionMana
     return 0;
 }
 
-K_PLUGIN_FACTORY(factory, registerPlugin<RakiaAccountUiPlugin>();)\
+K_PLUGIN_FACTORY(factory, registerPlugin<RakiaAccountUiPlugin>();)
 K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_rakia"))
 
-
 #include "rakia-account-ui-plugin.moc"

-- 
ktp-accounts-kcm packaging