[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=0464fee

The following commit has been merged in the master branch:
commit 0464feedccc31c1ee7548b9957ecb06d6da479b5
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Thu Nov 17 23:24:57 2011 +0100

    Port previous changes to AccountsFilterModel as well.
    
    Reviewed-By: David Edmundson <kde at davidedmundson.co.uk>
---
 models/accounts-filter-model.cpp | 22 +++++++---------------
 models/accounts-filter-model.h   |  3 ---
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/models/accounts-filter-model.cpp b/models/accounts-filter-model.cpp
index a830d06..0665800 100644
--- a/models/accounts-filter-model.cpp
+++ b/models/accounts-filter-model.cpp
@@ -27,6 +27,8 @@
 #include "contact-model-item.h"
 #include "accounts-model-item.h"
 
+#include <common/kpresence.h>
+
 #include <KDebug>
 
 AccountsFilterModel::AccountsFilterModel(QObject *parent)
@@ -34,16 +36,6 @@ AccountsFilterModel::AccountsFilterModel(QObject *parent)
       m_showOfflineUsers(false),
       m_filterByName(false)
 {
-    m_presenceSorting[Tp::ConnectionPresenceTypeAvailable] = 0;
-    m_presenceSorting[Tp::ConnectionPresenceTypeBusy] = 1;
-    m_presenceSorting[Tp::ConnectionPresenceTypeHidden] = 2;
-    m_presenceSorting[Tp::ConnectionPresenceTypeAway] = 3;
-    m_presenceSorting[Tp::ConnectionPresenceTypeExtendedAway] = 4;
-    //don't distinguish between the following three presences
-    m_presenceSorting[Tp::ConnectionPresenceTypeError] = 5;
-    m_presenceSorting[Tp::ConnectionPresenceTypeUnknown] = 5;
-    m_presenceSorting[Tp::ConnectionPresenceTypeUnset] = 5;
-    m_presenceSorting[Tp::ConnectionPresenceTypeOffline] = 6;
 }
 
 void AccountsFilterModel::setShowOfflineUsers(bool showOfflineUsers)
@@ -145,15 +137,15 @@ void AccountsFilterModel::clearFilterString()
 
 bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
-    uint leftPresence;
-    uint rightPresence;
+    Tp::ConnectionPresenceType leftPresence;
+    Tp::ConnectionPresenceType rightPresence;
 
     QString leftDisplayedName = sourceModel()->data(left).toString();
     QString rightDisplayedName = sourceModel()->data(right).toString();
 
     if (sortRole() == AccountsModel::PresenceTypeRole) {
-        leftPresence = sourceModel()->data(left, AccountsModel::PresenceTypeRole).toUInt();
-        rightPresence = sourceModel()->data(right, AccountsModel::PresenceTypeRole).toUInt();
+        leftPresence = (Tp::ConnectionPresenceType)sourceModel()->data(left, AccountsModel::PresenceTypeRole).toUInt();
+        rightPresence = (Tp::ConnectionPresenceType)sourceModel()->data(right, AccountsModel::PresenceTypeRole).toUInt();
 
         if (leftPresence == rightPresence) {
             return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
@@ -168,7 +160,7 @@ bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &r
                 return false;
             }
 
-            return m_presenceSorting[leftPresence] < m_presenceSorting[rightPresence];
+            return KPresence::sortPriority(leftPresence) < KPresence::sortPriority(rightPresence);
         }
     } else {
         return QString::localeAwareCompare(leftDisplayedName, rightDisplayedName) < 0;
diff --git a/models/accounts-filter-model.h b/models/accounts-filter-model.h
index 1796f51..8b55abb 100644
--- a/models/accounts-filter-model.h
+++ b/models/accounts-filter-model.h
@@ -83,9 +83,6 @@ private:
 
     /// Holds the string which is searched in the model
     QString m_filterString;
-
-    /// Sets the sorting order of presences
-    QHash<uint, int> m_presenceSorting;
 };
 
 #endif // ACCOUNTFILTERMODEL_H

-- 
ktp-common-internals packaging