[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:40 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=aaf6a0e
The following commit has been merged in the master branch:
commit aaf6a0e3ffc50f81d64456f26919e1719409ba93
Author: Lasse Liehu <lliehu at kolumbus.fi>
Date: Sun Jan 9 19:30:59 2011 +0200
Const-ref'ify & whitespace fixes
---
idle/advanced-options-widget.cpp | 135 +++++++++++++++++++--------------------
idle/advanced-options-widget.h | 2 +-
idle/idle-account-ui-plugin.cpp | 3 +-
idle/idle-account-ui-plugin.h | 3 +-
idle/idle-account-ui.h | 2 +-
idle/main-options-widget.cpp | 82 ++++++++++++------------
idle/main-options-widget.h | 2 +-
7 files changed, 114 insertions(+), 115 deletions(-)
diff --git a/idle/advanced-options-widget.cpp b/idle/advanced-options-widget.cpp
index adb5c6f..f579a85 100644
--- a/idle/advanced-options-widget.cpp
+++ b/idle/advanced-options-widget.cpp
@@ -45,7 +45,7 @@ public:
};
AdvancedOptionsWidget::AdvancedOptionsWidget(
- Tp::ProtocolParameterList parameters, const QVariantMap &values,
+ const Tp::ProtocolParameterList& parameters, const QVariantMap &values,
QWidget *parent)
: AbstractAccountParametersWidget(parameters, values, parent),
d(new Private)
@@ -71,72 +71,72 @@ AdvancedOptionsWidget::AdvancedOptionsWidget(
d->ui = new Ui::AdvancedOptionsWidget;
d->ui->setupUi(this);
- // Prefill UI elements if appropriate.
- if (d->charsetParameter.isValid()) {
- if (values.contains(d->charsetParameter.name())) {
- d->ui->charsetLineEdit->setText(values.value(d->charsetParameter.name()).toString());
- } else {
- d->ui->charsetLineEdit->setText(d->charsetParameter.defaultValue().toString());
- }
- }
-
- if (d->portParameter.isValid()) {
- if (values.contains(d->portParameter.name())) {
- d->ui->portSpinBox->setValue(values.value(d->portParameter.name()).toUInt());
- } else {
- d->ui->portSpinBox->setValue(d->portParameter.defaultValue().toUInt());
- }
- }
-
- if (d->usernameParameter.isValid()) {
- if (values.contains(d->usernameParameter.name())) {
- d->ui->usernameLineEdit->setText(values.value(d->usernameParameter.name()).toString());
- } else {
- d->ui->usernameLineEdit->setText(d->usernameParameter.defaultValue().toString());
- }
- }
-
- if (d->useSslParameter.isValid()) {
- if (values.contains(d->useSslParameter.name())) {
- d->ui->useSslCheckBox->setChecked(values.value(d->useSslParameter.name()).toBool());
- } else {
- d->ui->useSslCheckBox->setChecked(d->useSslParameter.defaultValue().toBool());
- }
- }
-
- if (d->passwordParameter.isValid()) {
- if (values.contains(d->passwordParameter.name())) {
- d->ui->passwordLineEdit->setText(values.value(d->passwordParameter.name()).toString());
- } else {
- d->ui->passwordLineEdit->setText(d->passwordParameter.defaultValue().toString());
- }
- }
-
- // Hide any elements we don't have the parameters passed to show.
- if (!d->charsetParameter.isValid()) {
- d->ui->charsetLabel->hide();
- d->ui->charsetLineEdit->hide();
- }
-
- if (!d->portParameter.isValid()) {
- d->ui->portLabel->hide();
- d->ui->portSpinBox->hide();
- }
-
- if (!d->usernameParameter.isValid()) {
- d->ui->usernameLabel->hide();
- d->ui->usernameLineEdit->hide();
- }
-
- if (!d->useSslParameter.isValid()) {
- d->ui->useSslLabel->hide();
- d->ui->useSslCheckBox->hide();
- }
-
- if (!d->passwordParameter.isValid()) {
- d->ui->passwordLabel->hide();
- d->ui->passwordLineEdit->hide();
- }
+ // Prefill UI elements if appropriate.
+ if (d->charsetParameter.isValid()) {
+ if (values.contains(d->charsetParameter.name())) {
+ d->ui->charsetLineEdit->setText(values.value(d->charsetParameter.name()).toString());
+ } else {
+ d->ui->charsetLineEdit->setText(d->charsetParameter.defaultValue().toString());
+ }
+ }
+
+ if (d->portParameter.isValid()) {
+ if (values.contains(d->portParameter.name())) {
+ d->ui->portSpinBox->setValue(values.value(d->portParameter.name()).toUInt());
+ } else {
+ d->ui->portSpinBox->setValue(d->portParameter.defaultValue().toUInt());
+ }
+ }
+
+ if (d->usernameParameter.isValid()) {
+ if (values.contains(d->usernameParameter.name())) {
+ d->ui->usernameLineEdit->setText(values.value(d->usernameParameter.name()).toString());
+ } else {
+ d->ui->usernameLineEdit->setText(d->usernameParameter.defaultValue().toString());
+ }
+ }
+
+ if (d->useSslParameter.isValid()) {
+ if (values.contains(d->useSslParameter.name())) {
+ d->ui->useSslCheckBox->setChecked(values.value(d->useSslParameter.name()).toBool());
+ } else {
+ d->ui->useSslCheckBox->setChecked(d->useSslParameter.defaultValue().toBool());
+ }
+ }
+
+ if (d->passwordParameter.isValid()) {
+ if (values.contains(d->passwordParameter.name())) {
+ d->ui->passwordLineEdit->setText(values.value(d->passwordParameter.name()).toString());
+ } else {
+ d->ui->passwordLineEdit->setText(d->passwordParameter.defaultValue().toString());
+ }
+ }
+
+ // Hide any elements we don't have the parameters passed to show.
+ if (!d->charsetParameter.isValid()) {
+ d->ui->charsetLabel->hide();
+ d->ui->charsetLineEdit->hide();
+ }
+
+ if (!d->portParameter.isValid()) {
+ d->ui->portLabel->hide();
+ d->ui->portSpinBox->hide();
+ }
+
+ if (!d->usernameParameter.isValid()) {
+ d->ui->usernameLabel->hide();
+ d->ui->usernameLineEdit->hide();
+ }
+
+ if (!d->useSslParameter.isValid()) {
+ d->ui->useSslLabel->hide();
+ d->ui->useSslCheckBox->hide();
+ }
+
+ if (!d->passwordParameter.isValid()) {
+ d->ui->passwordLabel->hide();
+ d->ui->passwordLineEdit->hide();
+ }
}
AdvancedOptionsWidget::~AdvancedOptionsWidget()
@@ -180,7 +180,6 @@ bool AdvancedOptionsWidget::validateParameterValues()
{
kDebug();
-
return true;
}
diff --git a/idle/advanced-options-widget.h b/idle/advanced-options-widget.h
index 642e68f..0663e4e 100644
--- a/idle/advanced-options-widget.h
+++ b/idle/advanced-options-widget.h
@@ -28,7 +28,7 @@ class AdvancedOptionsWidget : public AbstractAccountParametersWidget
Q_OBJECT
public:
- explicit AdvancedOptionsWidget(Tp::ProtocolParameterList parameters,
+ explicit AdvancedOptionsWidget(const Tp::ProtocolParameterList& parameters,
const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
virtual ~AdvancedOptionsWidget();
diff --git a/idle/idle-account-ui-plugin.cpp b/idle/idle-account-ui-plugin.cpp
index 94b3d85..801f83b 100644
--- a/idle/idle-account-ui-plugin.cpp
+++ b/idle/idle-account-ui-plugin.cpp
@@ -58,8 +58,7 @@ IdleAccountUiPlugin::~IdleAccountUiPlugin()
AbstractAccountUi* IdleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
{
kDebug();
-
- // We only support butterfly/xmpp combination.
+
if ((connectionManager == "idle") && (protocol == "irc")) {
return new IdleAccountUi;
}
diff --git a/idle/idle-account-ui-plugin.h b/idle/idle-account-ui-plugin.h
index e15a313..c099007 100644
--- a/idle/idle-account-ui-plugin.h
+++ b/idle/idle-account-ui-plugin.h
@@ -33,7 +33,8 @@ public:
IdleAccountUiPlugin(QObject *parent, const QVariantList &);
virtual ~IdleAccountUiPlugin();
- virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+ virtual AbstractAccountUi* accountUi(const QString &connectionManager,
+ const QString &protocol);
private:
Q_DISABLE_COPY(IdleAccountUiPlugin);
diff --git a/idle/idle-account-ui.h b/idle/idle-account-ui.h
index c413b05..f287752 100644
--- a/idle/idle-account-ui.h
+++ b/idle/idle-account-ui.h
@@ -39,7 +39,7 @@ public:
virtual AbstractAccountParametersWidget
*advancedOptionsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values = QVariantMap(),
- QWidget *parent = 0) const;
+ QWidget *parent = 0) const;
private:
Q_DISABLE_COPY(IdleAccountUi);
diff --git a/idle/main-options-widget.cpp b/idle/main-options-widget.cpp
index 1211d7e..19743ef 100644
--- a/idle/main-options-widget.cpp
+++ b/idle/main-options-widget.cpp
@@ -42,7 +42,7 @@ public:
Ui::MainOptionsWidget *ui;
};
-MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
+MainOptionsWidget::MainOptionsWidget(const Tp::ProtocolParameterList& parameters,
const QVariantMap &values,
QWidget *parent)
: AbstractAccountParametersWidget(parameters, values, parent),
@@ -65,46 +65,46 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
d->ui = new Ui::MainOptionsWidget;
d->ui->setupUi(this);
- // Prefill UI elements if appropriate.
- if (d->accountParameter.isValid()) {
- if (values.contains(d->accountParameter.name())) {
- d->ui->accountLineEdit->setText(values.value(d->accountParameter.name()).toString());
- } else {
- d->ui->accountLineEdit->setText(d->accountParameter.defaultValue().toString());
- }
- }
-
- if (d->fullnameParameter.isValid()) {
- if (values.contains(d->fullnameParameter.name())) {
- d->ui->fullnameLineEdit->setText(values.value(d->fullnameParameter.name()).toString());
- } else {
- d->ui->fullnameLineEdit->setText(d->fullnameParameter.defaultValue().toString());
- }
- }
-
- if (d->serverParameter.isValid()) {
- if (values.contains(d->serverParameter.name())) {
- d->ui->serverLineEdit->setText(values.value(d->serverParameter.name()).toString());
- } else {
- d->ui->serverLineEdit->setText(d->serverParameter.defaultValue().toString());
- }
- }
-
-// Hide any elements we don't have the parameters passed to show.
- if (!d->accountParameter.isValid()) {
- d->ui->accountLabel->hide();
- d->ui->accountLineEdit->hide();
- }
-
- if (!d->fullnameParameter.isValid()) {
- d->ui->fullnameLabel->hide();
- d->ui->fullnameLineEdit->hide();
- }
-
- if (!d->serverParameter.isValid()) {
- d->ui->serverLabel->hide();
- d->ui->serverLineEdit->hide();
- }
+ // Prefill UI elements if appropriate.
+ if (d->accountParameter.isValid()) {
+ if (values.contains(d->accountParameter.name())) {
+ d->ui->accountLineEdit->setText(values.value(d->accountParameter.name()).toString());
+ } else {
+ d->ui->accountLineEdit->setText(d->accountParameter.defaultValue().toString());
+ }
+ }
+
+ if (d->fullnameParameter.isValid()) {
+ if (values.contains(d->fullnameParameter.name())) {
+ d->ui->fullnameLineEdit->setText(values.value(d->fullnameParameter.name()).toString());
+ } else {
+ d->ui->fullnameLineEdit->setText(d->fullnameParameter.defaultValue().toString());
+ }
+ }
+
+ if (d->serverParameter.isValid()) {
+ if (values.contains(d->serverParameter.name())) {
+ d->ui->serverLineEdit->setText(values.value(d->serverParameter.name()).toString());
+ } else {
+ d->ui->serverLineEdit->setText(d->serverParameter.defaultValue().toString());
+ }
+ }
+
+ // Hide any elements we don't have the parameters passed to show.
+ if (!d->accountParameter.isValid()) {
+ d->ui->accountLabel->hide();
+ d->ui->accountLineEdit->hide();
+ }
+
+ if (!d->fullnameParameter.isValid()) {
+ d->ui->fullnameLabel->hide();
+ d->ui->fullnameLineEdit->hide();
+ }
+
+ if (!d->serverParameter.isValid()) {
+ d->ui->serverLabel->hide();
+ d->ui->serverLineEdit->hide();
+ }
}
MainOptionsWidget::~MainOptionsWidget()
diff --git a/idle/main-options-widget.h b/idle/main-options-widget.h
index a9a9be5..30fe4cd 100644
--- a/idle/main-options-widget.h
+++ b/idle/main-options-widget.h
@@ -28,7 +28,7 @@ class MainOptionsWidget : public AbstractAccountParametersWidget
Q_OBJECT
public:
- explicit MainOptionsWidget(Tp::ProtocolParameterList parameters,
+ explicit MainOptionsWidget(const Tp::ProtocolParameterList& parameters,
const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
virtual ~MainOptionsWidget();
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list