[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=9531e9b

The following commit has been merged in the master branch:
commit 9531e9baad30fe054bbbdaffcb440777f67b3e25
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Nov 14 10:23:45 2012 +0900

    Use a custom AccountsListModel role to show enabled state and not Qt::CheckStateRole which is application specific.
    
    This was causing checkboxes to appear in combo boxes showing a list of accounts
    Also remove flags method which no longer has any effect
---
 KTp/Models/accounts-list-model.cpp | 27 +++++++++------------------
 KTp/Models/accounts-list-model.h   |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index 5328eb3..24d33e7 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -104,14 +104,6 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
         data = QVariant(KIcon(account->iconName()));
         break;
 
-    case Qt::CheckStateRole:
-        if (account->isEnabled()) {
-            data = QVariant(Qt::Checked);
-        } else {
-            data = QVariant(Qt::Unchecked);
-        }
-        break;
-
     case AccountsListModel::ConnectionStateRole:
         data = QVariant(account->connectionStatus());
         break;
@@ -132,6 +124,14 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
         data = QVariant(account->protocolName());
         break;
 
+    case AccountsListModel::EnabledRole:
+        if (account->isEnabled()) {
+            data = QVariant(Qt::Checked);
+        } else {
+            data = QVariant(Qt::Unchecked);
+        }
+        break;
+
     case AccountsListModel::AccountRole:
         data = QVariant::fromValue<Tp::AccountPtr>(account);
         break;
@@ -148,7 +148,7 @@ bool AccountsListModel::setData(const QModelIndex &index, const QVariant &value,
     if (!index.isValid()) {
         return false;
     }
-    if (role == Qt::CheckStateRole) {
+    if (role == AccountsListModel::EnabledRole) {
         //this is index from QSortFilterProxyModel
         index.data(AccountRole).value<Tp::AccountPtr>()->setEnabled(value.toInt() == Qt::Checked);
         return true;
@@ -170,15 +170,6 @@ QModelIndex AccountsListModel::index(int row, int column, const QModelIndex& par
     return QModelIndex();
 }
 
-
-Qt::ItemFlags AccountsListModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid()) {
-        return QAbstractItemModel::flags(index);
-    }
-    return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
-}
-
 void AccountsListModel::onAccountAdded(const Tp::AccountPtr &account)
 {
     kDebug() << "Creating a new Account from account:" << account.data();
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index a6bdbd4..62b89db 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -42,6 +42,7 @@ public:
         ConnectionStateIconRole,
         ConnectionErrorMessageDisplayRole,
         ConnectionProtocolNameRole,
+        EnabledRole,
         AccountRole
     };
 
@@ -53,7 +54,6 @@ public:
     virtual int rowCount(const QModelIndex & parent = QModelIndex()) const;
     virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
     virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
     virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
 

-- 
ktp-common-internals packaging