[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=f409e0e

The following commit has been merged in the master branch:
commit f409e0e4a58c1d19ba496658985145fc0b120958
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Thu Jan 27 19:49:30 2011 +0200

    Move the plugin factory declaration in a separate header.
    
    This is because we need to use TpKDEApproverFactory::componentData()
    in more than one places, and repeating the declaration in many source
    files isn't the best idea.
---
 src/textchannelapprover.cpp                         |  4 +---
 src/{channelapprover.cpp => tpkdeapproverfactory.h} | 18 ++++++------------
 src/tpkdeapprovermodule.cpp                         |  4 ++--
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/textchannelapprover.cpp b/src/textchannelapprover.cpp
index a30a763..e3077dc 100644
--- a/src/textchannelapprover.cpp
+++ b/src/textchannelapprover.cpp
@@ -16,19 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "textchannelapprover.h"
+#include "tpkdeapproverfactory.h"
 #include <KNotification>
 #include <KStatusNotifierItem>
 #include <KLocale>
 #include <KGlobal>
 #include <KDebug>
-#include <KPluginFactory>
 #include <TelepathyQt4/ReceivedMessage>
 #include <TelepathyQt4/AvatarData>
 #include <TelepathyQt4/ContactManager>
 #include <TelepathyQt4/PendingContacts>
 
-K_PLUGIN_FACTORY_DECLARATION(TpKDEApproverFactory)
-
 TextChannelApprover::TextChannelApprover(const Tp::TextChannelPtr & channel, QObject *parent)
     : ChannelApprover(parent), m_notifierItem(getNotifierItem())
 {
diff --git a/src/channelapprover.cpp b/src/tpkdeapproverfactory.h
similarity index 62%
copy from src/channelapprover.cpp
copy to src/tpkdeapproverfactory.h
index 917058e..d92a2c3 100644
--- a/src/channelapprover.cpp
+++ b/src/tpkdeapproverfactory.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010 Collabora Ltd. <info at collabora.co.uk>
+    Copyright (C) 2011 Collabora Ltd. <info at collabora.co.uk>
       @author George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
 
     This library is free software; you can redistribute it and/or modify
@@ -15,17 +15,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "channelapprover.h"
-#include "textchannelapprover.h"
+#ifndef TPKDEAPPROVERFACTORY_H
+#define TPKDEAPPROVERFACTORY_H
 
-ChannelApprover *ChannelApprover::create(const Tp::ChannelPtr & channel, QObject *parent)
-{
-    if (channel->channelType() == TP_QT4_IFACE_CHANNEL_TYPE_TEXT) {
-        return new TextChannelApprover(Tp::TextChannelPtr::dynamicCast(channel), parent);
-    }
+#include <KPluginFactory>
 
-    Q_ASSERT(false);
-    return NULL;
-}
+K_PLUGIN_FACTORY_DECLARATION(TpKDEApproverFactory)
 
-#include "channelapprover.moc"
+#endif //TPKDEAPPROVERFACTORY_H
diff --git a/src/tpkdeapprovermodule.cpp b/src/tpkdeapprovermodule.cpp
index 7df6f5c..5c95066 100644
--- a/src/tpkdeapprovermodule.cpp
+++ b/src/tpkdeapprovermodule.cpp
@@ -16,12 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "approverdaemon.h"
+#include "tpkdeapproverfactory.h"
 
 #include <KAboutData>
 #include <KLocale>
 #include <KComponentData>
 #include <KDEDModule>
-#include <KPluginFactory>
 
 #include <TelepathyQt4/Types>
 #include <TelepathyQt4/Debug>
@@ -78,5 +78,5 @@ private:
     Tp::ClientRegistrarPtr m_registrar;
 };
 
-K_PLUGIN_FACTORY(TpKDEApproverFactory, registerPlugin<TpKDEApproverModule>();)
+K_PLUGIN_FACTORY_DEFINITION(TpKDEApproverFactory, registerPlugin<TpKDEApproverModule>();)
 K_EXPORT_PLUGIN(TpKDEApproverFactory(TpKDEApproverModule::aboutData()))

-- 
ktp-approver packaging