[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:34 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=cd74e94
The following commit has been merged in the master branch:
commit cd74e947df5089db095a9d3a98f9341648a03623
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Thu Jan 6 02:31:56 2011 +0000
Match latest KCMAccounts library
+ added review comments
---
butterfly/butterfly-account-ui-plugin.cpp | 2 ++
butterfly/main-options-widget.cpp | 27 ++++++++++++---------------
butterfly/main-options-widget.h | 2 +-
gabble/advanced-options-widget.cpp | 11 +++++++----
gabble/advanced-options-widget.h | 2 +-
gabble/main-options-widget.cpp | 13 ++++++++-----
gabble/main-options-widget.h | 2 +-
gabble/proxy-settings-widget.cpp | 28 +++++++++++++++-------------
gabble/proxy-settings-widget.h | 2 +-
gabble/server-settings-widget.cpp | 25 ++++++++++++++-----------
gabble/server-settings-widget.h | 2 +-
11 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/butterfly/butterfly-account-ui-plugin.cpp b/butterfly/butterfly-account-ui-plugin.cpp
index d79c5aa..83c665d 100644
--- a/butterfly/butterfly-account-ui-plugin.cpp
+++ b/butterfly/butterfly-account-ui-plugin.cpp
@@ -29,6 +29,8 @@
#include <QtCore/QVariantList>
+#include <KCMTelepathyAccounts/ProtocolParameterValue>
+
class ButterflyAccountUiPlugin::Private
{
public:
diff --git a/butterfly/main-options-widget.cpp b/butterfly/main-options-widget.cpp
index b91075c..9f38a02 100644
--- a/butterfly/main-options-widget.cpp
+++ b/butterfly/main-options-widget.cpp
@@ -24,6 +24,7 @@
#include <KDebug>
#include <KMessageBox>
+#include <KCMTelepathyAccounts/ProtocolParameterValue>
class MainOptionsWidget::Private
{
@@ -49,11 +50,7 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
kDebug();
// Store the parameters this widget supports
- foreach (Tp::ProtocolParameter parameter, parameters) {
-
- qDebug() << parameter.name();
-
-
+ foreach (const Tp::ProtocolParameter ¶meter, parameters) {
if ((parameter.name() == "account") && (parameter.type() == QVariant::String)) {
d->accountParameter = parameter;
} else if ((parameter.name() == "password") && (parameter.type() == QVariant::String)) {
@@ -101,22 +98,22 @@ MainOptionsWidget::~MainOptionsWidget()
delete d;
}
-QVariantMap MainOptionsWidget::parameterValues() const
+QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
{
kDebug();
- QVariantMap parameters;
+ QList<ProtocolParameterValue> parameters;
- // Populate the map of parameters and their values with all the parameters this widget contains.
- if (d->accountParameter.isValid()) {
- parameters.insert(d->accountParameter.name(), d->ui->accountLineEdit->text());
- }
+ // 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.insert(d->passwordParameter.name(), d->ui->passwordLineEdit->text());
- }
+ if (d->passwordParameter.isValid()) {
+ parameters.append(ProtocolParameterValue(d->passwordParameter, d->ui->passwordLineEdit->text()));
+ }
- return parameters;
+ return parameters;
}
bool MainOptionsWidget::validateParameterValues()
diff --git a/butterfly/main-options-widget.h b/butterfly/main-options-widget.h
index cb5f679..7678fad 100644
--- a/butterfly/main-options-widget.h
+++ b/butterfly/main-options-widget.h
@@ -33,7 +33,7 @@ public:
QWidget *parent = 0);
virtual ~MainOptionsWidget();
- virtual QVariantMap parameterValues() const;
+ virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
diff --git a/gabble/advanced-options-widget.cpp b/gabble/advanced-options-widget.cpp
index ec164a0..43145f2 100644
--- a/gabble/advanced-options-widget.cpp
+++ b/gabble/advanced-options-widget.cpp
@@ -22,12 +22,15 @@
#include "proxy-settings-widget.h"
#include "server-settings-widget.h"
+#include <KCMTelepathyAccounts/ProtocolParameterValue>
+
#include <KDebug>
#include <KTabWidget>
#include <KLocale>
#include <QHBoxLayout>
+
class AdvancedOptionsWidget::Private
{
public:
@@ -68,14 +71,14 @@ AdvancedOptionsWidget::~AdvancedOptionsWidget()
delete d;
}
-QVariantMap AdvancedOptionsWidget::parameterValues() const
+QList<ProtocolParameterValue> AdvancedOptionsWidget::parameterValues() const
{
kDebug();
// the server parameter values
- QVariantMap parameters;
- parameters = d->serverSettings->parameterValues();
- parameters.unite(d->proxySettings->parameterValues());
+ QList<ProtocolParameterValue> parameters;
+ parameters.append(d->serverSettings->parameterValues());
+ parameters.append(d->proxySettings->parameterValues());
return parameters;
}
diff --git a/gabble/advanced-options-widget.h b/gabble/advanced-options-widget.h
index 0e96374..e38f844 100644
--- a/gabble/advanced-options-widget.h
+++ b/gabble/advanced-options-widget.h
@@ -33,7 +33,7 @@ public:
QWidget *parent = 0);
virtual ~AdvancedOptionsWidget();
- virtual QVariantMap parameterValues() const;
+ virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
diff --git a/gabble/main-options-widget.cpp b/gabble/main-options-widget.cpp
index dce68de..702fd7d 100644
--- a/gabble/main-options-widget.cpp
+++ b/gabble/main-options-widget.cpp
@@ -22,9 +22,12 @@
#include "ui_main-options-widget.h"
+#include <KCMTelepathyAccounts/ProtocolParameterValue>
+
#include <KDebug>
#include <KMessageBox>
+
class MainOptionsWidget::Private
{
public:
@@ -49,7 +52,7 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
kDebug();
// Store the parameters this widget supports
- foreach (Tp::ProtocolParameter parameter, parameters) {
+ foreach (const Tp::ProtocolParameter ¶meter, parameters) {
if ((parameter.name() == "account") && (parameter.type() == QVariant::String)) {
d->accountParameter = parameter;
} else if ((parameter.name() == "password") && (parameter.type() == QVariant::String)) {
@@ -97,19 +100,19 @@ MainOptionsWidget::~MainOptionsWidget()
delete d;
}
-QVariantMap MainOptionsWidget::parameterValues() const
+QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
{
kDebug();
- QVariantMap parameters;
+ QList<ProtocolParameterValue> parameters;
// Populate the map of parameters and their values with all the parameters this widget contains.
if (d->accountParameter.isValid()) {
- parameters.insert(d->accountParameter.name(), d->ui->accountLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->accountParameter, d->ui->accountLineEdit->text()));
}
if (d->passwordParameter.isValid()) {
- parameters.insert(d->passwordParameter.name(), d->ui->passwordLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->passwordParameter, d->ui->passwordLineEdit->text()));
}
return parameters;
diff --git a/gabble/main-options-widget.h b/gabble/main-options-widget.h
index da468ca..a0ba4f3 100644
--- a/gabble/main-options-widget.h
+++ b/gabble/main-options-widget.h
@@ -33,7 +33,7 @@ public:
QWidget *parent = 0);
virtual ~MainOptionsWidget();
- virtual QVariantMap parameterValues() const;
+ virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
diff --git a/gabble/proxy-settings-widget.cpp b/gabble/proxy-settings-widget.cpp
index a8633e7..ce9c411 100644
--- a/gabble/proxy-settings-widget.cpp
+++ b/gabble/proxy-settings-widget.cpp
@@ -22,9 +22,12 @@
#include "ui_proxy-settings-widget.h"
+#include <KCMTelepathyAccounts/ProtocolParameterValue>
+
#include <KDebug>
#include <KMessageBox>
+
class ProxySettingsWidget::Private
{
public:
@@ -55,7 +58,7 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
kDebug();
// Store the parameters this widget supports
- foreach (Tp::ProtocolParameter parameter, parameters) {
+ foreach (const Tp::ProtocolParameter ¶meter, parameters) {
if ((parameter.name() == "stun-server") && (parameter.type() == QVariant::String)) {
d->stunServerParameter = parameter;
} else if ((parameter.name() == "stun-port") && (parameter.type() == QVariant::UInt)) {
@@ -234,47 +237,46 @@ ProxySettingsWidget::~ProxySettingsWidget()
delete d;
}
-QVariantMap ProxySettingsWidget::parameterValues() const
+QList<ProtocolParameterValue> ProxySettingsWidget::parameterValues() const
{
kDebug();
- QVariantMap parameters;
+ QList<ProtocolParameterValue> parameters;
// Populate the map of parameters and their values with all the parameters this widget contains.
if (d->stunServerParameter.isValid()) {
- parameters.insert(d->stunServerParameter.name(), d->ui->stunServerLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->stunServerParameter, d->ui->stunServerLineEdit->text()));
}
if (d->stunPortParameter.isValid()) {
- parameters.insert(d->stunPortParameter.name(), (uint)d->ui->stunPortSpinBox->value());
+ parameters.append(ProtocolParameterValue(d->stunPortParameter, d->ui->stunPortSpinBox->value()));
}
if (d->fallbackStunServerParameter.isValid()) {
- parameters.insert(d->fallbackStunServerParameter.name(),
- d->ui->fallbackStunServerLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->fallbackStunServerParameter, d->ui->fallbackStunServerLineEdit->text()));
}
if (d->fallbackStunPortParameter.isValid()) {
- parameters.insert(d->fallbackStunPortParameter.name(), (uint)d->ui->fallbackStunPortSpinBox->value());
+ parameters.append(ProtocolParameterValue(d->fallbackStunPortParameter, d->ui->fallbackStunPortSpinBox->value()));
}
if (d->httpsProxyServerParameter.isValid()) {
- parameters.insert(d->httpsProxyServerParameter.name(), d->ui->httpsProxyServerLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->httpsProxyServerParameter, d->ui->httpsProxyServerLineEdit->text()));
}
if (d->httpsProxyPortParameter.isValid()) {
- parameters.insert(d->httpsProxyPortParameter.name(), (uint)d->ui->httpsProxyPortSpinBox->value());
+ parameters.append(ProtocolParameterValue(d->httpsProxyPortParameter, d->ui->httpsProxyPortSpinBox->value()));
}
if (d->fallbackSocks5ProxiesParameter.isValid()) {
QString text = d->ui->fallbackSocks5ProxiesTextEdit->toPlainText();
QStringList value = text.split("
", QString::SkipEmptyParts);
- parameters.insert(d->fallbackSocks5ProxiesParameter.name(), value);
+ parameters.append(ProtocolParameterValue(d->fallbackSocks5ProxiesParameter, value));
}
if (d->fallbackConferenceServerParameter.isValid()) {
- parameters.insert(d->fallbackConferenceServerParameter.name(),
- d->ui->fallbackConferenceServerLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->fallbackConferenceServerParameter,
+ d->ui->fallbackConferenceServerLineEdit->text()));
}
return parameters;
diff --git a/gabble/proxy-settings-widget.h b/gabble/proxy-settings-widget.h
index 596d23f..0add7fd 100644
--- a/gabble/proxy-settings-widget.h
+++ b/gabble/proxy-settings-widget.h
@@ -33,7 +33,7 @@ public:
QWidget *parent = 0);
virtual ~ProxySettingsWidget();
- virtual QVariantMap parameterValues() const;
+ virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index 709180c..ddd5e2e 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -22,9 +22,12 @@
#include "ui_server-settings-widget.h"
+#include <KCMTelepathyAccounts/ProtocolParameterValue>
+
#include <KDebug>
#include <KMessageBox>
+
class ServerSettingsWidget::Private
{
public:
@@ -54,7 +57,7 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
kDebug();
// Store the parameters this widget supports
- foreach (Tp::ProtocolParameter parameter, parameters) {
+ foreach (const Tp::ProtocolParameter ¶meter, parameters) {
if ((parameter.name() == "server") && (parameter.type() == QVariant::String)) {
d->serverParameter = parameter;
} else if ((parameter.name() == "port") && (parameter.type() == QVariant::UInt)) {
@@ -196,40 +199,40 @@ ServerSettingsWidget::~ServerSettingsWidget()
delete d;
}
-QVariantMap ServerSettingsWidget::parameterValues() const
+QList<ProtocolParameterValue> ServerSettingsWidget::parameterValues() const
{
kDebug();
- QVariantMap parameters;
+ QList<ProtocolParameterValue> parameters;
// Populate the map of parameters and their values with all the parameters this widget contains.
if (d->serverParameter.isValid()) {
- parameters.insert(d->serverParameter.name(), d->ui->serverLineEdit->text());
+ parameters.append(ProtocolParameterValue(d->serverParameter, d->ui->serverLineEdit->text()));
}
if (d->portParameter.isValid()) {
- parameters.insert(d->portParameter.name(), (uint)d->ui->portSpinBox->value());
+ parameters.append(ProtocolParameterValue(d->portParameter, d->ui->portSpinBox->value()));
}
if (d->keepaliveIntervalParameter.isValid()) {
- parameters.insert(d->keepaliveIntervalParameter.name(), (uint)d->ui->keepaliveIntervalSpinBox->value());
+ parameters.append(ProtocolParameterValue(d->keepaliveIntervalParameter, d->ui->keepaliveIntervalSpinBox->value()));
}
if (d->lowBandwidthParameter.isValid()) {
- parameters.insert(d->lowBandwidthParameter.name(), d->ui->lowBandwidthCheckBox->isChecked());
+ parameters.append(ProtocolParameterValue(d->lowBandwidthParameter, d->ui->lowBandwidthCheckBox->isChecked()));
}
if (d->requireEncryptionParameter.isValid()) {
- parameters.insert(d->requireEncryptionParameter.name(),
- d->ui->requireEncryptionCheckBox->isChecked());
+ parameters.append(ProtocolParameterValue(d->requireEncryptionParameter,
+ d->ui->requireEncryptionCheckBox->isChecked()));
}
if (d->ignoreSslErrorsParameter.isValid()) {
- parameters.insert(d->ignoreSslErrorsParameter.name(), d->ui->ignoreSslErrorsCheckBox->isChecked());
+ parameters.append(ProtocolParameterValue(d->ignoreSslErrorsParameter, d->ui->ignoreSslErrorsCheckBox->isChecked()));
}
if (d->oldSslParameter.isValid()) {
- parameters.insert(d->oldSslParameter.name(), d->ui->oldSslCheckBox->isChecked());
+ parameters.append(ProtocolParameterValue(d->oldSslParameter, d->ui->oldSslCheckBox->isChecked()));
}
return parameters;
diff --git a/gabble/server-settings-widget.h b/gabble/server-settings-widget.h
index 813f3f4..67ec59f 100644
--- a/gabble/server-settings-widget.h
+++ b/gabble/server-settings-widget.h
@@ -33,7 +33,7 @@ public:
QWidget *parent = 0);
virtual ~ServerSettingsWidget();
- virtual QVariantMap parameterValues() const;
+ virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list