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

The following commit has been merged in the master branch:
commit 7f180571966fce23d57701749cef5ed5c13b2967
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Jan 27 13:40:14 2012 +0100

    Add method icon without overlays
---
 KTp/presence.cpp | 14 ++++++++++++++
 KTp/presence.h   |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/KTp/presence.cpp b/KTp/presence.cpp
index f2663d9..a3f9dbb 100644
--- a/KTp/presence.cpp
+++ b/KTp/presence.cpp
@@ -36,6 +36,20 @@ 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(iconString(useImIcons));
+    default:
+        return KIcon();
+    }
+}
 KIcon Presence::icon(QStringList overlays, bool useImIcons) const
 {
     switch (type()) {
diff --git a/KTp/presence.h b/KTp/presence.h
index 343a92a..6e60d78 100644
--- a/KTp/presence.h
+++ b/KTp/presence.h
@@ -35,7 +35,8 @@ class KTP_EXPORT Presence : public Tp::Presence
 public:
     Presence();
     Presence(const Tp::Presence &presence);
-    KIcon icon(QStringList overlays = QStringList(), bool useImIcons = false) const;
+    KIcon icon(bool useImIcons = false) const;
+    KIcon icon(QStringList overlays, bool useImIcons = false) const;
     QString iconString(bool useImIcons = false) const;
 
     /** Returns which presence is "more available" */

-- 
ktp-common-internals packaging