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

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

    Fix combobox selectedSimIdentifer property
---
 plugins/pintxo/main-options-widget.cpp | 8 ++++----
 plugins/pintxo/modem-combobox.h        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/pintxo/main-options-widget.cpp b/plugins/pintxo/main-options-widget.cpp
index e700242..15abc10 100644
--- a/plugins/pintxo/main-options-widget.cpp
+++ b/plugins/pintxo/main-options-widget.cpp
@@ -36,15 +36,15 @@ MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
 {
     m_ui = new Ui::MainOptionsWidget;
     m_ui->setupUi(this);
-    
+
     mapper = new QDataWidgetMapper(this);
     mapper->setModel(parameterModel());
     mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit);
     mapper->setOrientation(Qt::Vertical);
-    mapper->addMapping(m_ui->numberLineEdit, parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("number"))).row(), "text");
-    mapper->addMapping(m_ui->comboBox, parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("simIdentifier"))).row(), "selectedSimIdentifier");
+    mapper->addMapping(m_ui->numberLineEdit, parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("number"))).row());
+    mapper->addMapping(m_ui->comboBox, parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("simIdentifier"))).row());
     mapper->toFirst();
-    
+
     QTimer::singleShot(0, m_ui->numberLineEdit, SLOT(setFocus()));
 }
 
diff --git a/plugins/pintxo/modem-combobox.h b/plugins/pintxo/modem-combobox.h
index c66a3d4..6899b53 100644
--- a/plugins/pintxo/modem-combobox.h
+++ b/plugins/pintxo/modem-combobox.h
@@ -29,12 +29,12 @@
 class ModemComboBox : public QComboBox
 {
     Q_OBJECT
+    Q_PROPERTY(QString selectedSimIdentifier READ selectedSimIdentifier USER true)
 
 public:
     explicit ModemComboBox(QWidget *parent = 0);
     virtual ~ModemComboBox();
     QString selectedSimIdentifier();
-    Q_PROPERTY(QString selectedSimIdentifier READ selectedSimIdentifier)
 private:
     ModemManager::ModemInterface::List modems;
 };

-- 
ktp-accounts-kcm packaging