[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=1b7c657

The following commit has been merged in the master branch:
commit 1b7c657d33f727a6dfd1d70ee206278ea416b54a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Dec 19 16:52:56 2011 +0100

    Remove useless bool vars from loops, improves code readibility. Also replace qDebug with kDebug
---
 src/contact-wrapper.cpp   | 16 ++++++++--------
 src/telepathy-contact.cpp |  6 ++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/contact-wrapper.cpp b/src/contact-wrapper.cpp
index 0068efa..6b026e0 100644
--- a/src/contact-wrapper.cpp
+++ b/src/contact-wrapper.cpp
@@ -21,6 +21,7 @@
 
 #include <KToolInvocation>
 #include <KUrl>
+#include <KDebug>
 
 #include <TelepathyQt/AvatarData>
 #include <TelepathyQt/ContactCapabilities>
@@ -150,12 +151,11 @@ void ContactWrapper::onContactManagerStateChanged(Tp::ContactListState newState)
 {
     if (newState == Tp::ContactListStateSuccess) {
         QList<Tp::ContactPtr> contactList = m_account->connection()->contactManager()->allKnownContacts().toList();
-        bool match = false;
 
-        for (int i = 0; i < contactList.count() && !match; ++i) {
+        for (int i = 0; i < contactList.count(); ++i) {
             if (contactList.at(i)->id() == m_tempContactId) {
-                match = true;
                 setContact(contactList.at(i));
+                break;
             }
         }
     }
@@ -194,12 +194,12 @@ void ContactWrapper::sendMail()
 
 void ContactWrapper::startAudioCall()
 {
-    qDebug("ContactWrapper::startAudioCall");
+    kDebug();
 }
 
 void ContactWrapper::startFileTransfer()
 {
-    qDebug("ContactWrapper::startFileTransfer");
+    kDebug();
 }
 
 void ContactWrapper::startTextChat()
@@ -216,12 +216,12 @@ void ContactWrapper::startTextChat()
 
 void ContactWrapper::startVideoCall()
 {
-    qDebug("ContactWrapper::startVideoCall");
+    kDebug();
 }
 
 void ContactWrapper::setAccount(const Tp::AccountPtr& relatedAccount)
 {
-    qDebug() << "setting account to: " << relatedAccount->displayName();
+    kDebug() << "setting account to: " << relatedAccount->displayName();
     undoAccountConnects();
     m_account = relatedAccount;
     setupAccountConnects();
@@ -229,7 +229,7 @@ void ContactWrapper::setAccount(const Tp::AccountPtr& relatedAccount)
 
 void ContactWrapper::setContact(const Tp::ContactPtr& newContact)
 {
-    qDebug() << "setting new contact to: " << newContact->id();
+    kDebug() << "setting new contact to: " << newContact->id();
 
     // disconnect signals
     undoContactConnects();
diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index fa56a7c..1f54719 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -74,7 +74,7 @@ void TelepathyContact::init()
 
     if (m_declarative) {
         QString qmlFile = KGlobal::dirs()->findResource("data", "plasma/plasmoids/org.kde.telepathy-contact/contents/ui/main.qml");
-        qDebug() << "LOADING: " << qmlFile;
+        kDebug() << "LOADING: " << qmlFile;
         m_declarative->setQmlPath(qmlFile);
         m_declarative->engine()->rootContext()->setContextProperty("TelepathyContact", m_contact);
 
@@ -126,12 +126,10 @@ void TelepathyContact::loadConfig()
 
         if (account->connection()) {
             QList<Tp::ContactPtr> contactList = account->connection()->contactManager()->allKnownContacts().toList();
-            bool match = false;
 
-            for (int i = 0; i < contactList.count() && !match; ++i) {
+            for (int i = 0; i < contactList.count(); ++i) {
                 if (contactList.at(i)->id() == contactId) {
                     contact = contactList.at(i);
-                    match = true;
                     m_contact->setContact(contact);
                     m_contact->setAccount(account);
                 }

-- 
ktp-contact-applet packaging