[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:59:11 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=4305d65
The following commit has been merged in the master branch:
commit 4305d653852db8b16ebfa7f263f43187e4595973
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date: Wed Feb 16 15:34:55 2011 +0100
Remove useless private classes, cleanup includes.
---
butterfly/butterfly-account-ui-plugin.cpp | 12 +--------
butterfly/butterfly-account-ui-plugin.h | 3 ---
butterfly/butterfly-account-ui.cpp | 14 +---------
butterfly/butterfly-account-ui.h | 3 ---
butterfly/main-options-widget.cpp | 28 +++++---------------
butterfly/main-options-widget.h | 6 ++---
gabble/gabble-account-ui-plugin.cpp | 12 +--------
gabble/gabble-account-ui-plugin.h | 3 ---
gabble/gabble-account-ui.cpp | 14 +---------
gabble/gabble-account-ui.h | 3 ---
gabble/main-options-widget.cpp | 29 +++++----------------
gabble/main-options-widget.h | 7 ++---
gabble/proxy-settings-widget.cpp | 43 ++++++++++---------------------
gabble/proxy-settings-widget.h | 6 ++---
gabble/server-settings-widget.cpp | 41 +++++++++--------------------
gabble/server-settings-widget.h | 6 ++---
haze/haze-account-ui-plugin.cpp | 12 +--------
haze/haze-account-ui-plugin.h | 3 ---
haze/haze-icq-account.cpp | 24 ++++-------------
haze/haze-icq-account.h | 3 ---
haze/haze-yahoo-account.cpp | 13 ++--------
haze/haze-yahoo-account.h | 4 ---
haze/icq-main-options-widget.cpp | 30 +++++----------------
haze/icq-main-options-widget.h | 6 ++---
haze/icq-server-settings-widget.cpp | 39 ++++++++--------------------
haze/icq-server-settings-widget.h | 6 ++---
haze/yahoo-main-options-widget.cpp | 26 +++++--------------
haze/yahoo-main-options-widget.h | 4 +--
idle/advanced-options-widget.cpp | 36 +++++++-------------------
idle/advanced-options-widget.h | 6 ++---
idle/idle-account-ui-plugin.cpp | 12 +--------
idle/idle-account-ui-plugin.h | 3 ---
idle/idle-account-ui.cpp | 14 +---------
idle/idle-account-ui.h | 3 ---
idle/main-options-widget.cpp | 34 +++++-------------------
idle/main-options-widget.h | 6 ++---
rakia/rakia-account-ui-plugin.cpp | 1 -
rakia/rakia-account-ui.cpp | 1 -
rakia/rakia-advanced-options-widget.cpp | 3 ++-
rakia/rakia-advanced-options-widget.h | 5 ++--
rakia/rakia-main-options-widget.h | 3 ++-
41 files changed, 124 insertions(+), 403 deletions(-)
diff --git a/butterfly/butterfly-account-ui-plugin.cpp b/butterfly/butterfly-account-ui-plugin.cpp
index 5efa8af..05fa40b 100644
--- a/butterfly/butterfly-account-ui-plugin.cpp
+++ b/butterfly/butterfly-account-ui-plugin.cpp
@@ -29,18 +29,8 @@
#include <QtCore/QVariantList>
-class ButterflyAccountUiPlugin::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
ButterflyAccountUiPlugin::ButterflyAccountUiPlugin(QObject *parent, const QVariantList &)
- : AbstractAccountUiPlugin(parent),
- d(new Private)
+ : AbstractAccountUiPlugin(parent)
{
kDebug();
diff --git a/butterfly/butterfly-account-ui-plugin.h b/butterfly/butterfly-account-ui-plugin.h
index 8c027d5..aa6c14c 100644
--- a/butterfly/butterfly-account-ui-plugin.h
+++ b/butterfly/butterfly-account-ui-plugin.h
@@ -37,9 +37,6 @@ public:
private:
Q_DISABLE_COPY(ButterflyAccountUiPlugin);
-
- class Private;
- Private * const d;
};
diff --git a/butterfly/butterfly-account-ui.cpp b/butterfly/butterfly-account-ui.cpp
index 67fc5f7..0e36ca6 100644
--- a/butterfly/butterfly-account-ui.cpp
+++ b/butterfly/butterfly-account-ui.cpp
@@ -26,18 +26,8 @@
#include <KDebug>
-class ButterflyAccountUi::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
ButterflyAccountUi::ButterflyAccountUi(QObject *parent)
- : AbstractAccountUi(parent),
- d(new Private)
+ : AbstractAccountUi(parent)
{
kDebug();
@@ -49,8 +39,6 @@ ButterflyAccountUi::ButterflyAccountUi(QObject *parent)
ButterflyAccountUi::~ButterflyAccountUi()
{
kDebug();
-
- delete d;
}
AbstractAccountParametersWidget *ButterflyAccountUi::mainOptionsWidget(
diff --git a/butterfly/butterfly-account-ui.h b/butterfly/butterfly-account-ui.h
index 248f946..b768a18 100644
--- a/butterfly/butterfly-account-ui.h
+++ b/butterfly/butterfly-account-ui.h
@@ -36,9 +36,6 @@ public:
QWidget *parent = 0) const;
private:
Q_DISABLE_COPY(ButterflyAccountUi);
-
- class Private;
- Private * const d;
};
diff --git a/butterfly/main-options-widget.cpp b/butterfly/main-options-widget.cpp
index e8c5717..97a79e1 100644
--- a/butterfly/main-options-widget.cpp
+++ b/butterfly/main-options-widget.cpp
@@ -20,43 +20,27 @@
#include "main-options-widget.h"
-#include "ui_main-options-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-class MainOptionsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::MainOptionsWidget *ui;
-};
MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::MainOptionsWidget;
- d->ui->setupUi(this);
+ m_ui = new Ui::MainOptionsWidget;
+ m_ui->setupUi(this);
- handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
- handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
+ handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
MainOptionsWidget::~MainOptionsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
#include "main-options-widget.moc"
diff --git a/butterfly/main-options-widget.h b/butterfly/main-options-widget.h
index ec7ca34..9aee8bc 100644
--- a/butterfly/main-options-widget.h
+++ b/butterfly/main-options-widget.h
@@ -23,6 +23,8 @@
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+#include "ui_main-options-widget.h"
+
class MainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
@@ -34,9 +36,7 @@ public:
private:
Q_DISABLE_COPY(MainOptionsWidget);
-
- class Private;
- Private * const d;
+ Ui::MainOptionsWidget *m_ui;
};
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index ae9f79a..62f2e8a 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -29,18 +29,8 @@
#include <QtCore/QVariantList>
-class GabbleAccountUiPlugin::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
GabbleAccountUiPlugin::GabbleAccountUiPlugin(QObject *parent, const QVariantList &)
- : AbstractAccountUiPlugin(parent),
- d(new Private)
+ : AbstractAccountUiPlugin(parent)
{
kDebug();
diff --git a/gabble/gabble-account-ui-plugin.h b/gabble/gabble-account-ui-plugin.h
index 76de025..a9cbbdb 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/gabble/gabble-account-ui-plugin.h
@@ -37,9 +37,6 @@ public:
private:
Q_DISABLE_COPY(GabbleAccountUiPlugin);
-
- class Private;
- Private * const d;
};
diff --git a/gabble/gabble-account-ui.cpp b/gabble/gabble-account-ui.cpp
index 4a1ea98..4f6a8a3 100644
--- a/gabble/gabble-account-ui.cpp
+++ b/gabble/gabble-account-ui.cpp
@@ -29,18 +29,8 @@
#include <KDebug>
-class GabbleAccountUi::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
GabbleAccountUi::GabbleAccountUi(QObject *parent)
- : AbstractAccountUi(parent),
- d(new Private)
+ : AbstractAccountUi(parent)
{
kDebug();
@@ -69,8 +59,6 @@ GabbleAccountUi::GabbleAccountUi(QObject *parent)
GabbleAccountUi::~GabbleAccountUi()
{
kDebug();
-
- delete d;
}
AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
diff --git a/gabble/gabble-account-ui.h b/gabble/gabble-account-ui.h
index 2b828e3..32e4339 100644
--- a/gabble/gabble-account-ui.h
+++ b/gabble/gabble-account-ui.h
@@ -41,9 +41,6 @@ public:
private:
Q_DISABLE_COPY(GabbleAccountUi);
-
- class Private;
- Private * const d;
};
#endif // header guard
diff --git a/gabble/main-options-widget.cpp b/gabble/main-options-widget.cpp
index 333e0b4..97a79e1 100644
--- a/gabble/main-options-widget.cpp
+++ b/gabble/main-options-widget.cpp
@@ -20,44 +20,27 @@
#include "main-options-widget.h"
-#include "ui_main-options-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-
-class MainOptionsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::MainOptionsWidget *ui;
-};
MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::MainOptionsWidget;
- d->ui->setupUi(this);
+ m_ui = new Ui::MainOptionsWidget;
+ m_ui->setupUi(this);
- handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
- handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
+ handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
MainOptionsWidget::~MainOptionsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
#include "main-options-widget.moc"
diff --git a/gabble/main-options-widget.h b/gabble/main-options-widget.h
index 7b04473..d0de76e 100644
--- a/gabble/main-options-widget.h
+++ b/gabble/main-options-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
+#include "ui_main-options-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
class MainOptionsWidget : public AbstractAccountParametersWidget
@@ -34,9 +36,8 @@ public:
private:
Q_DISABLE_COPY(MainOptionsWidget);
-
- class Private;
- Private * const d;
+
+ Ui::MainOptionsWidget *m_ui;
};
#endif // header guard
diff --git a/gabble/proxy-settings-widget.cpp b/gabble/proxy-settings-widget.cpp
index f68fe36..40727c7 100644
--- a/gabble/proxy-settings-widget.cpp
+++ b/gabble/proxy-settings-widget.cpp
@@ -20,50 +20,33 @@
#include "proxy-settings-widget.h"
-#include "ui_proxy-settings-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-
-class ProxySettingsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::ProxySettingsWidget *ui;
-};
ProxySettingsWidget::ProxySettingsWidget(ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::ProxySettingsWidget;
- d->ui->setupUi(this);
-
- handleParameter("stun-server", QVariant::String, d->ui->stunServerLineEdit, d->ui->stunServerLabel);
- handleParameter("stun-port", QVariant::UInt, d->ui->stunPortSpinBox, d->ui->stunPortLabel);
- handleParameter("fallback-stun-server", QVariant::String, d->ui->fallbackStunServerLineEdit, d->ui->fallbackStunServerLabel);
- handleParameter("fallback-stun-port", QVariant::UInt, d->ui->fallbackStunPortSpinBox, d->ui->fallbackStunPortLabel);
- handleParameter("https-proxy-server", QVariant::String, d->ui->httpsProxyServerLineEdit, d->ui->httpsProxyServerLabel);
- handleParameter("https-proxy-port", QVariant::UInt, d->ui->httpsProxyPortSpinBox, d->ui->httpsProxyPortLabel);
- handleParameter("fallback-socks5-proxies", QVariant::StringList, d->ui->fallbackSocks5ProxiesTextEdit, d->ui->fallbackSocks5ProxiesLabel);
- handleParameter("fallback-conference-server", QVariant::String, d->ui->fallbackConferenceServerLineEdit, d->ui->fallbackConferenceServerLabel);
+ m_ui = new Ui::ProxySettingsWidget;
+ m_ui->setupUi(this);
+
+ handleParameter("stun-server", QVariant::String, m_ui->stunServerLineEdit, m_ui->stunServerLabel);
+ handleParameter("stun-port", QVariant::UInt, m_ui->stunPortSpinBox, m_ui->stunPortLabel);
+ handleParameter("fallback-stun-server", QVariant::String, m_ui->fallbackStunServerLineEdit, m_ui->fallbackStunServerLabel);
+ handleParameter("fallback-stun-port", QVariant::UInt, m_ui->fallbackStunPortSpinBox, m_ui->fallbackStunPortLabel);
+ handleParameter("https-proxy-server", QVariant::String, m_ui->httpsProxyServerLineEdit, m_ui->httpsProxyServerLabel);
+ handleParameter("https-proxy-port", QVariant::UInt, m_ui->httpsProxyPortSpinBox, m_ui->httpsProxyPortLabel);
+ handleParameter("fallback-socks5-proxies", QVariant::StringList, m_ui->fallbackSocks5ProxiesTextEdit, m_ui->fallbackSocks5ProxiesLabel);
+ handleParameter("fallback-conference-server", QVariant::String, m_ui->fallbackConferenceServerLineEdit, m_ui->fallbackConferenceServerLabel);
}
ProxySettingsWidget::~ProxySettingsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
diff --git a/gabble/proxy-settings-widget.h b/gabble/proxy-settings-widget.h
index 55777a7..0abec3a 100644
--- a/gabble/proxy-settings-widget.h
+++ b/gabble/proxy-settings-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_PROXY_SETTINGS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_PROXY_SETTINGS_WIDGET_H
+#include "ui_proxy-settings-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
class ProxySettingsWidget : public AbstractAccountParametersWidget
@@ -34,9 +36,7 @@ public:
private:
Q_DISABLE_COPY(ProxySettingsWidget);
-
- class Private;
- Private * const d;
+ Ui::ProxySettingsWidget *m_ui;
};
diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index 9bc2fe2..7bb9ee0 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -20,49 +20,32 @@
#include "server-settings-widget.h"
-#include "ui_server-settings-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-
-class ServerSettingsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::ServerSettingsWidget *ui;
-};
ServerSettingsWidget::ServerSettingsWidget(ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::ServerSettingsWidget;
- d->ui->setupUi(this);
-
- handleParameter("server", QVariant::String, d->ui->serverLineEdit, d->ui->serverLabel);
- handleParameter("port", QVariant::UInt, d->ui->portSpinBox, d->ui->portLabel);
- handleParameter("keepalive-interval", QVariant::UInt, d->ui->keepaliveIntervalSpinBox, 0);
- handleParameter("low-bandwidth", QVariant::Bool, d->ui->lowBandwidthCheckBox, 0);
- handleParameter("require-encryption", QVariant::Bool, d->ui->requireEncryptionCheckBox, 0);
- handleParameter("ignore-ssl-errors", QVariant::Bool, d->ui->ignoreSslErrorsCheckBox, 0);
- handleParameter("old-ssl", QVariant::Bool, d->ui->oldSslCheckBox, 0);
+ m_ui = new Ui::ServerSettingsWidget;
+ m_ui->setupUi(this);
+
+ handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter("port", QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
+ handleParameter("keepalive-interval", QVariant::UInt, m_ui->keepaliveIntervalSpinBox, 0);
+ handleParameter("low-bandwidth", QVariant::Bool, m_ui->lowBandwidthCheckBox, 0);
+ handleParameter("require-encryption", QVariant::Bool, m_ui->requireEncryptionCheckBox, 0);
+ handleParameter("ignore-ssl-errors", QVariant::Bool, m_ui->ignoreSslErrorsCheckBox, 0);
+ handleParameter("old-ssl", QVariant::Bool, m_ui->oldSslCheckBox, 0);
}
ServerSettingsWidget::~ServerSettingsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
diff --git a/gabble/server-settings-widget.h b/gabble/server-settings-widget.h
index 504797e..1237c9e 100644
--- a/gabble/server-settings-widget.h
+++ b/gabble/server-settings-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_SERVER_SETTINGS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_SERVER_SETTINGS_WIDGET_H
+#include "ui_server-settings-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
class ServerSettingsWidget : public AbstractAccountParametersWidget
@@ -34,9 +36,7 @@ public:
private:
Q_DISABLE_COPY(ServerSettingsWidget);
-
- class Private;
- Private * const d;
+ Ui::ServerSettingsWidget *m_ui;
};
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 2e5a386..415ebaa 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -30,18 +30,8 @@
#include <QtCore/QVariantList>
-class HazeAccountUiPlugin::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
- : AbstractAccountUiPlugin(parent),
- d(new Private)
+ : AbstractAccountUiPlugin(parent)
{
kDebug();
diff --git a/haze/haze-account-ui-plugin.h b/haze/haze-account-ui-plugin.h
index 28d7b43..c487108 100644
--- a/haze/haze-account-ui-plugin.h
+++ b/haze/haze-account-ui-plugin.h
@@ -37,9 +37,6 @@ public:
private:
Q_DISABLE_COPY(HazeAccountUiPlugin);
-
- class Private;
- Private * const d;
};
diff --git a/haze/haze-icq-account.cpp b/haze/haze-icq-account.cpp
index 5bc662a..51d0cd7 100644
--- a/haze/haze-icq-account.cpp
+++ b/haze/haze-icq-account.cpp
@@ -18,30 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <KDebug>
-
-
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
+#include "haze-icq-account.h"
#include "icq-main-options-widget.h"
#include "icq-server-settings-widget.h"
-#include "haze-icq-account.h"
-
-
+#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
-class HazeIcqAccountUi::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
+#include <KDebug>
HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
- : AbstractAccountUi(parent), d(new Private)
+ : AbstractAccountUi(parent)
{
kDebug();
@@ -61,8 +49,6 @@ HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
HazeIcqAccountUi::~HazeIcqAccountUi()
{
kDebug();
-
- delete d;
}
AbstractAccountParametersWidget *HazeIcqAccountUi::mainOptionsWidget(
diff --git a/haze/haze-icq-account.h b/haze/haze-icq-account.h
index d90c789..42c92ca 100644
--- a/haze/haze-icq-account.h
+++ b/haze/haze-icq-account.h
@@ -41,9 +41,6 @@ public:
private:
Q_DISABLE_COPY(HazeIcqAccountUi);
-
- class Private;
- Private * const d;
};
#endif // header guard
diff --git a/haze/haze-yahoo-account.cpp b/haze/haze-yahoo-account.cpp
index 96fda32..7cdad17 100644
--- a/haze/haze-yahoo-account.cpp
+++ b/haze/haze-yahoo-account.cpp
@@ -19,19 +19,11 @@
*/
#include "haze-yahoo-account.h"
-#include <KDebug>
-class HazeYahooAccount::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
+#include <KDebug>
HazeYahooAccount::HazeYahooAccount(QObject* parent)
- : AbstractAccountUi(parent), d(new Private)
+ : AbstractAccountUi(parent)
{
kDebug();
@@ -44,7 +36,6 @@ HazeYahooAccount::HazeYahooAccount(QObject* parent)
HazeYahooAccount::~HazeYahooAccount()
{
kDebug();
- delete d;
}
bool HazeYahooAccount::hasAdvancedOptionsWidget() const
diff --git a/haze/haze-yahoo-account.h b/haze/haze-yahoo-account.h
index 1f94f44..00fed24 100644
--- a/haze/haze-yahoo-account.h
+++ b/haze/haze-yahoo-account.h
@@ -43,10 +43,6 @@ public:
private:
Q_DISABLE_COPY(HazeYahooAccount);
-
- class Private;
- Private * const d;
-
};
#endif // header guard
diff --git a/haze/icq-main-options-widget.cpp b/haze/icq-main-options-widget.cpp
index 3faa1af..a536596 100644
--- a/haze/icq-main-options-widget.cpp
+++ b/haze/icq-main-options-widget.cpp
@@ -20,47 +20,31 @@
#include "icq-main-options-widget.h"
-#include "ui_icq-main-options-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
+
#include <QVariant>
#include <QCheckBox>
#include <QComboBox>
-class IcqMainOptionsWidget::Private
-{
-
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::IcqMainOptionsWidget *ui;
-};
-
IcqMainOptionsWidget::IcqMainOptionsWidget(ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::IcqMainOptionsWidget;
- d->ui->setupUi(this);
+ m_ui = new Ui::IcqMainOptionsWidget;
+ m_ui->setupUi(this);
- handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
- handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
+ handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
IcqMainOptionsWidget::~IcqMainOptionsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
#include "icq-main-options-widget.moc"
diff --git a/haze/icq-main-options-widget.h b/haze/icq-main-options-widget.h
index ffe340b..6c3c0cf 100644
--- a/haze/icq-main-options-widget.h
+++ b/haze/icq-main-options-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_PARAMETERS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_PARAMETERS_WIDGET_H
+#include "ui_icq-main-options-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
#include <QString>
@@ -34,9 +36,7 @@ public:
virtual ~IcqMainOptionsWidget();
private:
Q_DISABLE_COPY(IcqMainOptionsWidget);
-
- class Private;
- Private * const d;
+ Ui::IcqMainOptionsWidget *m_ui;
};
#endif // header guard
diff --git a/haze/icq-server-settings-widget.cpp b/haze/icq-server-settings-widget.cpp
index 3d08d50..8fcbef0 100644
--- a/haze/icq-server-settings-widget.cpp
+++ b/haze/icq-server-settings-widget.cpp
@@ -20,48 +20,31 @@
#include "icq-server-settings-widget.h"
-#include "ui_icq-server-settings-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-
-class IcqServerSettingsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::IcqServerSettingsWidget *ui;
-};
IcqServerSettingsWidget::IcqServerSettingsWidget(ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::IcqServerSettingsWidget;
- d->ui->setupUi(this);
-
- handleParameter("server", QVariant::String, d->ui->serverLineEdit, d->ui->serverLabel);
- handleParameter("port", QVariant::Int, d->ui->portSpinBox, d->ui->portLabel);
- handleParameter("use-ssl", QVariant::Bool, d->ui->useSslCheckBox, 0);
- handleParameter("allow-multiple-logins", QVariant::Bool, d->ui->allowMultipleLoginsCheckBox, 0);
- handleParameter("always-use-rv-proxy", QVariant::Bool, d->ui->alwaysUseRvProxyCheckBox, 0);
- handleParameter("charset", QVariant::String, d->ui->charsetComboBox, d->ui->charsetLabel);
+ m_ui = new Ui::IcqServerSettingsWidget;
+ m_ui->setupUi(this);
+
+ handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter("port", QVariant::Int, m_ui->portSpinBox, m_ui->portLabel);
+ handleParameter("use-ssl", QVariant::Bool, m_ui->useSslCheckBox, 0);
+ handleParameter("allow-multiple-logins", QVariant::Bool, m_ui->allowMultipleLoginsCheckBox, 0);
+ handleParameter("always-use-rv-proxy", QVariant::Bool, m_ui->alwaysUseRvProxyCheckBox, 0);
+ handleParameter("charset", QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
}
IcqServerSettingsWidget::~IcqServerSettingsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
#include "icq-server-settings-widget.moc"
diff --git a/haze/icq-server-settings-widget.h b/haze/icq-server-settings-widget.h
index 6353269..848343b 100644
--- a/haze/icq-server-settings-widget.h
+++ b/haze/icq-server-settings-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_SERVER_SETTINGS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_SERVER_SETTINGS_WIDGET_H
+#include "ui_icq-server-settings-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
class IcqServerSettingsWidget : public AbstractAccountParametersWidget
@@ -34,9 +36,7 @@ public:
private:
Q_DISABLE_COPY(IcqServerSettingsWidget);
-
- class Private;
- Private * const d;
+ Ui::IcqServerSettingsWidget *m_ui;
};
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index 10501eb..f07822d 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -18,41 +18,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include "yahoo-main-options-widget.h"
#include <KDebug>
-class YahooMainOptionsWidget::Private
-{
-public:
- Ui::YahooMainOptionsWidget* ui;
-
- Private()
- : ui(0)
- {
- kDebug();
- }
-};
-
YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
- : AbstractAccountParametersWidget(model, parent), d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
//setup the Ui
- d->ui = new Ui::YahooMainOptionsWidget;
- d->ui->setupUi(this);
+ m_ui = new Ui::YahooMainOptionsWidget;
+ m_ui->setupUi(this);
//map the widgets to their data
- handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
- handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
+ handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
YahooMainOptionsWidget::~YahooMainOptionsWidget()
{
kDebug();
- delete d->ui;
- delete d;
+ delete m_ui;
}
diff --git a/haze/yahoo-main-options-widget.h b/haze/yahoo-main-options-widget.h
index a694145..592e582 100644
--- a/haze/yahoo-main-options-widget.h
+++ b/haze/yahoo-main-options-widget.h
@@ -36,9 +36,7 @@ public:
virtual ~YahooMainOptionsWidget();
private:
Q_DISABLE_COPY(YahooMainOptionsWidget);
-
- class Private;
- Private * const d;
+ Ui::YahooMainOptionsWidget* m_ui;
};
#endif // HAZE_YAHOO_ACCOUNT_H
diff --git a/idle/advanced-options-widget.cpp b/idle/advanced-options-widget.cpp
index 295d8c1..c4beab7 100644
--- a/idle/advanced-options-widget.cpp
+++ b/idle/advanced-options-widget.cpp
@@ -20,47 +20,31 @@
#include "advanced-options-widget.h"
-#include "ui_advanced-options-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-class AdvancedOptionsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Ui::AdvancedOptionsWidget *ui;
-};
AdvancedOptionsWidget::AdvancedOptionsWidget(
ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::AdvancedOptionsWidget;
- d->ui->setupUi(this);
-
- handleParameter("port", QVariant::UInt, d->ui->portSpinBox, d->ui->portLabel);
- handleParameter("username", QVariant::String, d->ui->usernameLineEdit, d->ui->usernameLabel);
- handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
- handleParameter("use-ssl", QVariant::Bool, d->ui->useSslCheckBox, d->ui->useSslLabel);
- handleParameter("charset", QVariant::String, d->ui->charsetLineEdit, d->ui->charsetLabel);
+ m_ui = new Ui::AdvancedOptionsWidget;
+ m_ui->setupUi(this);
+
+ handleParameter("port", QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
+ handleParameter("username", QVariant::String, m_ui->usernameLineEdit, m_ui->usernameLabel);
+ handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+ handleParameter("use-ssl", QVariant::Bool, m_ui->useSslCheckBox, m_ui->useSslLabel);
+ handleParameter("charset", QVariant::String, m_ui->charsetLineEdit, m_ui->charsetLabel);
}
AdvancedOptionsWidget::~AdvancedOptionsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
#include "advanced-options-widget.moc"
diff --git a/idle/advanced-options-widget.h b/idle/advanced-options-widget.h
index 4ff2cc0..27196cc 100644
--- a/idle/advanced-options-widget.h
+++ b/idle/advanced-options-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_ADVANCED_PARAMETERS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_ADVANCED_PARAMETERS_WIDGET_H
+#include "ui_advanced-options-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
class AdvancedOptionsWidget : public AbstractAccountParametersWidget
@@ -34,9 +36,7 @@ public:
private:
Q_DISABLE_COPY(AdvancedOptionsWidget);
-
- class Private;
- Private * const d;
+ Ui::AdvancedOptionsWidget *m_ui;
};
diff --git a/idle/idle-account-ui-plugin.cpp b/idle/idle-account-ui-plugin.cpp
index 87aca17..10de160 100644
--- a/idle/idle-account-ui-plugin.cpp
+++ b/idle/idle-account-ui-plugin.cpp
@@ -29,18 +29,8 @@
#include <QtCore/QVariantList>
-class IdleAccountUiPlugin::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
IdleAccountUiPlugin::IdleAccountUiPlugin(QObject *parent, const QVariantList &)
- : AbstractAccountUiPlugin(parent),
- d(new Private)
+ : AbstractAccountUiPlugin(parent)
{
kDebug();
diff --git a/idle/idle-account-ui-plugin.h b/idle/idle-account-ui-plugin.h
index 98eaf4e..c689b61 100644
--- a/idle/idle-account-ui-plugin.h
+++ b/idle/idle-account-ui-plugin.h
@@ -37,9 +37,6 @@ public:
private:
Q_DISABLE_COPY(IdleAccountUiPlugin);
-
- class Private;
- Private * const d;
};
diff --git a/idle/idle-account-ui.cpp b/idle/idle-account-ui.cpp
index 7db6176..b5c4182 100644
--- a/idle/idle-account-ui.cpp
+++ b/idle/idle-account-ui.cpp
@@ -27,18 +27,8 @@
#include <KDebug>
-class IdleAccountUi::Private
-{
-public:
- Private()
- {
- kDebug();
- }
-};
-
IdleAccountUi::IdleAccountUi(QObject *parent)
- : AbstractAccountUi(parent),
- d(new Private)
+ : AbstractAccountUi(parent)
{
kDebug();
@@ -57,8 +47,6 @@ IdleAccountUi::IdleAccountUi(QObject *parent)
IdleAccountUi::~IdleAccountUi()
{
kDebug();
-
- delete d;
}
AbstractAccountParametersWidget *IdleAccountUi::mainOptionsWidget(
diff --git a/idle/idle-account-ui.h b/idle/idle-account-ui.h
index fa65167..bd3c582 100644
--- a/idle/idle-account-ui.h
+++ b/idle/idle-account-ui.h
@@ -40,9 +40,6 @@ public:
QWidget *parent = 0) const;
private:
Q_DISABLE_COPY(IdleAccountUi);
-
- class Private;
- Private * const d;
};
diff --git a/idle/main-options-widget.cpp b/idle/main-options-widget.cpp
index 2bcc600..ce99e35 100644
--- a/idle/main-options-widget.cpp
+++ b/idle/main-options-widget.cpp
@@ -20,42 +20,22 @@
#include "main-options-widget.h"
-#include "ui_main-options-widget.h"
-
#include <KDebug>
-#include <KMessageBox>
-
-class MainOptionsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Tp::ProtocolParameter accountParameter;
- Tp::ProtocolParameter fullnameParameter;
- Tp::ProtocolParameter serverParameter;
-
- Ui::MainOptionsWidget *ui;
-};
MainOptionsWidget::MainOptionsWidget(
ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(model, parent),
- d(new Private)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- d->ui = new Ui::MainOptionsWidget;
- d->ui->setupUi(this);
+ m_ui = new Ui::MainOptionsWidget;
+ m_ui->setupUi(this);
- handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
- handleParameter("server", QVariant::String, d->ui->serverLineEdit, d->ui->serverLabel);
- handleParameter("fullname", QVariant::String, d->ui->fullnameLineEdit, d->ui->fullnameLabel);
+ handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter("fullname", QVariant::String, m_ui->fullnameLineEdit, m_ui->fullnameLabel);
}
@@ -64,7 +44,7 @@ MainOptionsWidget::~MainOptionsWidget()
{
kDebug();
- delete d;
+ delete m_ui;
}
#include "main-options-widget.moc"
diff --git a/idle/main-options-widget.h b/idle/main-options-widget.h
index 513d372..1f5120f 100644
--- a/idle/main-options-widget.h
+++ b/idle/main-options-widget.h
@@ -21,6 +21,8 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_MAIN_PARAMETERS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_MAIN_PARAMETERS_WIDGET_H
+#include "ui_main-options-widget.h"
+
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
class MainOptionsWidget : public AbstractAccountParametersWidget
@@ -34,9 +36,7 @@ public:
private:
Q_DISABLE_COPY(MainOptionsWidget);
-
- class Private;
- Private * const d;
+ Ui::MainOptionsWidget *m_ui;
};
diff --git a/rakia/rakia-account-ui-plugin.cpp b/rakia/rakia-account-ui-plugin.cpp
index 9a09052..e466a8d 100644
--- a/rakia/rakia-account-ui-plugin.cpp
+++ b/rakia/rakia-account-ui-plugin.cpp
@@ -19,7 +19,6 @@
*/
#include "rakia-account-ui-plugin.h"
-
#include "rakia-account-ui.h"
#include <KCMTelepathyAccounts/PluginMacros>
diff --git a/rakia/rakia-account-ui.cpp b/rakia/rakia-account-ui.cpp
index 97c7842..dee3819 100644
--- a/rakia/rakia-account-ui.cpp
+++ b/rakia/rakia-account-ui.cpp
@@ -19,7 +19,6 @@
*/
#include "rakia-account-ui.h"
-
#include "rakia-main-options-widget.h"
#include "rakia-advanced-options-widget.h"
diff --git a/rakia/rakia-advanced-options-widget.cpp b/rakia/rakia-advanced-options-widget.cpp
index c6fa94a..6f39438 100644
--- a/rakia/rakia-advanced-options-widget.cpp
+++ b/rakia/rakia-advanced-options-widget.cpp
@@ -20,9 +20,10 @@
#include "rakia-advanced-options-widget.h"
-#include <KDebug>
#include <KCMTelepathyAccounts/ParameterEditModel>
+#include <KDebug>
+
RakiaAdvancedOptionsWidget::RakiaAdvancedOptionsWidget(ParameterEditModel* model, QWidget* parent)
: AbstractAccountParametersWidget(model, parent)
{
diff --git a/rakia/rakia-advanced-options-widget.h b/rakia/rakia-advanced-options-widget.h
index 0b619d4..a2f450f 100644
--- a/rakia/rakia-advanced-options-widget.h
+++ b/rakia/rakia-advanced-options-widget.h
@@ -18,14 +18,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_AO_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_AO_WIDGET_H
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
#include "ui_rakia-advanced-options-widget.h"
+#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+
class RakiaAdvancedOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
diff --git a/rakia/rakia-main-options-widget.h b/rakia/rakia-main-options-widget.h
index efcc07a..bd1291b 100644
--- a/rakia/rakia-main-options-widget.h
+++ b/rakia/rakia-main-options-widget.h
@@ -21,9 +21,10 @@
#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_PARAMETERS_WIDGET_H
#define KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_PARAMETERS_WIDGET_H
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
#include "ui_rakia-main-options-widget.h"
+#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+
class RakiaMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list