[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e09a170b5c71e82b7e91b062a54033723c9a73ea
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Dec 20 15:00:28 2011 +0100

    Move the DBusExporter class to .h as otherwise it breaks moc things and does not work
---
 presence/src/presence-applet.cpp | 19 ++-----------------
 presence/src/presence-applet.h   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 417a11a..2a1a5c1 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -36,23 +36,9 @@
 #include <TelepathyQt/PendingOperation>
 #include <TelepathyQt/PendingReady>
 
-//-----------------------------------------------------------------------------------------
-
-class DBusExporter : public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.Telepathy.PresenceApplet")
-
-public:
-    DBusExporter(QObject *parent = 0) : QDBusAbstractAdaptor(parent) {}
-    ~DBusExporter() {};
-};
-
-//-----------------------------------------------------------------------------------------
-
 TelepathyPresenceApplet::TelepathyPresenceApplet(QObject* parent, const QVariantList& args)
-    : Plasma::PopupApplet(parent, args)
-    , m_globalPresence(new KTp::GlobalPresence(this))
+    : Plasma::PopupApplet(parent, args),
+    m_globalPresence(new KTp::GlobalPresence(this))
 {
     setupContextMenuActions();
     setupAccountManager();
@@ -271,7 +257,6 @@ void TelepathyPresenceApplet::updateClickAction(TelepathyPresenceApplet::OnClick
 }
 
 #include "presenceapplet.moc"
-#include "moc_presenceapplet.cpp" //hack because we have two QObejcts in teh same file
 
 // This is the command that links your applet to the .desktop file
 K_EXPORT_PLASMA_APPLET(telepathy-kde-presence-applet, TelepathyPresenceApplet)
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index 1cc944d..ae9450d 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -87,4 +87,16 @@ private:
     DBusExporter         *m_dbusExporter;
 };
 
+//-----------------------------------------------------------------------------------------
+
+class DBusExporter : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.Telepathy.PresenceApplet")
+
+public:
+    DBusExporter(QObject *parent = 0) : QDBusAbstractAdaptor(parent) {}
+    ~DBusExporter() {};
+};
+
 #endif  // TELEPATHY_KDE_PRESENCE_APPLET_H

-- 
ktp-contact-applet packaging