[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:00:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=220e3ef
The following commit has been merged in the master branch:
commit 220e3efdae2b3b0135c6bdc0fd19cbb336aab445
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 12:31:53 2011 +0100
Cleanup
---
plugins/butterfly/butterfly-account-ui-plugin.cpp | 2 +-
plugins/butterfly/butterfly-account-ui.cpp | 1 -
plugins/butterfly/main-options-widget.cpp | 1 -
plugins/gabble/gabble-account-ui.cpp | 1 -
plugins/gabble/main-options-widget-facebook.cpp | 1 -
plugins/gabble/main-options-widget-googletalk.cpp | 1 -
plugins/gabble/proxy-settings-widget.cpp | 1 -
plugins/gabble/server-settings-widget.cpp | 1 -
plugins/haze/aim-server-settings-widget.cpp | 2 --
plugins/haze/haze-aim-account.cpp | 2 --
plugins/haze/haze-icq-account.cpp | 1 -
plugins/haze/haze-skype-account-ui.cpp | 1 -
plugins/haze/icq-main-options-widget.cpp | 1 -
plugins/haze/icq-server-settings-widget.cpp | 1 -
plugins/haze/myspaceim-main-options-widget.cpp | 1 -
plugins/haze/skype-main-options-widget.cpp | 1 -
plugins/idle/advanced-options-widget.cpp | 1 -
plugins/idle/idle-account-ui.cpp | 1 -
src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp | 7 +++----
src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp | 1 -
src/KCMTelepathyAccounts/abstract-account-ui.cpp | 2 --
src/KCMTelepathyAccounts/account-edit-widget.cpp | 8 ++++----
src/KCMTelepathyAccounts/account-edit-widget.ui | 8 ++++----
src/KCMTelepathyAccounts/feedback-widget.h | 2 +-
src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp | 1 -
src/KCMTelepathyAccounts/parameter-edit-delegate.cpp | 1 -
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 3 +--
src/KCMTelepathyAccounts/parameter-edit-model.h | 5 -----
src/KCMTelepathyAccounts/parameter-edit-widget.cpp | 1 -
src/KCMTelepathyAccounts/plugin-manager.cpp | 1 -
src/KCMTelepathyAccounts/profile-item.cpp | 1 -
src/KCMTelepathyAccounts/profile-list-model.cpp | 1 -
src/KCMTelepathyAccounts/profile-select-widget.cpp | 1 -
src/add-account-assistant.cpp | 1 -
src/edit-account-dialog.cpp | 1 -
35 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/plugins/butterfly/butterfly-account-ui-plugin.cpp b/plugins/butterfly/butterfly-account-ui-plugin.cpp
index 9e2364b..cdb601b 100644
--- a/plugins/butterfly/butterfly-account-ui-plugin.cpp
+++ b/plugins/butterfly/butterfly-account-ui-plugin.cpp
@@ -46,7 +46,7 @@ AbstractAccountUi* ButterflyAccountUiPlugin::accountUi(const QString &connection
Q_UNUSED(serviceName);
kDebug();
-
+
// We only support butterfly/xmpp combination.
if ((connectionManager == QLatin1String("butterfly")) && (protocol == QLatin1String("msn"))) {
return new ButterflyAccountUi;
diff --git a/plugins/butterfly/butterfly-account-ui.cpp b/plugins/butterfly/butterfly-account-ui.cpp
index 2e47a15..051f1a5 100644
--- a/plugins/butterfly/butterfly-account-ui.cpp
+++ b/plugins/butterfly/butterfly-account-ui.cpp
@@ -50,4 +50,3 @@ AbstractAccountParametersWidget *ButterflyAccountUi::mainOptionsWidget(
}
#include "butterfly-account-ui.moc"
-
diff --git a/plugins/butterfly/main-options-widget.cpp b/plugins/butterfly/main-options-widget.cpp
index 79b3287..747d052 100644
--- a/plugins/butterfly/main-options-widget.cpp
+++ b/plugins/butterfly/main-options-widget.cpp
@@ -46,4 +46,3 @@ MainOptionsWidget::~MainOptionsWidget()
}
#include "main-options-widget.moc"
-
diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index 5f6df72..21eb4b3 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -103,4 +103,3 @@ AbstractAccountParametersWidget *GabbleAccountUi::advancedOptionsWidget(
#include "gabble-account-ui.moc"
-
diff --git a/plugins/gabble/main-options-widget-facebook.cpp b/plugins/gabble/main-options-widget-facebook.cpp
index 6b4e80d..b78ed77 100644
--- a/plugins/gabble/main-options-widget-facebook.cpp
+++ b/plugins/gabble/main-options-widget-facebook.cpp
@@ -86,4 +86,3 @@ bool MainOptionsWidgetFacebook::validateParameterValues()
#include "main-options-widget-facebook.moc"
-
diff --git a/plugins/gabble/main-options-widget-googletalk.cpp b/plugins/gabble/main-options-widget-googletalk.cpp
index a958108..dee67ea 100644
--- a/plugins/gabble/main-options-widget-googletalk.cpp
+++ b/plugins/gabble/main-options-widget-googletalk.cpp
@@ -45,4 +45,3 @@ MainOptionsWidgetGoogleTalk::~MainOptionsWidgetGoogleTalk()
}
#include "main-options-widget-googletalk.moc"
-
diff --git a/plugins/gabble/proxy-settings-widget.cpp b/plugins/gabble/proxy-settings-widget.cpp
index dbe4683..49c936d 100644
--- a/plugins/gabble/proxy-settings-widget.cpp
+++ b/plugins/gabble/proxy-settings-widget.cpp
@@ -51,4 +51,3 @@ ProxySettingsWidget::~ProxySettingsWidget()
#include "proxy-settings-widget.moc"
-
diff --git a/plugins/gabble/server-settings-widget.cpp b/plugins/gabble/server-settings-widget.cpp
index 8c0d9a9..6b19e4d 100644
--- a/plugins/gabble/server-settings-widget.cpp
+++ b/plugins/gabble/server-settings-widget.cpp
@@ -52,4 +52,3 @@ ServerSettingsWidget::~ServerSettingsWidget()
#include "server-settings-widget.moc"
-
diff --git a/plugins/haze/aim-server-settings-widget.cpp b/plugins/haze/aim-server-settings-widget.cpp
index b875ae8..63e707f 100644
--- a/plugins/haze/aim-server-settings-widget.cpp
+++ b/plugins/haze/aim-server-settings-widget.cpp
@@ -49,5 +49,3 @@ AimServerSettingsWidget::~AimServerSettingsWidget()
delete m_ui;
}
-
-
diff --git a/plugins/haze/haze-aim-account.cpp b/plugins/haze/haze-aim-account.cpp
index ed44ee3..70c3500 100644
--- a/plugins/haze/haze-aim-account.cpp
+++ b/plugins/haze/haze-aim-account.cpp
@@ -70,5 +70,3 @@ AbstractAccountParametersWidget *HazeAimAccount::advancedOptionsWidget(
return new AimServerSettingsWidget(model, parent);
}
-
-
diff --git a/plugins/haze/haze-icq-account.cpp b/plugins/haze/haze-icq-account.cpp
index 8703d88..c3efc0d 100644
--- a/plugins/haze/haze-icq-account.cpp
+++ b/plugins/haze/haze-icq-account.cpp
@@ -76,4 +76,3 @@ AbstractAccountParametersWidget *HazeIcqAccountUi::advancedOptionsWidget(
#include "haze-icq-account.moc"
-
diff --git a/plugins/haze/haze-skype-account-ui.cpp b/plugins/haze/haze-skype-account-ui.cpp
index f0dcdc5..dc4e10a 100644
--- a/plugins/haze/haze-skype-account-ui.cpp
+++ b/plugins/haze/haze-skype-account-ui.cpp
@@ -73,4 +73,3 @@ AbstractAccountParametersWidget *HazeSkypeAccountUi::advancedOptionsWidget(
#include "haze-skype-account-ui.moc"
-
diff --git a/plugins/haze/icq-main-options-widget.cpp b/plugins/haze/icq-main-options-widget.cpp
index fc3d6c4..7db0b44 100644
--- a/plugins/haze/icq-main-options-widget.cpp
+++ b/plugins/haze/icq-main-options-widget.cpp
@@ -45,4 +45,3 @@ IcqMainOptionsWidget::~IcqMainOptionsWidget()
}
#include "icq-main-options-widget.moc"
-
diff --git a/plugins/haze/icq-server-settings-widget.cpp b/plugins/haze/icq-server-settings-widget.cpp
index 8fcbef0..fd5be35 100644
--- a/plugins/haze/icq-server-settings-widget.cpp
+++ b/plugins/haze/icq-server-settings-widget.cpp
@@ -48,4 +48,3 @@ IcqServerSettingsWidget::~IcqServerSettingsWidget()
}
#include "icq-server-settings-widget.moc"
-
diff --git a/plugins/haze/myspaceim-main-options-widget.cpp b/plugins/haze/myspaceim-main-options-widget.cpp
index d4df4b0..8e1e5b5 100644
--- a/plugins/haze/myspaceim-main-options-widget.cpp
+++ b/plugins/haze/myspaceim-main-options-widget.cpp
@@ -45,4 +45,3 @@ MySpaceIMMainOptionsWidget::~MySpaceIMMainOptionsWidget()
}
#include "myspaceim-main-options-widget.moc"
-
diff --git a/plugins/haze/skype-main-options-widget.cpp b/plugins/haze/skype-main-options-widget.cpp
index fe163b0..cf2caea 100644
--- a/plugins/haze/skype-main-options-widget.cpp
+++ b/plugins/haze/skype-main-options-widget.cpp
@@ -62,4 +62,3 @@ SkypeMainOptionsWidget::~SkypeMainOptionsWidget()
}
#include "skype-main-options-widget.moc"
-
diff --git a/plugins/idle/advanced-options-widget.cpp b/plugins/idle/advanced-options-widget.cpp
index c4beab7..33dde1b 100644
--- a/plugins/idle/advanced-options-widget.cpp
+++ b/plugins/idle/advanced-options-widget.cpp
@@ -48,4 +48,3 @@ AdvancedOptionsWidget::~AdvancedOptionsWidget()
}
#include "advanced-options-widget.moc"
-
diff --git a/plugins/idle/idle-account-ui.cpp b/plugins/idle/idle-account-ui.cpp
index 8672f2a..2f97ef2 100644
--- a/plugins/idle/idle-account-ui.cpp
+++ b/plugins/idle/idle-account-ui.cpp
@@ -72,4 +72,3 @@ AbstractAccountParametersWidget *IdleAccountUi::advancedOptionsWidget(
}
#include "idle-account-ui.moc"
-
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index 424f52a..bffb858 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -39,7 +39,7 @@ class AbstractAccountParametersWidget::Private
public:
Private()
: parameterModel(0),
- mapper(0)
+ mapper(0)
{
kDebug();
}
@@ -139,9 +139,9 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
ValidatedLineEdit *validated = qobject_cast<ValidatedLineEdit*>(dataWidget);
if(validated) {
d->validatedWidgets.insert(index, validated);
- }
+ }
- if (! (index.flags() & Qt::ItemIsEnabled)) {
+ if (! (index.flags() & Qt::ItemIsEnabled)) {
dataWidget->setEnabled(false);
}
}
@@ -165,4 +165,3 @@ ParameterEditModel* AbstractAccountParametersWidget::parameterModel() const
#include "abstract-account-parameters-widget.moc"
-
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
index 861aea8..27ee516 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
@@ -73,4 +73,3 @@ void AbstractAccountUiPlugin::registerProvidedProtocol(const QString &connection
#include "abstract-account-ui-plugin.moc"
-
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui.cpp b/src/KCMTelepathyAccounts/abstract-account-ui.cpp
index b39f12f..25e2853 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-ui.cpp
@@ -81,6 +81,4 @@ void AbstractAccountUi::registerSupportedParameter(const QString &name, QVariant
}
-
#include "abstract-account-ui.moc"
-
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index ac2ffae..09ea176 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -101,10 +101,10 @@ AccountEditWidget::AccountEditWidget(const Tp::ProfilePtr &profile,
d->ui->iconLabel->setText("");
d->ui->iconLabel->setPixmap(KIcon(profile->iconName()).pixmap(32));
- if(connectOnAddFlag == doConnectOnAdd){
- d->connectOnAdd = new QCheckBox(i18n("Connect when wizard is finished"), this);
- d->connectOnAdd->setChecked(true);
- d->ui->verticalLayout->addWidget(d->connectOnAdd);
+ if(connectOnAddFlag == doConnectOnAdd) {
+ d->connectOnAdd = new QCheckBox(i18n("Connect when wizard is finished"), this);
+ d->connectOnAdd->setChecked(true);
+ d->ui->verticalLayout->addWidget(d->connectOnAdd);
}
else{
d->connectOnAdd = 0;
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.ui b/src/KCMTelepathyAccounts/account-edit-widget.ui
index 986194b..0ffd782 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.ui
+++ b/src/KCMTelepathyAccounts/account-edit-widget.ui
@@ -15,7 +15,7 @@
<number>0</number>
</property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="titleLabel">
<property name="font">
@@ -33,7 +33,7 @@
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_2">
+ <spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -55,7 +55,7 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="advancedButton">
<property name="text">
@@ -64,7 +64,7 @@
</widget>
</item>
<item>
- <spacer name="horizontalSpacer">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
diff --git a/src/KCMTelepathyAccounts/feedback-widget.h b/src/KCMTelepathyAccounts/feedback-widget.h
index 5a8f6a1..8fef29f 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.h
+++ b/src/KCMTelepathyAccounts/feedback-widget.h
@@ -32,7 +32,7 @@ class QTimer;
class FeedbackWidget : public KMessageWidget
{
-Q_OBJECT
+ Q_OBJECT
public:
FeedbackWidget(QWidget *parent = 0);
virtual ~FeedbackWidget();
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index fae56d1..94f9c06 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -94,4 +94,3 @@ void GenericAdvancedOptionsWidget::addTab(AbstractAccountParametersWidget* tab,
#include "generic-advanced-options-widget.moc"
-
diff --git a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
index e7cfd74..212c85e 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
@@ -226,4 +226,3 @@ void ParameterEditDelegate::onSpinBoxValueChanged(int value)
#include "parameter-edit-delegate.moc"
-
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 04f2501..2c380a9 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -73,8 +73,7 @@ QVariant ParameterEditModel::data(const QModelIndex &index, int role) const
case Qt::EditRole:
case ParameterEditModel::ValueRole:
data = QVariant(m_items.at(index.row())->value());
- if(!data.isValid())
- {
+ if(!data.isValid()) {
data = this->data(index, ParameterEditModel::DefaultValueRole);
}
break;
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index eff253b..90b0fe6 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -34,11 +34,6 @@
class ParameterItem;
-namespace Tp {
- class Profile;
- class Parameter;
-}
-
class KCM_TELEPATHY_ACCOUNTS_EXPORT ParameterEditModel : public QAbstractListModel
{
Q_OBJECT
diff --git a/src/KCMTelepathyAccounts/parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
index 77acfe1..2ed0f93 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
@@ -75,4 +75,3 @@ void ParameterEditWidget::onDelegateDataChanged(const QModelIndex &index, const
}
#include "parameter-edit-widget.moc"
-
diff --git a/src/KCMTelepathyAccounts/plugin-manager.cpp b/src/KCMTelepathyAccounts/plugin-manager.cpp
index 7f6aeb6..83574f9 100644
--- a/src/KCMTelepathyAccounts/plugin-manager.cpp
+++ b/src/KCMTelepathyAccounts/plugin-manager.cpp
@@ -113,4 +113,3 @@ AbstractAccountUi *PluginManager::accountUiForProtocol(const QString &connection
#include "plugin-manager.moc"
-
diff --git a/src/KCMTelepathyAccounts/profile-item.cpp b/src/KCMTelepathyAccounts/profile-item.cpp
index 099c71e..a84758e 100644
--- a/src/KCMTelepathyAccounts/profile-item.cpp
+++ b/src/KCMTelepathyAccounts/profile-item.cpp
@@ -100,4 +100,3 @@ void ProfileItem::generateIcon()
}
#include "profile-item.moc"
-
diff --git a/src/KCMTelepathyAccounts/profile-list-model.cpp b/src/KCMTelepathyAccounts/profile-list-model.cpp
index fbd9e50..19654ef 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.cpp
+++ b/src/KCMTelepathyAccounts/profile-list-model.cpp
@@ -164,4 +164,3 @@ void ProfileListModel::onConnectionManagerNamesFetched(Tp::PendingOperation *ope
#include "profile-list-model.moc"
-
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.cpp b/src/KCMTelepathyAccounts/profile-select-widget.cpp
index 0800df3..cfa3344 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/profile-select-widget.cpp
@@ -150,4 +150,3 @@ void ProfileSelectWidget::onSelectionChanged(const QItemSelection &selected)
#include "profile-select-widget.moc"
-
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 6ca2993..56e7ed6 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -367,4 +367,3 @@ void AddAccountAssistant::pageThree()
}
#include "add-account-assistant.moc"
-
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 11c3199..29ce640 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -193,4 +193,3 @@ void EditAccountDialog::onDisplayNameUpdated(Tp::PendingOperation *op)
}
#include "edit-account-dialog.moc"
-
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list