[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=e66011d

The following commit has been merged in the master branch:
commit e66011d83da5712f56e5f480ffebff6823e295c8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 28 23:14:50 2013 +0100

    Expose AccountsListModel to QML
    
    REVIEW: 110234
---
 KTp/Declarative/qml-plugins.cpp    |  4 ++++
 KTp/Models/accounts-list-model.cpp | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index 1ba3ef2..1e09abd 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -39,6 +39,8 @@
 #include "KTp/types.h"
 #include "KTp/Models/contacts-filter-model.h"
 #include "KTp/Models/contacts-model.h"
+#include "KTp/Models/accounts-list-model.h"
+
 
 void QmlPlugins::initializeEngine(QDeclarativeEngine *engine, const char *uri)
 {
@@ -48,6 +50,8 @@ void QmlPlugins::initializeEngine(QDeclarativeEngine *engine, const char *uri)
 void QmlPlugins::registerTypes(const char *uri)
 {
     qmlRegisterType<KTp::ContactsModel> (uri, 0, 1, "ContactsModel");
+    qmlRegisterType<KTp::AccountsListModel> (uri, 0, 1, "AccountsListModel");
+
     qmlRegisterType<ConversationsModel> (uri, 0, 1, "ConversationsModel");
     qmlRegisterType<Conversation>(uri, 0, 1, "Conversation");
     qmlRegisterType<HideWindowComponent>(uri, 0, 1, "HideWindowComponent");
diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index c4fb917..0d1fa9d 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -44,6 +44,16 @@ KTp::AccountsListModel::AccountsListModel(QObject *parent)
  : QAbstractListModel(parent),
    d(new AccountsListModel::Private)
 {
+  
+    QHash<int, QByteArray> roles = roleNames();
+    roles[ConnectionStateRole] = "connectionState";
+    roles[ConnectionStateDisplayRole] = "conectionStateDisplay";
+    roles[ConnectionStateIconRole] = "connectionStateIcon";
+    roles[ConnectionErrorMessageDisplayRole] = "connectionErrorMessage";
+    roles[ConnectionProtocolNameRole] = "connectionProtocolName";
+    roles[EnabledRole] = "enabled";
+    roles[AccountRole] = "account";
+    setRoleNames(roles);
 }
 
 KTp::AccountsListModel::~AccountsListModel()

-- 
ktp-common-internals packaging