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

The following commit has been merged in the master branch:
commit ef5cc5de38e705ece965e0c04e784b55640e51d0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jan 8 16:24:37 2011 +0000

    Add connection state to the Accounts Model
---
 KTp/Models/accounts-list-model.cpp | 8 ++++++++
 KTp/Models/accounts-list-model.h   | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index 5ceaa9a..5862398 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -78,6 +78,14 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
         }
         break;
 
+    case AccountsListModel::ConnectionStateDisplayRole:
+        data = QVariant(m_accounts.at(index.row())->connectionStateString());
+        break;
+
+    case AccountsListModel::ConnectionStateIconRole:
+        data = QVariant(m_accounts.at(index.row())->connectionStateIcon());
+        break;
+
     default:
         break;
     }
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index 38deb93..98d4942 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -32,6 +32,12 @@ class AccountsListModel : public QAbstractListModel
     Q_OBJECT
     Q_DISABLE_COPY(AccountsListModel);
 
+    enum Roles {
+        ConnectionStateDisplayRole = Qt::UserRole+1,
+        ConnectionStateIconRole = Qt::UserRole+2,
+        ConnectionErrorMessageDisplayRole = Qt::UserRole+3
+    };
+
 public:
     explicit AccountsListModel(QObject *parent = 0);
     virtual ~AccountsListModel();

-- 
ktp-common-internals packaging