[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=24f67c0

The following commit has been merged in the master branch:
commit 24f67c06b6f822816eadf69c09ceaced63c41274
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Nov 24 15:27:13 2013 +0100

    Replace Nepomuk URI role with PersonIdRole
---
 KTp/Models/kpeopletranslationproxy.cpp | 2 +-
 KTp/types.h                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 23e7783..f2ac91d 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -93,7 +93,7 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
 //             return sourceModel()->rowCount(mapToSource(proxyIndex));
         case KTp::ContactGroupsRole:
             return mapToSource(proxyIndex).data(PersonsModel::GroupsRole);
-        case KTp::NepomukUriRole:
+        case KTp::PersonIdRole:
             return mapToSource(proxyIndex).data(PersonsModel::PersonIdRole);
     }
 
diff --git a/KTp/types.h b/KTp/types.h
index f6ee442..291eb02 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -46,7 +46,7 @@ namespace KTp
         // general roles
         RowTypeRole = Qt::UserRole, //returns one of KTp::ContactRowType, KTp::PersonRowType, KTp::GroupRowType, KTp::AccountRowType
         IdRole, //returns Contact ID, Account UID, or group ID (group name or "_ungrouped")
-        NepomukUriRole, ///< url of the corresponding contact/person resource in Nepomuk FIXME FIXME FIXME
+        PersonIdRole, ///< id of the corresponding contact/person resource in kpeople
 
         //telepathy roles
         ContactRole = Qt::UserRole + 1000,  ///<return Tp::ContactPtr

-- 
ktp-common-internals packaging