[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=6466b57

The following commit has been merged in the master branch:
commit 6466b578f26eaf9ab69a89b20795385692c9b909
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Oct 2 22:07:27 2012 +0100

    Add 3 new roles Type, Account and Contact
---
 KTp/Models/accounts-model-item.cpp |  4 ++++
 KTp/Models/contact-model-item.cpp  |  6 ++++++
 KTp/Models/contacts-model.h        | 16 ++++++++++++++++
 KTp/Models/groups-model-item.cpp   |  2 ++
 4 files changed, 28 insertions(+)

diff --git a/KTp/Models/accounts-model-item.cpp b/KTp/Models/accounts-model-item.cpp
index b29dee6..bdd7500 100644
--- a/KTp/Models/accounts-model-item.cpp
+++ b/KTp/Models/accounts-model-item.cpp
@@ -143,6 +143,10 @@ QVariant AccountsModelItem::data(int role) const
         return QVariant::fromValue((AccountsModelItem*)this);
     case ContactsModel::IdRole:
         return mPriv->mAccount->uniqueIdentifier();
+    case ContactsModel::TypeRole:
+        return ContactsModel::ContactRowType;
+    case ContactsModel::AccountRole:
+        return QVariant::fromValue(mPriv->mAccount);
     case ContactsModel::AvatarRole:
         return QVariant::fromValue(mPriv->mAccount->avatar());
     case ContactsModel::ValidRole:
diff --git a/KTp/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
index b582dd4..57b37dd 100644
--- a/KTp/Models/contact-model-item.cpp
+++ b/KTp/Models/contact-model-item.cpp
@@ -109,6 +109,12 @@ QVariant ContactModelItem::data(int role) const
         return QVariant::fromValue((ContactModelItem*)this);
     case ContactsModel::IdRole:
         return mPriv->mContact->id();
+    case ContactsModel::TypeRole:
+        return ContactsModel::ContactRowType;
+    case ContactsModel::ContactRole:
+        return QVariant::fromValue(mPriv->mContact);
+    case ContactsModel::AccountRole:
+        return parent()->data(ContactsModel::AccountRole);
     case Qt::DisplayRole:
     case ContactsModel::AliasRole:
         return mPriv->mContact->alias();
diff --git a/KTp/Models/contacts-model.h b/KTp/Models/contacts-model.h
index 56445df..e4697e8 100644
--- a/KTp/Models/contacts-model.h
+++ b/KTp/Models/contacts-model.h
@@ -41,13 +41,26 @@ class KTP_EXPORT ContactsModel : public QAbstractItemModel
     Q_DISABLE_COPY(ContactsModel)
     Q_PROPERTY(int accountCount READ accountCount NOTIFY accountCountChanged)
     Q_ENUMS(Role)
+    Q_ENUMS(RowType)
 
 public:
+
+    enum RowType {
+        ContactRowType,
+        AccountRowType,
+        GroupRowType,
+        UserRowType
+    };
+
     enum Role {
         // general roles
         ItemRole = Qt::UserRole,
         AvatarRole,
         IdRole,
+        TypeRole,
+
+        AccountRole,
+        ContactRole,
 
         // account roles
         ValidRole,
@@ -139,4 +152,7 @@ private:
     Private *mPriv;
 };
 
+Q_DECLARE_METATYPE(Tp::ContactPtr);
+Q_DECLARE_METATYPE(Tp::AccountPtr);
+
 #endif // TELEPATHY_ACCOUNTS_MODEL_H
diff --git a/KTp/Models/groups-model-item.cpp b/KTp/Models/groups-model-item.cpp
index 0b7d1e8..191e59b 100644
--- a/KTp/Models/groups-model-item.cpp
+++ b/KTp/Models/groups-model-item.cpp
@@ -74,6 +74,8 @@ QVariant GroupsModelItem::data(int role) const
         } else {
             return mPriv->mGroupName;
         }
+    case ContactsModel::TypeRole:
+        return ContactsModel::GroupRowType;
     case ContactsModel::ItemRole:
         return QVariant::fromValue((GroupsModelItem*)this);
     case ContactsModel::IdRole:

-- 
ktp-common-internals packaging