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

The following commit has been merged in the master branch:
commit c2390d9c79d30ce61a39f8f85c99d643b354c7de
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Feb 1 11:26:23 2013 +0100

    Remove sorting modes
    
    AliasRole is the same as Qt::DisplayRole and NicknameRole is not used
    in the new models, so we're left with two modes - sorting by name
    and sorting by presence. Furthermore this can be done from the client
    code by using setSortRole().
    
    Reviewed-by: David Edmundson
---
 KTp/Models/contacts-filter-model.cpp | 46 ------------------------------------
 KTp/Models/contacts-filter-model.h   | 19 +--------------
 2 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/KTp/Models/contacts-filter-model.cpp b/KTp/Models/contacts-filter-model.cpp
index 145dcef..403efb2 100644
--- a/KTp/Models/contacts-filter-model.cpp
+++ b/KTp/Models/contacts-filter-model.cpp
@@ -550,52 +550,6 @@ void ContactsFilterModel::invalidateFilter()
     QSortFilterProxyModel::invalidateFilter();
 }
 
-ContactsFilterModel::SortMode ContactsFilterModel::sortMode() const
-{
-    switch (sortRole()) {
-    case Qt::DisplayRole:
-        return DoNotSort;
-    case ContactsModel::PresenceTypeRole:
-        return SortByPresence;
-    case ContactsModel::NicknameRole:
-        return SortByNickname;
-    case ContactsModel::AliasRole:
-        return SortByAlias;
-    default:
-        //This should never happen
-        Q_ASSERT(false);
-        return DoNotSort;
-    }
-}
-
-void ContactsFilterModel::resetSortMode()
-{
-    setSortMode(DoNotSort);
-}
-
-void ContactsFilterModel::setSortMode(SortMode sortMode)
-{
-    switch (sortMode) {
-    case DoNotSort:
-        setSortRole(Qt::DisplayRole);
-        break;
-    case SortByPresence:
-        setSortRole(ContactsModel::PresenceTypeRole);
-        break;
-    case SortByNickname:
-        setSortRole(ContactsModel::NicknameRole);
-        break;
-    case SortByAlias:
-        setSortRole(ContactsModel::AliasRole);
-        break;
-    default:
-        //This should never happen
-        Q_ASSERT(false);
-        return;
-    }
-    Q_EMIT sortModeChanged(sortMode);
-}
-
 ContactsFilterModel::PresenceTypeFilterFlags ContactsFilterModel::presenceTypeFilterFlags() const
 {
     return d->presenceTypeFilterFlags;
diff --git a/KTp/Models/contacts-filter-model.h b/KTp/Models/contacts-filter-model.h
index bce9e46..3fd34c5 100644
--- a/KTp/Models/contacts-filter-model.h
+++ b/KTp/Models/contacts-filter-model.h
@@ -38,8 +38,7 @@ class KTP_EXPORT ContactsFilterModel : public QSortFilterProxyModel
     Q_OBJECT
     Q_DISABLE_COPY(ContactsFilterModel)
 
-    Q_ENUMS(SortMode
-            PresenceFilterFlag
+    Q_ENUMS(PresenceFilterFlag
             CapabilityFilterFlag
             SubscriptionStateFilterFlag)
 
@@ -47,11 +46,6 @@ class KTP_EXPORT ContactsFilterModel : public QSortFilterProxyModel
             CapabilityFilterFlags
             SubscriptionStateFilterFlags)
 
-    Q_PROPERTY(SortMode sortMode
-               READ sortMode
-               WRITE setSortMode
-               NOTIFY sortModeChanged)
-
     Q_PROPERTY(PresenceTypeFilterFlags presenceTypeFilterFlags
                READ presenceTypeFilterFlags
                RESET clearPresenceTypeFilterFlags
@@ -135,12 +129,6 @@ class KTP_EXPORT ContactsFilterModel : public QSortFilterProxyModel
                NOTIFY idFilterMatchFlagsChanged)
 
 public:
-    enum SortMode {
-        DoNotSort = 0,
-        SortByPresence,
-        SortByNickname,
-        SortByAlias
-    };
 
     enum PresenceTypeFilterFlag {
         DoNotFilterByPresence                  = 0x0000,
@@ -207,11 +195,6 @@ public:
     virtual void setSourceModel(QAbstractItemModel *sourceModel);
     void invalidateFilter();
 
-    SortMode sortMode() const;
-    void resetSortMode();
-    Q_SLOT void setSortMode(SortMode sortMode);
-    Q_SIGNAL void sortModeChanged(SortMode sortMode);
-
     PresenceTypeFilterFlags presenceTypeFilterFlags() const;
     Q_SLOT void clearPresenceTypeFilterFlags();
     Q_SLOT void setPresenceTypeFilterFlags(PresenceTypeFilterFlags presenceTypeFilterFlags);

-- 
ktp-common-internals packaging