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

The following commit has been merged in the master branch:
commit c317dccc5a74ee2c8c8f7f31995d1625a2d22e23
Author: Anant Kamath <kamathanant at gmail.com>
Date:   Mon Sep 2 08:03:09 2013 +0530

    Allow handleParameters() to accept a custom property for widgets
---
 .../abstract-account-parameters-widget.cpp         | 28 ++++++++++++++--------
 .../abstract-account-parameters-widget.h           |  6 +++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index b1eef1d..016e3a7 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -87,19 +87,21 @@ bool AbstractAccountParametersWidget::validateParameterValues()
 void AbstractAccountParametersWidget::handleParameter(const QString &parameterName,
                                            QVariant::Type parameterType,
                                            QWidget* dataWidget,
-                                           QWidget* labelWidget)
+                                           QWidget* labelWidget,
+                                           const QByteArray &dataWidgetProperty)
 {
     QList<QWidget*> labelWidgets;
     if (labelWidget) {
         labelWidgets << labelWidget;
     }
-    handleParameter(parameterName, parameterType, dataWidget, labelWidgets);
+    handleParameter(parameterName, parameterType, dataWidget, labelWidgets, dataWidgetProperty);
 }
 
 void AbstractAccountParametersWidget::handleParameter(const QString &parameterName,
                                            QVariant::Type parameterType,
                                            QWidget* dataWidget,
-                                           const QList<QWidget*> &labelWidgets)
+                                           const QList<QWidget*> &labelWidgets,
+                                           const QByteArray &dataWidgetProperty)
 {
     kDebug() << parameterType << parameterName;
 
@@ -122,13 +124,19 @@ void AbstractAccountParametersWidget::handleParameter(const QString &parameterNa
         kDebug() << index << parameterName;
         // insert it to valid parameters list
         //for text edit boxes we force it to use the plainText property so that we don't get HTML all over our options
-        if (dataWidget->inherits("QTextEdit")) {
-            d->mapper->addMapping(dataWidget, index.row(), "plainText");
-        } else if (dataWidget->inherits("QComboBox") && parameterType == QVariant::String) {
-            d->mapper->addMapping(dataWidget, index.row(), "currentText");
-        } else {
-            d->mapper->addMapping(dataWidget, index.row());
+        if (!dataWidgetProperty.isEmpty()) {
+            d->mapper->addMapping(dataWidget, index.row(), dataWidgetProperty);
         }
+        else {
+            if (dataWidget->inherits("QTextEdit")) {
+                d->mapper->addMapping(dataWidget, index.row(), "plainText");
+            } else if (dataWidget->inherits("QComboBox") && parameterType == QVariant::String) {
+                d->mapper->addMapping(dataWidget, index.row(), "currentText");
+            } else {
+                d->mapper->addMapping(dataWidget, index.row());
+            }
+        }
+
         d->mapper->toFirst();
 
         // check if the passed parameter is a validated one.. If so we're going to set the model here
@@ -172,7 +180,7 @@ ParameterEditModel* AbstractAccountParametersWidget::parameterModel() const
 
 QString AbstractAccountParametersWidget::defaultDisplayName() const
 {
-    kWarning() << "This method should be implemented by derived classed";
+    kWarning() << "This method should be implemented by derived classes";
     return QString();
 }
 
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
index c5c9da3..0c9fb9e 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
@@ -74,12 +74,14 @@ protected:
     void handleParameter(const QString &parameterName,
                          QVariant::Type parameterType,
                          QWidget *dataWidget,
-                         const QList<QWidget*> &labelWidgets);
+                         const QList<QWidget*> &labelWidgets,
+                         const QByteArray &dataWidgetProperty = QByteArray());
 
     void handleParameter(const QString &parameterName,
                          QVariant::Type parameterType,
                          QWidget *dataWidget,
-                         QWidget *labelWidget = 0);
+                         QWidget *labelWidget = 0,
+                         const QByteArray &dataWidgetProperty = QByteArray());
 
     /** Returns the model containing all the protocol parameters*/
     ParameterEditModel *parameterModel() const;

-- 
ktp-accounts-kcm packaging