[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=6223825

The following commit has been merged in the master branch:
commit 6223825f1b82af9ec6cb0e8a04c806401520e1fd
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Dec 20 11:52:53 2011 +0100

    Code readability
---
 src/contact-wrapper.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/contact-wrapper.cpp b/src/contact-wrapper.cpp
index 6b026e0..a2fe416 100644
--- a/src/contact-wrapper.cpp
+++ b/src/contact-wrapper.cpp
@@ -57,16 +57,14 @@ QString ContactWrapper::avatar() const
     if (m_contact) {
         if (!m_contact->avatarData().fileName.isEmpty()) {
             return m_contact->avatarData().fileName;
-        } else {
-            return QString("im-user");
         }
-    // check if temp avatar has been se
+    // check if temp avatar has been set
     } else if (!m_tempAvatar.isEmpty()) {
         return m_tempAvatar;
-    } else {
-        // return default icon
-        return QString("im-user");
     }
+
+    // return default icon
+    return QString("im-user");
 }
 
 bool ContactWrapper::canSendFile() const
@@ -129,14 +127,12 @@ void ContactWrapper::genericOperationFinished(Tp::PendingOperation* op)
 bool ContactWrapper::isAccountOnline() const
 {
     if (m_account) {
-        if (m_account->currentPresence().type() == Tp::Presence::offline().type()) {
-            return false;
-        } else {
+        if (m_account->currentPresence().type() != Tp::Presence::offline().type()) {
             return true;
         }
-    } else {
-        return false;
     }
+
+    return false;
 }
 
 void ContactWrapper::onConnectionChanged(const Tp::ConnectionPtr& newConn)
@@ -166,7 +162,7 @@ QString ContactWrapper::presenceStatus() const
     if (m_contact) {
         return m_contact->presence().status();
     } else {
-        return QString("");
+        return QString();
     }
 }
 

-- 
ktp-contact-applet packaging