[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=874d4fe

The following commit has been merged in the master branch:
commit 874d4fe074fc8577c1272c56edd17f8121e2dd96
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Thu Jan 27 15:06:59 2011 +0200

    Make ApproverDaemon a proper QObject.
---
 src/approverdaemon.cpp | 6 ++++--
 src/approverdaemon.h   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/approverdaemon.cpp b/src/approverdaemon.cpp
index 3068145..13bcfb2 100644
--- a/src/approverdaemon.cpp
+++ b/src/approverdaemon.cpp
@@ -35,8 +35,8 @@ static inline Tp::ChannelClassSpecList channelClassSpecList()
                 ;
 }
 
-ApproverDaemon::ApproverDaemon()
-    : QObject(), AbstractClientApprover(channelClassSpecList())
+ApproverDaemon::ApproverDaemon(QObject *parent)
+    : QObject(parent), AbstractClientApprover(channelClassSpecList())
 {
 }
 
@@ -46,3 +46,5 @@ void ApproverDaemon::addDispatchOperation(const Tp::MethodInvocationContextPtr<>
     new DispatchOperation(dispatchOperation, this);
     context->setFinished();
 }
+
+#include "approverdaemon.moc"
diff --git a/src/approverdaemon.h b/src/approverdaemon.h
index 2cee00e..03bc787 100644
--- a/src/approverdaemon.h
+++ b/src/approverdaemon.h
@@ -22,8 +22,9 @@
 
 class ApproverDaemon : public QObject, public Tp::AbstractClientApprover
 {
+    Q_OBJECT
 public:
-    ApproverDaemon();
+    ApproverDaemon(QObject *parent = 0);
 
 protected:
     virtual void addDispatchOperation(const Tp::MethodInvocationContextPtr<> & context,

-- 
ktp-approver packaging