[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=2cc1291

The following commit has been merged in the master branch:
commit 2cc12914552b6a2ca3e1ef9b4b36db8d630f695c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Jan 27 14:23:48 2012 +0100

    Rename iconString to iconName
---
 KTp/presence.cpp | 6 +++---
 KTp/presence.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/KTp/presence.cpp b/KTp/presence.cpp
index 59c3334..8c47018 100644
--- a/KTp/presence.cpp
+++ b/KTp/presence.cpp
@@ -46,7 +46,7 @@ KIcon Presence::icon(bool useImIcons) const
     case Tp::ConnectionPresenceTypeExtendedAway:
     case Tp::ConnectionPresenceTypeHidden:
     case Tp::ConnectionPresenceTypeOffline:
-        return KIcon(iconString(useImIcons));
+        return KIcon(iconName(useImIcons));
     default:
         return KIcon();
     }
@@ -60,7 +60,7 @@ KIcon Presence::icon(QStringList overlays, bool useImIcons) const
     case Tp::ConnectionPresenceTypeExtendedAway:
     case Tp::ConnectionPresenceTypeHidden:
     case Tp::ConnectionPresenceTypeOffline:
-        return KIcon(iconString(useImIcons),
+        return KIcon(iconName(useImIcons),
                      KIconLoader::global(),
                      overlays);
     default:
@@ -68,7 +68,7 @@ KIcon Presence::icon(QStringList overlays, bool useImIcons) const
     }
 }
 
-QString Presence::iconString(bool useImIcons) const
+QString Presence::iconName(bool useImIcons) const
 {
     switch (type()) {
     case Tp::ConnectionPresenceTypeAvailable:
diff --git a/KTp/presence.h b/KTp/presence.h
index 4045a6b..d88ed07 100644
--- a/KTp/presence.h
+++ b/KTp/presence.h
@@ -38,7 +38,7 @@ public:
     Presence(const Tp::Presence &presence);
     KIcon icon(bool useImIcons = false) const;
     KIcon icon(QStringList overlays, bool useImIcons = false) const;
-    QString iconString(bool useImIcons = false) const;
+    QString iconName(bool useImIcons = false) const;
 
     /** Returns which presence is "more available" */
     bool operator <(const Presence &other) const;

-- 
ktp-common-internals packaging