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

The following commit has been merged in the master branch:
commit d83ac19d999dc24e0fab32175f0e837136da45cf
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Thu Jan 13 21:48:59 2011 +0100

    Port butterfly plugin to the new plugin api.
---
 butterfly/butterfly-account-ui.cpp |  5 ++-
 butterfly/butterfly-account-ui.h   |  3 +-
 butterfly/main-options-widget.cpp  | 74 +++-----------------------------------
 butterfly/main-options-widget.h    |  6 +---
 4 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/butterfly/butterfly-account-ui.cpp b/butterfly/butterfly-account-ui.cpp
index 1732b87..67fc5f7 100644
--- a/butterfly/butterfly-account-ui.cpp
+++ b/butterfly/butterfly-account-ui.cpp
@@ -54,13 +54,12 @@ ButterflyAccountUi::~ButterflyAccountUi()
 }
 
 AbstractAccountParametersWidget *ButterflyAccountUi::mainOptionsWidget(
-        Tp::ProtocolParameterList parameters,
-        const QVariantMap &values,
+        ParameterEditModel *model,
         QWidget *parent) const
 {
     kDebug();
 
-    return new MainOptionsWidget(parameters, values, parent);
+    return new MainOptionsWidget(model, parent);
 }
 
 #include "butterfly-account-ui.moc"
diff --git a/butterfly/butterfly-account-ui.h b/butterfly/butterfly-account-ui.h
index 5b83463..248f946 100644
--- a/butterfly/butterfly-account-ui.h
+++ b/butterfly/butterfly-account-ui.h
@@ -32,8 +32,7 @@ public:
     virtual ~ButterflyAccountUi();
 
     virtual AbstractAccountParametersWidget
-              *mainOptionsWidget(Tp::ProtocolParameterList parameters,
-                                 const QVariantMap &values = QVariantMap(),
+              *mainOptionsWidget(ParameterEditModel *model,
                                  QWidget *parent = 0) const;
 private:
     Q_DISABLE_COPY(ButterflyAccountUi);
diff --git a/butterfly/main-options-widget.cpp b/butterfly/main-options-widget.cpp
index 9f38a02..18c1203 100644
--- a/butterfly/main-options-widget.cpp
+++ b/butterfly/main-options-widget.cpp
@@ -35,60 +35,22 @@ public:
         kDebug();
     }
 
-    Tp::ProtocolParameter accountParameter;
-    Tp::ProtocolParameter passwordParameter;
-
     Ui::MainOptionsWidget *ui;
 };
 
-MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
-                                                     const QVariantMap &values,
-                                                     QWidget *parent)
- : AbstractAccountParametersWidget(parameters, values, parent),
+MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
+                                     QWidget *parent)
+ : AbstractAccountParametersWidget(model, parent),
    d(new Private)
 {
     kDebug();
 
-    // Store the parameters this widget supports
-    foreach (const Tp::ProtocolParameter &parameter, parameters) {
-        if ((parameter.name() == "account") && (parameter.type() == QVariant::String)) {
-           d->accountParameter = parameter;
-        } else if ((parameter.name() == "password") && (parameter.type() == QVariant::String)) {
-           d->passwordParameter = parameter;
-        }
-    }
-
     // Set up the UI.
     d->ui = new Ui::MainOptionsWidget;
     d->ui->setupUi(this);
 
-   // Prefill UI elements if appropriate.
-   if (d->accountParameter.isValid()) {
-       if (values.contains(d->accountParameter.name())) {
-           d->ui->accountLineEdit->setText(values.value(d->accountParameter.name()).toString());
-       } else {
-           d->ui->accountLineEdit->setText(d->accountParameter.defaultValue().toString());
-       }
-   }
-
-   if (d->passwordParameter.isValid()) {
-       if (values.contains(d->passwordParameter.name())) {
-           d->ui->passwordLineEdit->setText(values.value(d->passwordParameter.name()).toString());
-       } else {
-           d->ui->passwordLineEdit->setText(d->passwordParameter.defaultValue().toString());
-       }
-   }
-
-//    Hide any elements we don't have the parameters passed to show.
-   if (!d->accountParameter.isValid()) {
-       d->ui->accountLabel->hide();
-       d->ui->accountLineEdit->hide();
-   }
-
-   if (!d->passwordParameter.isValid()) {
-       d->ui->passwordLabel->hide();
-       d->ui->passwordLineEdit->hide();
-   }
+    handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
+    handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
 }
 
 MainOptionsWidget::~MainOptionsWidget()
@@ -98,31 +60,5 @@ MainOptionsWidget::~MainOptionsWidget()
     delete d;
 }
 
-QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
-{
-    kDebug();
-
-    QList<ProtocolParameterValue> parameters;
-
-    // Populate the map of parameters and their values with all the parameters this widget contains.
-    if (d->accountParameter.isValid()) {
-        parameters.append(ProtocolParameterValue(d->accountParameter, d->ui->accountLineEdit->text()));
-    }
-
-    if (d->passwordParameter.isValid()) {
-        parameters.append(ProtocolParameterValue(d->passwordParameter, d->ui->passwordLineEdit->text()));
-    }
-
-    return parameters;
-}
-
-bool MainOptionsWidget::validateParameterValues()
-{
-    kDebug();
-
-
-    return true;
-}
-
 #include "main-options-widget.moc"
 
diff --git a/butterfly/main-options-widget.h b/butterfly/main-options-widget.h
index 7678fad..ec7ca34 100644
--- a/butterfly/main-options-widget.h
+++ b/butterfly/main-options-widget.h
@@ -28,14 +28,10 @@ class MainOptionsWidget : public AbstractAccountParametersWidget
     Q_OBJECT
 
 public:
-    explicit MainOptionsWidget(Tp::ProtocolParameterList parameters,
-                               const QVariantMap &values = QVariantMap(),
+    explicit MainOptionsWidget(ParameterEditModel *model,
                                QWidget *parent = 0);
     virtual ~MainOptionsWidget();
 
-    virtual QList<ProtocolParameterValue> parameterValues() const;
-    virtual bool validateParameterValues();
-
 private:
     Q_DISABLE_COPY(MainOptionsWidget);
 

-- 
ktp-accounts-kcm packaging