[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=487bfe0

The following commit has been merged in the master branch:
commit 487bfe063c414ec24f1d128bf66a2fcaf29b83af
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 3 13:17:32 2009 +0000

    Make ParameterEditWidget inherit from AbstractAccountParametersWidget.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006304
---
 src/add-account-assistant.cpp                  |  6 ++----
 src/defaultaccountui/parameter-edit-widget.cpp | 24 +++++++++++-------------
 src/defaultaccountui/parameter-edit-widget.h   | 10 +++++-----
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 3f0b2d7..e003e3b 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -167,9 +167,8 @@ void AddAccountAssistant::next()
             }
 
             if (!d->mandatoryParametersWidget) {
-                ParameterEditWidget *paramEditWidget = new ParameterEditWidget(d->tabWidget);
+                ParameterEditWidget *paramEditWidget = new ParameterEditWidget(item->mandatoryParameters(), d->tabWidget);
                 d->mandatoryParametersWidget = paramEditWidget;
-                paramEditWidget->setParameters(item->mandatoryParameters());
             }
 
             d->tabWidget->addTab(d->mandatoryParametersWidget, i18n("Mandatory Parameters"));
@@ -207,9 +206,8 @@ void AddAccountAssistant::next()
 
             // Show the generic UI if optionalParameters is not empty.
             if (optionalParametersLeft.size() > 0) {
-                ParameterEditWidget *pew = new ParameterEditWidget(d->tabWidget);
+                ParameterEditWidget *pew = new ParameterEditWidget(optionalParametersLeft, d->tabWidget);
                 d->optionalParametersWidgets.append(pew);
-                pew->setParameters(optionalParametersLeft);
                 d->tabWidget->addTab(pew, i18n("Optional Parameters"));
             }
 
diff --git a/src/defaultaccountui/parameter-edit-widget.cpp b/src/defaultaccountui/parameter-edit-widget.cpp
index 028a58a..82df541 100644
--- a/src/defaultaccountui/parameter-edit-widget.cpp
+++ b/src/defaultaccountui/parameter-edit-widget.cpp
@@ -37,13 +37,13 @@ public:
     }
 
     Ui::ParameterEditWidget *ui;
-    Tp::ProtocolParameterList parameters;
     ParameterEditDelegate *delegate;
     ParameterEditModel *model;
 };
 
-ParameterEditWidget::ParameterEditWidget(QWidget *parent)
- : QWidget(parent),
+ParameterEditWidget::ParameterEditWidget(Tp::ProtocolParameterList parameters,
+                                         QWidget *parent)
+ : AbstractAccountParametersWidget(parameters, parent),
    d(new Private)
 {
     kDebug();
@@ -60,6 +60,11 @@ ParameterEditWidget::ParameterEditWidget(QWidget *parent)
     connect(d->delegate,
             SIGNAL(dataChanged(QModelIndex, QVariant, int)),
             SLOT(onDelegateDataChanged(QModelIndex, QVariant, int)));
+
+    // Add the parameters to the model.
+    foreach (Tp::ProtocolParameter *parameter, parameters) {
+        d->model->addItem(parameter, parameter->defaultValue());
+    }
 }
 
 ParameterEditWidget::~ParameterEditWidget()
@@ -69,16 +74,6 @@ ParameterEditWidget::~ParameterEditWidget()
     delete d;
 }
 
-void ParameterEditWidget::setParameters(const Tp::ProtocolParameterList &parameters)
-{
-    kDebug();
-
-    // Add the parameters to the model.
-    foreach (Tp::ProtocolParameter *parameter, parameters) {
-        d->model->addItem(parameter, parameter->defaultValue());
-    }
-}
-
 QMap<Tp::ProtocolParameter*, QVariant> ParameterEditWidget::parameterValues() const
 {
     return d->model->parameterValues();
@@ -90,3 +85,6 @@ void ParameterEditWidget::onDelegateDataChanged(const QModelIndex &index, const
     d->model->setData(index, value, role);
 }
 
+
+#include "parameter-edit-widget.moc"
+
diff --git a/src/defaultaccountui/parameter-edit-widget.h b/src/defaultaccountui/parameter-edit-widget.h
index cbcef0d..8c24823 100644
--- a/src/defaultaccountui/parameter-edit-widget.h
+++ b/src/defaultaccountui/parameter-edit-widget.h
@@ -21,20 +21,20 @@
 #ifndef TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
 #define TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
 
-#include <QtGui/QWidget>
+#include "libkcmtelepathyaccounts/abstract-account-parameters-widget.h"
 
 #include <TelepathyQt4/ConnectionManager>
 
-class ParameterEditWidget : public QWidget
+class ParameterEditWidget : public AbstractAccountParametersWidget
 {
     Q_OBJECT
 
 public:
-    explicit ParameterEditWidget(QWidget *parent = 0);
+    explicit ParameterEditWidget(Tp::ProtocolParameterList parameters,
+                                 QWidget *parent = 0);
     ~ParameterEditWidget();
 
-    void setParameters(const Tp::ProtocolParameterList &parameters);
-    QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const;
+    virtual QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const;
 
 private Q_SLOTS:
     void onDelegateDataChanged(const QModelIndex &index, const QVariant &value, int role);

-- 
ktp-accounts-kcm packaging