[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:58:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=75655bb
The following commit has been merged in the master branch:
commit 75655bbb9ec71cc4b0a63922540cb1a819e424e3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Wed Jan 5 01:50:32 2011 +0000
Incorporated Review comments from dario freddi
http://git.reviewboard.kde.org/r/100293/
---
src/KCMTelepathyAccounts/account-edit-widget.cpp | 15 ++++-----------
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 2 +-
src/KCMTelepathyAccounts/parameter-edit-model.h | 2 +-
src/KCMTelepathyAccounts/parameter-edit-widget.cpp | 2 +-
src/KCMTelepathyAccounts/parameter-item.cpp | 2 +-
src/KCMTelepathyAccounts/parameter-item.h | 2 +-
src/KCMTelepathyAccounts/protocol-item.cpp | 2 +-
src/add-account-assistant.cpp | 11 +++++------
src/edit-account-dialog.cpp | 11 +++++------
9 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 9bbac46..5e62294 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -105,9 +105,10 @@ void AccountEditWidget::loadWidgets()
{
Tp::ProtocolParameterList mandatoryParameters;
- foreach (Tp::ProtocolParameter parameter, d->parameters) {
- if (parameter.isRequired())
+ foreach (const Tp::ProtocolParameter ¶meter, d->parameters) {
+ if (parameter.isRequired()) {
mandatoryParameters.append(parameter);
+ }
}
// Get the AccountsUi for the plugin, and get the optional parameter widgets for it.
@@ -184,16 +185,8 @@ void AccountEditWidget::onAdvancedClicked()
// at this point the values are fine
d->advancedParameterValues = advancedWidget->parameterValues();
// update the parameter values in case the dialog is opened again
- //FIXME this concept of parameters and advanced parameter values get merged here. This seems broken.
-
- QVariantMap::const_iterator paramIter;
- paramIter = d->advancedParameterValues.constBegin();
- while (paramIter != d->advancedParameterValues.constEnd())
- {
- d->parameterValues[paramIter.key()] = paramIter.value();
- paramIter++;
- }
+ d->parameterValues.unite(d->advancedParameterValues);
break;
}
else
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 39e7f97..6e33efa 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -133,7 +133,7 @@ bool ParameterEditModel::setData(const QModelIndex &index, const QVariant &value
}
}
-void ParameterEditModel::addItem(Tp::ProtocolParameter parameter, const QVariant &originalValue)
+void ParameterEditModel::addItem(const Tp::ProtocolParameter ¶meter, const QVariant &originalValue)
{
kDebug();
// FIXME: Check we are not creating duplicate items.
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 6511fc8..7a3e63e 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -54,7 +54,7 @@ public:
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
- void addItem(Tp::ProtocolParameter parameter, const QVariant &originalValue);
+ void addItem(const Tp::ProtocolParameter ¶meter, const QVariant &originalValue);
QVariantMap parameterValues() const;
bool validateParameterValues();
diff --git a/src/KCMTelepathyAccounts/parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
index f818e3c..3d21633 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
@@ -63,7 +63,7 @@ ParameterEditWidget::ParameterEditWidget(Tp::ProtocolParameterList parameters,
SLOT(onDelegateDataChanged(QModelIndex, QVariant, int)));
// Add the parameters to the model.
- foreach (Tp::ProtocolParameter parameter, parameters) {
+ foreach (const Tp::ProtocolParameter ¶meter, parameters) {
d->model->addItem(parameter, values.value(parameter.name(), parameter.defaultValue()));
}
}
diff --git a/src/KCMTelepathyAccounts/parameter-item.cpp b/src/KCMTelepathyAccounts/parameter-item.cpp
index 781dcc4..1ed8ee9 100644
--- a/src/KCMTelepathyAccounts/parameter-item.cpp
+++ b/src/KCMTelepathyAccounts/parameter-item.cpp
@@ -87,7 +87,7 @@ bool ParameterItem::isRequiredForRegistration() const
return m_parameter.isRequiredForRegistration();
}
-Tp::ProtocolParameter ParameterItem::parameter()
+const Tp::ProtocolParameter ParameterItem::parameter() const
{
return m_parameter;
}
diff --git a/src/KCMTelepathyAccounts/parameter-item.h b/src/KCMTelepathyAccounts/parameter-item.h
index 9f9aa33..f1bc910 100644
--- a/src/KCMTelepathyAccounts/parameter-item.h
+++ b/src/KCMTelepathyAccounts/parameter-item.h
@@ -45,7 +45,7 @@ public:
bool isSecret() const;
bool isRequired() const;
bool isRequiredForRegistration() const;
- Tp::ProtocolParameter parameter();
+ const Tp::ProtocolParameter parameter() const;
QValidator::State validity() const;
void setValue(const QVariant &value);
diff --git a/src/KCMTelepathyAccounts/protocol-item.cpp b/src/KCMTelepathyAccounts/protocol-item.cpp
index c4acdce..49f588d 100644
--- a/src/KCMTelepathyAccounts/protocol-item.cpp
+++ b/src/KCMTelepathyAccounts/protocol-item.cpp
@@ -63,7 +63,7 @@ Tp::ProtocolParameterList ProtocolItem::parameters() const
Tp::ConnectionManagerPtr cm = item->connectionManager();
- foreach (Tp::ProtocolInfo info, cm->protocols()) {
+ foreach (const Tp::ProtocolInfo &info, cm->protocols()) {
if (info.name() == m_protocol)
return info.parameters();
}
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 19e4f1c..c0ac30e 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -175,13 +175,12 @@ void AddAccountAssistant::accept()
// kDebug() << "Parameters to add with:" << parameters;
//remove any empty parameter values
- QVariantMap::iterator i;
- for (i = parameterValues.begin(); i != parameterValues.end(); ++i)
- {
- if (i.value().isNull())
- {
- parameterValues.remove(i.key());
+ QVariantMap::iterator i = parameterValues.begin();
+ while (i != parameterValues.end()) {
+ if (i.value().isNull()) {
+ parameterValues.erase(i);
}
+ i++;
}
// FIXME: Ask the user to submit a Display Name
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index efe4227..5f4c178 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -93,14 +93,13 @@ void EditAccountDialog::accept()
QStringList unsetParameters;
//if the value is null for any parameter, don't set it, and add it to a list of parameters to remove.
- QVariantMap::iterator i;
- for (i = parameters.begin(); i != parameters.end(); ++i)
- {
- if (i.value().isNull())
- {
+ QVariantMap::iterator i = parameters.begin();
+ while(i != parameters.end()) {
+ if (i.value().isNull()) {
unsetParameters.append(i.key());
- parameters.remove(i.key());
+ parameters.erase(i);
}
+ i++;
}
// kDebug() << "Set parameters:" << parameters;
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list