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

The following commit has been merged in the master branch:
commit 2fea53cfe23aea299c8dab4ab45fc0def51907bc
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 30 22:54:12 2012 +0100

    In groups model split group name and display name.
    
    This sets the name of ungrouped to "" for the group name role. Display name renames unchanged
    
    Reviewed-by: Martin Klapetek
---
 CMakeLists.txt                   |  2 +-
 KTp/Models/groups-model-item.cpp |  8 ++++++++
 KTp/Models/groups-model.cpp      | 11 ++++-------
 KTp/Models/groups-model.h        |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8bf6b3..28cf3f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set (CMAKE_MODULE_PATH
 
 set (KTP_VERSION "0.3.60")
 # Bump for every 0.x release, or whenever BC changes
-set (KTP_SONUMBER 0)
+set (KTP_SONUMBER 1)
 
 find_package (KDE4 REQUIRED)
 find_package (TelepathyQt4 0.9.0 REQUIRED)
diff --git a/KTp/Models/groups-model-item.cpp b/KTp/Models/groups-model-item.cpp
index 9e8f07a..00dbede 100644
--- a/KTp/Models/groups-model-item.cpp
+++ b/KTp/Models/groups-model-item.cpp
@@ -25,6 +25,8 @@
 #include <TelepathyQt/Account>
 #include <TelepathyQt/ContactManager>
 
+#include <KLocalizedString>
+
 #include "groups-model.h"
 #include "accounts-model.h"
 #include "proxy-tree-node.h"
@@ -68,6 +70,12 @@ GroupsModelItem::~GroupsModelItem()
 QVariant GroupsModelItem::data(int role) const
 {
     switch (role) {
+    case Qt::DisplayRole:
+        if (mPriv->mGroupName.isEmpty()) {
+            return i18n("Ungrouped");
+        } else {
+            return mPriv->mGroupName;
+        }
     case AccountsModel::ItemRole:
         return QVariant::fromValue((GroupsModelItem*)this);
     case AccountsModel::IdRole:
diff --git a/KTp/Models/groups-model.cpp b/KTp/Models/groups-model.cpp
index bbd5755..6e295ab 100644
--- a/KTp/Models/groups-model.cpp
+++ b/KTp/Models/groups-model.cpp
@@ -43,16 +43,13 @@ struct GroupsModel::Private
         : mAM(am)
     {
         KGlobal::locale()->insertCatalog(QLatin1String("ktp-common-internals"));
-        m_ungroupedString = i18n("Ungrouped");
+
     }
 
     TreeNode *node(const QModelIndex &index) const;
 
     AccountsModel *mAM;
     TreeNode *mTree;
-
-    ///translated string for 'Ungrouped'
-    QString m_ungroupedString;
 };
 
 TreeNode *GroupsModel::Private::node(const QModelIndex &index) const
@@ -313,7 +310,7 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
     bool checkUngrouped = false;
     //if the contact has no groups, create an 'Ungrouped' group for it
     if (groups.isEmpty()) {
-        groups.append(mPriv->m_ungroupedString);
+        groups.append(QString());
     } else {
         checkUngrouped = true;
     }
@@ -336,11 +333,11 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
                 }
             }
             if (checkUngrouped) {
-                if (savedGroupItem->groupName() == mPriv->m_ungroupedString) {
+                if (savedGroupItem->groupName().isEmpty()) {
                     for (int i = 0; i < savedGroupItem->size(); i++) {
                         ProxyTreeNode *tmpNode = qobject_cast<ProxyTreeNode*>(savedGroupItem->childAt(i));
                         if (tmpNode->data(AccountsModel::ItemRole).value<ContactModelItem*>()->contact()->id() == contactItem->contact()->id()) {
-                            removeContactFromGroup(tmpNode, mPriv->m_ungroupedString);
+                            removeContactFromGroup(tmpNode, QString());
                             if (groupExists) {
                                 break;
                             }
diff --git a/KTp/Models/groups-model.h b/KTp/Models/groups-model.h
index c80dce8..00e6f1a 100644
--- a/KTp/Models/groups-model.h
+++ b/KTp/Models/groups-model.h
@@ -48,7 +48,7 @@ class KTP_EXPORT GroupsModel : public QAbstractItemModel
 public:
     enum Role {
         // general roles
-        GroupNameRole = Qt::DisplayRole
+        GroupNameRole = Qt::UserRole + 1000
     };
 
     explicit GroupsModel(AccountsModel* am, QObject* parent = 0);

-- 
ktp-common-internals packaging