[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=eab5d82

The following commit has been merged in the master branch:
commit eab5d82ca36bb093f8ef308f52c7ea95c81275c0
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Jul 23 17:13:17 2009 +0000

    Add roles for the different bits of data that might be requested from the ParameterEditModel and add getters to the ParameterItem to get them.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1001578
---
 src/parameter-edit-model.cpp | 17 ++++++++++++++++-
 src/parameter-edit-model.h   | 10 ++++++++++
 src/parameter-item.cpp       | 28 ++++++++++++++++++++++++++++
 src/parameter-item.h         |  5 +++++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/parameter-edit-model.cpp b/src/parameter-edit-model.cpp
index 076b5f0..d7fbcc3 100644
--- a/src/parameter-edit-model.cpp
+++ b/src/parameter-edit-model.cpp
@@ -61,9 +61,24 @@ QVariant ParameterEditModel::data(const QModelIndex &index, int role) const
 
     switch(role)
     {
-    case Qt::DisplayRole:
+    case ParameterEditModel::NameRole:
         data = QVariant(m_items.at(index.row())->name());
         break;
+    case ParameterEditModel::TypeRole:
+        data = QVariant(m_items.at(index.row())->type());
+        break;
+    case ParameterEditModel::ValueRole:
+        data = QVariant(m_items.at(index.row())->value());
+        break;
+    case ParameterEditModel::SecretRole:
+        data = QVariant(m_items.at(index.row())->isSecret());
+        break;
+    case ParameterEditModel::RequiredRole:
+        data = QVariant(m_items.at(index.row())->isRequired());
+        break;
+    case ParameterEditModel::RequiredForRegistrationRole:
+        data = QVariant(m_items.at(index.row())->isRequiredForRegistration());
+        break;
     default:
         break;
     }
diff --git a/src/parameter-edit-model.h b/src/parameter-edit-model.h
index ca3c2b7..cff891f 100644
--- a/src/parameter-edit-model.h
+++ b/src/parameter-edit-model.h
@@ -35,6 +35,16 @@ class ParameterEditModel : public QAbstractListModel
     Q_DISABLE_COPY(ParameterEditModel);
 
 public:
+    enum Roles {
+        NameRole = Qt::UserRole + 1,
+        TypeRole,
+        ValueRole,
+        SecretRole,
+        RequiredRole,
+        RequiredForRegistrationRole,
+        UserRole = Qt::UserRole + 42
+    };
+
     explicit ParameterEditModel(QObject *parent = 0);
     virtual ~ParameterEditModel();
 
diff --git a/src/parameter-item.cpp b/src/parameter-item.cpp
index 3d0cdbb..2eb08d5 100644
--- a/src/parameter-item.cpp
+++ b/src/parameter-item.cpp
@@ -42,6 +42,34 @@ ParameterItem::~ParameterItem()
 
 QString ParameterItem::name() const
 {
+    // TODO: Try and translate common parameter names. Can we have a singleton registry where we can
+    // get the translation of common parameters from (which will allow i18n of that registries
+    // contents?
     return m_parameter->name();
 }
 
+QVariant::Type ParameterItem::type() const
+{
+    return m_parameter->type();
+}
+
+QVariant ParameterItem::value() const
+{
+    return m_currentValue;
+}
+
+bool ParameterItem::isSecret() const
+{
+    return m_parameter->isSecret();
+}
+
+bool ParameterItem::isRequired() const
+{
+    return m_parameter->isRequired();
+}
+
+bool ParameterItem::isRequiredForRegistration() const
+{
+    return m_parameter->requiredForRegistration();
+}
+
diff --git a/src/parameter-item.h b/src/parameter-item.h
index efa2118..80b51b2 100644
--- a/src/parameter-item.h
+++ b/src/parameter-item.h
@@ -38,6 +38,11 @@ public:
     virtual ~ParameterItem();
 
     QString name() const;
+    QVariant::Type type() const;
+    QVariant value() const;
+    bool isSecret() const;
+    bool isRequired() const;
+    bool isRequiredForRegistration() const;
 
 private:
     Tp::ProtocolParameter const *m_parameter;

-- 
ktp-accounts-kcm packaging