[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=3adf955

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

    Refactor AddAccountAssistant to make its code a bit simpler now that EditParametersWidget inherits from AbstractAccountParametersWidget.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006306
---
 src/add-account-assistant.cpp | 76 ++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 55 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index e003e3b..8c48f19 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -56,8 +56,8 @@ public:
     Tp::AccountManagerPtr accountManager;
     ProtocolSelectWidget *protocolSelectWidget;
     KTabWidget *tabWidget;
-    QWidget *mandatoryParametersWidget;
-    QList<QWidget*> optionalParametersWidgets;
+    AbstractAccountParametersWidget *mandatoryParametersWidget;
+    QList<AbstractAccountParametersWidget*> optionalParametersWidgets;
     KPageWidgetItem *pageOne;
     KPageWidgetItem *pageTwo;
 };
@@ -122,18 +122,14 @@ void AddAccountAssistant::next()
             AbstractAccountUi *ui = PluginManager::instance()->accountUiForProtocol(connectionManager,
                                                                                     protocol);
 
-
             // Delete the widgets for the next page if they already exist
             if (d->mandatoryParametersWidget) {
                 d->mandatoryParametersWidget->deleteLater();
                 d->mandatoryParametersWidget = 0;
             }
 
-            foreach (QWidget *w, d->optionalParametersWidgets) {
-                if (w) {
-                    w->deleteLater();
-                }
-            }
+            // TODO: Check if this calls delete, or ->deleteLater() once I have internet access again :)
+            qDeleteAll(d->optionalParametersWidgets);
             d->optionalParametersWidgets.clear();
 
             // Set up the Mandatory Parameters page
@@ -161,14 +157,17 @@ void AddAccountAssistant::next()
                 if (mandatoryParametersLeft.isEmpty()) {
                     d->mandatoryParametersWidget = widget;
                 } else {
+                    // FIXME: At the moment, if the custom widget can't handle all the mandatory
+                    // parameters we fall back to the generic one for all of them. It might be nicer
+                    // to have the custom UI for as many as possible, and stick a small generic one
+                    // underneath for those parameters it doesn't handle.
                     widget->deleteLater();
                     widget = 0;
                 }
             }
 
             if (!d->mandatoryParametersWidget) {
-                ParameterEditWidget *paramEditWidget = new ParameterEditWidget(item->mandatoryParameters(), d->tabWidget);
-                d->mandatoryParametersWidget = paramEditWidget;
+                d->mandatoryParametersWidget = new ParameterEditWidget(item->mandatoryParameters(), d->tabWidget);
             }
 
             d->tabWidget->addTab(d->mandatoryParametersWidget, i18n("Mandatory Parameters"));
@@ -226,21 +225,9 @@ void AddAccountAssistant::accept()
         return;
     }
 
-    // Get the mandatory properties.
+    // Get the mandatory parameters.
     QMap<Tp::ProtocolParameter*, QVariant> mandatoryParameterValues;
-
-    AbstractAccountParametersWidget *aapw = qobject_cast<AbstractAccountParametersWidget*>(d->mandatoryParametersWidget);
-    if (aapw) {
-        mandatoryParameterValues = aapw->parameterValues();
-    } else {
-        ParameterEditWidget *pew = qobject_cast<ParameterEditWidget*>(d->mandatoryParametersWidget);
-        if (pew) {
-            mandatoryParameterValues = pew->parameterValues();
-        } else {
-            kWarning() << "d->mandatoryParametersWidget has unrecognised type :(.";
-            return;
-        }
-    }
+    mandatoryParameterValues = d->mandatoryParametersWidget->parameterValues();
 
     foreach (const QVariant &value, mandatoryParameterValues.values()) {
         if (value.toString().isEmpty()) {
@@ -253,40 +240,19 @@ void AddAccountAssistant::accept()
     // Get the optional properties
     QMap<Tp::ProtocolParameter*, QVariant> optionalParameterValues;
 
-    foreach (QWidget *w, d->optionalParametersWidgets) {
-        ParameterEditWidget *pew = qobject_cast<ParameterEditWidget*>(w);
-        if (pew) {
-            QMap<Tp::ProtocolParameter*, QVariant> parameters = pew->parameterValues();
-            QMap<Tp::ProtocolParameter*, QVariant>::const_iterator i = parameters.constBegin();
-            while (i != parameters.constEnd()) {
-                if (!optionalParameterValues.contains(i.key())) {
-                    optionalParameterValues.insert(i.key(), i.value());
-                } else {
-                    kWarning() << "Parameter:" << i.key()->name() << "is already in the map.";
-                }
-
-                ++i;
+    foreach (AbstractAccountParametersWidget *w, d->optionalParametersWidgets) {
+        QMap<Tp::ProtocolParameter*, QVariant> parameters = w->parameterValues();
+        QMap<Tp::ProtocolParameter*, QVariant>::const_iterator i = parameters.constBegin();
+        while (i != parameters.constEnd()) {
+            if (!optionalParameterValues.contains(i.key())) {
+                optionalParameterValues.insert(i.key(), i.value());
+            } else {
+                kWarning() << "Parameter:" << i.key()->name() << "is already in the map.";
             }
-            continue;
-        }
-
-        AbstractAccountParametersWidget *aapw = qobject_cast<AbstractAccountParametersWidget*>(w);
-        if (aapw) {
-            QMap<Tp::ProtocolParameter*, QVariant> parameters = aapw->parameterValues();
-            QMap<Tp::ProtocolParameter*, QVariant>::const_iterator i = parameters.constBegin();
-            while (i != parameters.constEnd()) {
-                if (!optionalParameterValues.contains(i.key())) {
-                    optionalParameterValues.insert(i.key(), i.value());
-                } else {
-                    kWarning() << "Parameter:" << i.key()->name() << "is already in the map.";
-                }
 
-                ++i;
-            }
-            continue;
+            ++i;
         }
-
-        kWarning() << "Widget type not recognised :(";
+        continue;
     }
 
     // Get the ProtocolItem that was selected and the corresponding ConnectionManagerItem.

-- 
ktp-accounts-kcm packaging