[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d8c4ce73832edf2a73c5de51343d042a8457170b
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov 25 01:58:53 2011 +0100

    Various code cleanups
---
 contact-request-handler.cpp | 12 +++++++-----
 contact-request-handler.h   | 13 ++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 4df0afe..9d4bb9d 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -1,6 +1,6 @@
 /*
-    <one line to give the library's name and an idea of what it does.>
-    Copyright (C) 2011  Martin Klapetek <email>
+    Copyright (C) 2011  Martin Klapetek <martin.klapetek at gmail.com>
+    Copyright (C) 2011  Dario Freddi <dario.freddi at collabora.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -25,13 +25,14 @@
 #include <TelepathyQt4/PendingOperation>
 #include <TelepathyQt4/Account>
 
+#include <QtCore/QFutureWatcher>
+
 #include <KDebug>
 #include <KGlobal>
 #include <KAboutData>
-
-#include <QFutureWatcher>
 #include <KMenu>
 #include <KAction>
+#include <KStatusNotifierItem>
 
 Q_DECLARE_METATYPE(Tp::ContactPtr)
 
@@ -102,7 +103,8 @@ void ContactRequestHandler::onContactManagerStateChanged(Tp::ContactListState st
     onContactManagerStateChanged(Tp::ContactManagerPtr(qobject_cast< Tp::ContactManager* >(sender())), state);
 }
 
-void ContactRequestHandler::onContactManagerStateChanged(const Tp::ContactManagerPtr &contactManager, Tp::ContactListState state)
+void ContactRequestHandler::onContactManagerStateChanged(const Tp::ContactManagerPtr &contactManager,
+                                                         Tp::ContactListState state)
 {
     if (state == Tp::ContactListStateSuccess) {
         QFutureWatcher< Tp::ContactPtr > *watcher = new QFutureWatcher< Tp::ContactPtr >(this);
diff --git a/contact-request-handler.h b/contact-request-handler.h
index d3eb97b..45a6ff5 100644
--- a/contact-request-handler.h
+++ b/contact-request-handler.h
@@ -1,6 +1,6 @@
 /*
-    <one line to give the library's name and an idea of what it does.>
-    Copyright (C) 2011  Martin Klapetek <email>
+    Copyright (C) 2011  Martin Klapetek <martin.klapetek at gmail.com>
+    Copyright (C) 2011  Dario Freddi <dario.freddi at collabora.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -21,16 +21,12 @@
 #ifndef CONTACT_REQUEST_HANDLER_H
 #define CONTACT_REQUEST_HANDLER_H
 
-#include <QObject>
-
 #include <TelepathyQt4/Types>
 #include <TelepathyQt4/AccountManager>
 
-#include <KStatusNotifierItem>
-#include <KNotification>
-
 class KMenu;
 class KAction;
+class KStatusNotifierItem;
 class ContactRequestHandler : public QObject
 {
     Q_OBJECT
@@ -40,7 +36,7 @@ public:
 
     void monitorPresence(const Tp::ConnectionPtr &connection);
 
-public Q_SLOTS:
+private Q_SLOTS:
     void onNewAccountAdded(const Tp::AccountPtr &account);
     void onContactManagerStateChanged(Tp::ContactListState state);
     void onContactManagerStateChanged(const Tp::ContactManagerPtr &contactManager, Tp::ContactListState state);
@@ -56,7 +52,6 @@ public Q_SLOTS:
     void onFinalizeSubscriptionFinished(Tp::PendingOperation*);
 
 private:
-    KStatusNotifierItem *notifierItem();
     void updateNotifierItemTooltip();
 
     QWeakPointer<KStatusNotifierItem> m_notifierItem;

-- 
ktp-kded-integration-module packaging