[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:06:21 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=df2037f
The following commit has been merged in the master branch:
commit df2037f551c85e671f2943d213a4a30271676001
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Feb 6 23:57:54 2013 +0000
Extend roleNames in ContactsListModel don't replace them
This allows Qt::Display Role to be exposed
---
KTp/Models/contacts-list-model.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index da742d7..dfa3287 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -42,7 +42,7 @@ KTp::ContactsListModel::ContactsListModel(QObject *parent) :
{
d->contactManager = 0;
- QHash<int, QByteArray> roles;
+ QHash<int, QByteArray> roles = roleNames();
roles[KTp::RowTypeRole]= "type";
roles[KTp::IdRole]= "id";
@@ -97,7 +97,7 @@ QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const
case KTp::RowTypeRole:
return KTp::ContactRowType;
case Qt::DisplayRole:
- return contact->alias();
+ return contact->alias();
case KTp::IdRole:
return contact->id();
@@ -112,7 +112,7 @@ QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const
return contact->avatarData().fileName;
case KTp::ContactGroupsRole:
return contact->groups();
-
+
case KTp::ContactPresenceNameRole:
return contact->presence().displayString();
case KTp::ContactPresenceMessageRole:
@@ -121,7 +121,7 @@ QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const
return contact->presence().type();
case KTp::ContactPresenceIconRole:
return contact->presence().iconName();
-
+
case KTp::ContactSubscriptionStateRole:
return contact->subscriptionState();
case KTp::ContactPublishStateRole:
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list