[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=86706f6

The following commit has been merged in the master branch:
commit 86706f62dcf5123e8d99ab32b95c6cb7dd5f0e2c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Mar 5 15:56:16 2012 +0100

    Return KTp::Presence from {Current,Automatic,Requested}PresenceRole
    
    Add {Current,Automatic,Requested}PresenceStatusRole to replace the
    previous version of {Current,Automatic,Requested}PresenceRole.
    
    Also rename role strings to match the role names
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 104160
---
 KTp/Models/accounts-model-item.cpp | 16 +++++++++++++---
 KTp/Models/accounts-model.cpp      | 21 ++++++++++++---------
 KTp/Models/accounts-model.h        |  3 +++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/KTp/Models/accounts-model-item.cpp b/KTp/Models/accounts-model-item.cpp
index feef5d9..1d65af3 100644
--- a/KTp/Models/accounts-model-item.cpp
+++ b/KTp/Models/accounts-model-item.cpp
@@ -29,6 +29,7 @@
 #include "contact-model-item.h"
 
 #include <KIcon>
+#include <KTp/presence.h>
 
 struct AccountsModelItem::Private
 {
@@ -76,6 +77,9 @@ AccountsModelItem::AccountsModelItem(const Tp::AccountPtr &account)
             SIGNAL(profileChanged(Tp::ProfilePtr)),
             SLOT(onChanged()));
     connect(mPriv->mAccount.data(),
+            SIGNAL(displayNameChanged(QString)),
+            SLOT(onChanged()));
+    connect(mPriv->mAccount.data(),
             SIGNAL(iconNameChanged(QString)),
             SLOT(onChanged()));
     connect(mPriv->mAccount.data(),
@@ -164,21 +168,27 @@ QVariant AccountsModelItem::data(int role) const
     case AccountsModel::ChangingPresenceRole:
         return mPriv->mAccount->isChangingPresence();
     case AccountsModel::AutomaticPresenceRole:
-        return mPriv->mAccount->automaticPresence().status();
+        return QVariant::fromValue(KTp::Presence(mPriv->mAccount->automaticPresence()));
     case AccountsModel::AutomaticPresenceTypeRole:
         return mPriv->mAccount->automaticPresence().type();
+    case AccountsModel::AutomaticPresenceStatusRole:
+        return mPriv->mAccount->automaticPresence().status();
     case AccountsModel::AutomaticPresenceStatusMessageRole:
         return mPriv->mAccount->automaticPresence().statusMessage();
     case AccountsModel::CurrentPresenceRole:
-        return mPriv->mAccount->currentPresence().status();
+        return QVariant::fromValue(KTp::Presence(mPriv->mAccount->currentPresence()));
     case AccountsModel::CurrentPresenceTypeRole:
         return mPriv->mAccount->currentPresence().type();
+    case AccountsModel::CurrentPresenceStatusRole:
+        return mPriv->mAccount->currentPresence().status();
     case AccountsModel::CurrentPresenceStatusMessageRole:
         return mPriv->mAccount->currentPresence().statusMessage();
     case AccountsModel::RequestedPresenceRole:
-        return mPriv->mAccount->requestedPresence().status();
+        return QVariant::fromValue(KTp::Presence(mPriv->mAccount->requestedPresence()));
     case AccountsModel::RequestedPresenceTypeRole:
         return mPriv->mAccount->requestedPresence().type();
+    case AccountsModel::RequestedPresenceStatusRole:
+        return mPriv->mAccount->requestedPresence().status();
     case AccountsModel::RequestedPresenceStatusMessageRole:
         return mPriv->mAccount->requestedPresence().statusMessage();
     case AccountsModel::ConnectionStatusRole:
diff --git a/KTp/Models/accounts-model.cpp b/KTp/Models/accounts-model.cpp
index 748bced..51fca88 100644
--- a/KTp/Models/accounts-model.cpp
+++ b/KTp/Models/accounts-model.cpp
@@ -77,15 +77,18 @@ AccountsModel::AccountsModel(QObject *parent)
     roles[NicknameRole] = "nickname";
     roles[ConnectsAutomaticallyRole] = "connectsAutomatically";
     roles[ChangingPresenceRole] = "changingPresence";
-    roles[AutomaticPresenceRole] = "automaticStatus";
-    roles[AutomaticPresenceTypeRole] = "automaticStatusType";
-    roles[AutomaticPresenceStatusMessageRole] = "automaticStatusMessage";
-    roles[CurrentPresenceRole] = "status";
-    roles[CurrentPresenceTypeRole] = "statusType";
-    roles[CurrentPresenceStatusMessageRole] = "statusMessage";
-    roles[RequestedPresenceRole] = "requestedStatus";
-    roles[RequestedPresenceTypeRole] = "requestedStatusType";
-    roles[RequestedPresenceStatusMessageRole] = "requestedStatusMessage";
+    roles[AutomaticPresenceRole] = "automaticPresence";
+    roles[AutomaticPresenceTypeRole] = "automaticPresenceType";
+    roles[AutomaticPresenceStatusRole] = "automaticPresenceStatus";
+    roles[AutomaticPresenceStatusMessageRole] = "automaticPresenceStatusMessage";
+    roles[CurrentPresenceRole] = "presence";
+    roles[CurrentPresenceTypeRole] = "presenceType";
+    roles[CurrentPresenceStatusRole] = "presenceStatus";
+    roles[CurrentPresenceStatusMessageRole] = "presenceStatusMessage";
+    roles[RequestedPresenceRole] = "requestedPresence";
+    roles[RequestedPresenceTypeRole] = "requestedPresenceType";
+    roles[RequestedPresenceStatusRole] = "requestedPresenceStatus";
+    roles[RequestedPresenceStatusMessageRole] = "requestedPresenceStatusMessage";
     roles[ConnectionStatusRole] = "connectionStatus";
     roles[ConnectionStatusReasonRole] = "connectionStatusReason";
     roles[AliasRole] = "aliasName";
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index cca956a..a67912d 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -61,12 +61,15 @@ public:
         ChangingPresenceRole,
         AutomaticPresenceRole,
         AutomaticPresenceTypeRole,
+        AutomaticPresenceStatusRole,
         AutomaticPresenceStatusMessageRole,
         CurrentPresenceRole,
         CurrentPresenceTypeRole,
+        CurrentPresenceStatusRole,
         CurrentPresenceStatusMessageRole,
         RequestedPresenceRole,
         RequestedPresenceTypeRole,
+        RequestedPresenceStatusRole,
         RequestedPresenceStatusMessageRole,
         ConnectionStatusRole,
         ConnectionStatusReasonRole,

-- 
ktp-common-internals packaging