[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/telepathy-accounts-kcm/src
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2009-08-03 13:17:33
Message-ID: 1249305453.749231.17878.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1006304 by gberg:

Make ParameterEditWidget inherit from AbstractAccountParametersWidget.

 M  +2 -4      add-account-assistant.cpp  
 M  +11 -13    defaultaccountui/parameter-edit-widget.cpp  
 M  +5 -5      defaultaccountui/parameter-edit-widget.h  


--- trunk/playground/network/telepathy-accounts-kcm/src/add-account-assistant.cpp \
#1006303:1006304 @@ -167,9 +167,8 @@
             }
 
             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 @@
 
             // 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"));
             }
 
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/parameter-edit-widget.cpp \
#1006303:1006304 @@ -37,13 +37,13 @@
     }
 
     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 @@
     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 @@
     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 @@
     d->model->setData(index, value, role);
 }
 
+
+#include "parameter-edit-widget.moc"
+
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/parameter-edit-widget.h \
#1006303:1006304 @@ -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);


[prev in list] [next in list] [prev in thread] [next in thread]