[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=4920d53

The following commit has been merged in the master branch:
commit 4920d536aa93fafd5583579e7a618b90b989ac78
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Nov 19 00:07:55 2011 +0100

    Now that everything has been put into a namespace, rename KPresence to Presence for consistency
---
 global-presence.cpp              |  6 +++---
 models/accounts-filter-model.cpp |  4 ++--
 kpresence.cpp => presence.cpp    | 15 ++++++++-------
 kpresence.h => presence.h        | 14 +++++++-------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/global-presence.cpp b/global-presence.cpp
index 8bb392b..39dcc74 100644
--- a/global-presence.cpp
+++ b/global-presence.cpp
@@ -20,7 +20,7 @@
 
 #include "global-presence.h"
 
-#include "kpresence.h"
+#include "presence.h"
 
 #include <TelepathyQt4/AccountSet>
 #include <TelepathyQt4/Account>
@@ -94,7 +94,7 @@ void GlobalPresence::onCurrentPresenceChanged()
 {
     Tp::Presence highestCurrentPresence = Tp::Presence::offline();
     Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
-        if (KPresence::sortPriority(account->currentPresence().type()) < KPresence::sortPriority(highestCurrentPresence.type())) {
+        if (Presence::sortPriority(account->currentPresence().type()) < Presence::sortPriority(highestCurrentPresence.type())) {
             highestCurrentPresence = account->currentPresence();
         }
     }
@@ -114,7 +114,7 @@ void GlobalPresence::onRequestedPresenceChanged()
 {
     Tp::Presence highestRequestedPresence = Tp::Presence::offline();
     Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
-        if (KPresence::sortPriority(account->requestedPresence().type()) < KPresence::sortPriority(highestRequestedPresence.type())) {
+        if (Presence::sortPriority(account->requestedPresence().type()) < Presence::sortPriority(highestRequestedPresence.type())) {
             highestRequestedPresence = account->requestedPresence();
         }
     }
diff --git a/models/accounts-filter-model.cpp b/models/accounts-filter-model.cpp
index eaa0470..9ec30ee 100644
--- a/models/accounts-filter-model.cpp
+++ b/models/accounts-filter-model.cpp
@@ -27,7 +27,7 @@
 #include "contact-model-item.h"
 #include "accounts-model-item.h"
 
-#include <kpresence.h>
+#include <presence.h>
 
 #include <KDebug>
 
@@ -160,7 +160,7 @@ bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &r
                 return false;
             }
 
-            return KTelepathy::KPresence::sortPriority(leftPresence) < KTelepathy::KPresence::sortPriority(rightPresence);
+            return KTelepathy::Presence::sortPriority(leftPresence) < KTelepathy::Presence::sortPriority(rightPresence);
         }
     } else {
         return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
diff --git a/kpresence.cpp b/presence.cpp
similarity index 91%
rename from kpresence.cpp
rename to presence.cpp
index beb8c99..fefa714 100644
--- a/kpresence.cpp
+++ b/presence.cpp
@@ -18,23 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "kpresence.h"
+#include "presence.h"
+
 #include <KLocalizedString>
 
 namespace KTelepathy
 {
 
-KPresence::KPresence() :
+Presence::Presence() :
     Tp::Presence()
 {
 }
 
-KPresence::KPresence(const Tp::Presence &presence) :
+Presence::Presence(const Tp::Presence &presence) :
     Tp::Presence(presence)
 {
 }
 
-KIcon KPresence::icon() const
+KIcon Presence::icon() const
 {
     switch (type()) {
     case Tp::ConnectionPresenceTypeAvailable:
@@ -54,7 +55,7 @@ KIcon KPresence::icon() const
     }
 }
 
-bool KPresence::operator <(const KPresence &other) const
+bool Presence::operator <(const Presence &other) const
 {
     if (sortPriority(type()) < sortPriority(other.type())) {
         return true;
@@ -65,7 +66,7 @@ bool KPresence::operator <(const KPresence &other) const
     }
 }
 
-QString KPresence::displayString() const
+QString Presence::displayString() const
 {
     switch (type()) {
         case Tp::ConnectionPresenceTypeAvailable:
@@ -85,7 +86,7 @@ QString KPresence::displayString() const
     }
 }
 
-int KPresence::sortPriority(const Tp::ConnectionPresenceType &type)
+int Presence::sortPriority(const Tp::ConnectionPresenceType &type)
 {
     switch(type) {
         case Tp::ConnectionPresenceTypeAvailable:
diff --git a/kpresence.h b/presence.h
similarity index 85%
rename from kpresence.h
rename to presence.h
index 89f8a9d..d74e76d 100644
--- a/kpresence.h
+++ b/presence.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef KPRESENCE_H
-#define KPRESENCE_H
+#ifndef PRESENCE_H
+#define PRESENCE_H
 
 #include <TelepathyQt4/Presence>
 
@@ -30,15 +30,15 @@
 namespace KTelepathy
 {
 
-class KDE_EXPORT KPresence : public Tp::Presence
+class KDE_EXPORT Presence : public Tp::Presence
 {
 public:
-    KPresence();
-    KPresence(const Tp::Presence &presence);
+    Presence();
+    Presence(const Tp::Presence &presence);
     KIcon icon() const;
 
     /** Returns which presence is "more available" */
-    bool operator <(const KPresence &other) const;
+    bool operator <(const Presence &other) const;
 
     QString displayString() const;
 
@@ -48,4 +48,4 @@ public:
 
 }
 
-#endif // KPRESENCE_H
+#endif // PRESENCE_H

-- 
ktp-common-internals packaging