[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=d0d5637

The following commit has been merged in the master branch:
commit d0d56377ca95513a4b6d41f44e141807eb8cfd29
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Jan 27 17:04:55 2012 +0100

    Replace switch with if check
    
    Suggested-by: Martin Klapetek <martin.klapetek at gmail.com>
---
 KTp/presence.cpp | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/KTp/presence.cpp b/KTp/presence.cpp
index 8c47018..35bc0dc 100644
--- a/KTp/presence.cpp
+++ b/KTp/presence.cpp
@@ -39,33 +39,21 @@ Presence::Presence(const Tp::Presence &presence) :
 
 KIcon Presence::icon(bool useImIcons) const
 {
-    switch (type()) {
-    case Tp::ConnectionPresenceTypeAvailable:
-    case Tp::ConnectionPresenceTypeBusy:
-    case Tp::ConnectionPresenceTypeAway:
-    case Tp::ConnectionPresenceTypeExtendedAway:
-    case Tp::ConnectionPresenceTypeHidden:
-    case Tp::ConnectionPresenceTypeOffline:
-        return KIcon(iconName(useImIcons));
-    default:
-        return KIcon();
+    const QString &name(iconName(useImIcons));
+    if (!name.isEmpty()) {
+        return KIcon(name);
     }
+    return KIcon();
 }
 KIcon Presence::icon(QStringList overlays, bool useImIcons) const
 {
-    switch (type()) {
-    case Tp::ConnectionPresenceTypeAvailable:
-    case Tp::ConnectionPresenceTypeBusy:
-    case Tp::ConnectionPresenceTypeAway:
-    case Tp::ConnectionPresenceTypeExtendedAway:
-    case Tp::ConnectionPresenceTypeHidden:
-    case Tp::ConnectionPresenceTypeOffline:
-        return KIcon(iconName(useImIcons),
+    const QString &name(iconName(useImIcons));
+    if (!name.isEmpty()) {
+        return KIcon(name,
                      KIconLoader::global(),
                      overlays);
-    default:
-        return KIcon();
     }
+    return KIcon();
 }
 
 QString Presence::iconName(bool useImIcons) const

-- 
ktp-common-internals packaging