[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:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=cd34ba7
The following commit has been merged in the master branch:
commit cd34ba7e8cb77f1e14621d12b3f3766d4db5a58a
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date: Sun Jan 9 03:30:53 2011 +0100
Copy gabble plugin over to haze folder and replace gabble with haze icq.
No implementation changed in the icq-specific classes.
---
CMakeLists.txt | 1 +
haze/CMakeLists.txt | 41 ++++++++++++++++++++++
{gabble => haze}/Messages.sh | 2 +-
.../haze-account-ui-plugin.cpp | 28 +++++++--------
.../haze-account-ui-plugin.h | 12 +++----
.../haze-icq-account-ui.cpp | 24 ++++++-------
.../haze-icq-account-ui.h | 12 +++----
.../icq-advanced-options-widget.cpp | 26 +++++++-------
.../icq-advanced-options-widget.h | 12 +++----
.../icq-main-options-widget.cpp | 20 +++++------
.../icq-main-options-widget.h | 12 +++----
.../icq-main-options-widget.ui | 4 +--
.../icq-proxy-settings-widget.cpp | 20 +++++------
.../icq-proxy-settings-widget.h | 12 +++----
.../icq-proxy-settings-widget.ui | 4 +--
.../icq-server-settings-widget.cpp | 20 +++++------
.../icq-server-settings-widget.h | 12 +++----
.../icq-server-settings-widget.ui | 4 +--
haze/kcmtelepathyaccounts_plugin_haze.desktop | 16 +++++++++
19 files changed, 170 insertions(+), 112 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a102d9..2f49526 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,4 +22,5 @@ include_directories (${KDE4_INCLUDES}
add_subdirectory (gabble)
add_subdirectory (butterfly)
+add_subdirectory (haze)
diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
new file mode 100644
index 0000000..160c9e0
--- /dev/null
+++ b/haze/CMakeLists.txt
@@ -0,0 +1,41 @@
+project (kcmtelepathyaccounts-plugin-haze)
+
+include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set (kcmtelepathyaccounts_plugin_haze_SRCS
+ haze-account-ui-plugin.cpp
+ haze-icq-account-ui.cpp
+ icq-main-options-widget.cpp
+ icq-advanced-options-widget.cpp
+ icq-server-settings-widget.cpp
+ icq-proxy-settings-widget.cpp
+)
+
+kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
+ icq-main-options-widget.ui
+ icq-server-settings-widget.ui
+ icq-proxy-settings-widget.ui
+)
+
+kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
+ ${kcmtelepathyaccounts_plugin_haze_SRCS}
+)
+
+target_link_libraries (kcmtelepathyaccounts_plugin_haze
+ ${KCMTELEPATHYACCOUNTS_LIBRARIES}
+ ${QT_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${TELEPATHY_QT4_LIBRARIES}
+)
+
+# Install:
+install (TARGETS kcmtelepathyaccounts_plugin_haze
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES kcmtelepathyaccounts_plugin_haze.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
diff --git a/gabble/Messages.sh b/haze/Messages.sh
similarity index 89%
copy from gabble/Messages.sh
copy to haze/Messages.sh
index c8d9bbc..e6231eb 100755
--- a/gabble/Messages.sh
+++ b/haze/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_gabble.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_haze.pot
rm -f rc.cpp
diff --git a/gabble/gabble-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
similarity index 60%
copy from gabble/gabble-account-ui-plugin.cpp
copy to haze/haze-account-ui-plugin.cpp
index 8e497f1..c1969a0 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-account-ui-plugin.h"
+#include "haze-account-ui-plugin.h"
-#include "gabble-account-ui.h"
+#include "haze-icq-account-ui.h"
#include <KCMTelepathyAccounts/PluginMacros>
@@ -29,7 +29,7 @@
#include <QtCore/QVariantList>
-class GabbleAccountUiPlugin::Private
+class HazeAccountUiPlugin::Private
{
public:
Private()
@@ -38,38 +38,38 @@ public:
}
};
-GabbleAccountUiPlugin::GabbleAccountUiPlugin(QObject *parent, const QVariantList &)
+HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
: AbstractAccountUiPlugin(parent),
d(new Private)
{
kDebug();
// Register supported cm/protocol combinations
- registerProvidedProtocol("gabble", "jabber");
+ registerProvidedProtocol("haze", "icq");
}
-GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
+HazeAccountUiPlugin::~HazeAccountUiPlugin()
{
kDebug();
}
-AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
+AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
{
kDebug();
- // We only support gabble/jabber combination.
- if ((connectionManager == "gabble") && (protocol == "jabber")) {
- return new GabbleAccountUi;
+ // We only support haze/icq combination.so far
+ if ((connectionManager == "haze") && (protocol == "icq")) {
+ return new HazeIcqAccountUi;
}
return 0;
}
-//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("gabble", "GabbleAccountUiPlugin")
- K_PLUGIN_FACTORY(factory, registerPlugin<GabbleAccountUiPlugin>();) \
- K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_gabble"))
+//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("haze", "HazeAccountUiPlugin")
+ K_PLUGIN_FACTORY(factory, registerPlugin<HazeAccountUiPlugin>();) \
+ K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_haze"))
-#include "gabble-account-ui-plugin.moc"
+#include "haze-account-ui-plugin.moc"
diff --git a/gabble/gabble-account-ui-plugin.h b/haze/haze-account-ui-plugin.h
similarity index 77%
copy from gabble/gabble-account-ui-plugin.h
copy to haze/haze-account-ui-plugin.h
index 9b343ac..61430cb 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/haze/haze-account-ui-plugin.h
@@ -18,25 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ACCOUNT_UI_PLUGIN_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ACCOUNT_UI_PLUGIN_H
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
#include <QVariantList>
-class GabbleAccountUiPlugin : public AbstractAccountUiPlugin
+class HazeAccountUiPlugin : public AbstractAccountUiPlugin
{
Q_OBJECT
public:
- GabbleAccountUiPlugin(QObject *parent, const QVariantList &);
- virtual ~GabbleAccountUiPlugin();
+ HazeAccountUiPlugin(QObject *parent, const QVariantList &);
+ virtual ~HazeAccountUiPlugin();
virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
private:
- Q_DISABLE_COPY(GabbleAccountUiPlugin);
+ Q_DISABLE_COPY(HazeAccountUiPlugin);
class Private;
Private * const d;
diff --git a/gabble/gabble-account-ui.cpp b/haze/haze-icq-account-ui.cpp
similarity index 81%
copy from gabble/gabble-account-ui.cpp
copy to haze/haze-icq-account-ui.cpp
index 8212e4f..687a408 100644
--- a/gabble/gabble-account-ui.cpp
+++ b/haze/haze-icq-account-ui.cpp
@@ -18,16 +18,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-account-ui.h"
+#include "haze-icq-account-ui.h"
-#include "main-options-widget.h"
-#include "advanced-options-widget.h"
+#include "icq-main-options-widget.h"
+#include "icq-advanced-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
#include <KDebug>
-class GabbleAccountUi::Private
+class HazeIcqAccountUi::Private
{
public:
Private()
@@ -36,7 +36,7 @@ public:
}
};
-GabbleAccountUi::GabbleAccountUi(QObject *parent)
+HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
: AbstractAccountUi(parent),
d(new Private)
{
@@ -64,38 +64,38 @@ GabbleAccountUi::GabbleAccountUi(QObject *parent)
registerSupportedParameter("fallback-conference-server", QVariant::String);
}
-GabbleAccountUi::~GabbleAccountUi()
+HazeIcqAccountUi::~HazeIcqAccountUi()
{
kDebug();
delete d;
}
-AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *HazeIcqAccountUi::mainOptionsWidget(
Tp::ProtocolParameterList parameters,
const QVariantMap &values,
QWidget *parent) const
{
kDebug();
- return new MainOptionsWidget(parameters, values, parent);
+ return new IcqMainOptionsWidget(parameters, values, parent);
}
-bool GabbleAccountUi::hasAdvancedOptionsWidget() const
+bool HazeIcqAccountUi::hasAdvancedOptionsWidget() const
{
return true;
}
-AbstractAccountParametersWidget *GabbleAccountUi::advancedOptionsWidget(
+AbstractAccountParametersWidget *HazeIcqAccountUi::advancedOptionsWidget(
Tp::ProtocolParameterList parameters,
const QVariantMap &values,
QWidget *parent) const
{
kDebug();
- return new AdvancedOptionsWidget(parameters, values, parent);
+ return new IcqAdvancedOptionsWidget(parameters, values, parent);
}
-#include "gabble-account-ui.moc"
+#include "haze-icq-account-ui.moc"
diff --git a/gabble/gabble-account-ui.h b/haze/haze-icq-account-ui.h
similarity index 84%
copy from gabble/gabble-account-ui.h
copy to haze/haze-icq-account-ui.h
index 73bdbdc..2c8fba3 100644
--- a/gabble/gabble-account-ui.h
+++ b/haze/haze-icq-account-ui.h
@@ -18,18 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_UI_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_UI_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class GabbleAccountUi : public AbstractAccountUi
+class HazeIcqAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit GabbleAccountUi(QObject *parent = 0);
- virtual ~GabbleAccountUi();
+ explicit HazeIcqAccountUi(QObject *parent = 0);
+ virtual ~HazeIcqAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(Tp::ProtocolParameterList parameters,
@@ -42,7 +42,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(GabbleAccountUi);
+ Q_DISABLE_COPY(HazeIcqAccountUi);
class Private;
Private * const d;
diff --git a/gabble/advanced-options-widget.cpp b/haze/icq-advanced-options-widget.cpp
similarity index 75%
copy from gabble/advanced-options-widget.cpp
copy to haze/icq-advanced-options-widget.cpp
index 43145f2..1bbb02c 100644
--- a/gabble/advanced-options-widget.cpp
+++ b/haze/icq-advanced-options-widget.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "advanced-options-widget.h"
-#include "proxy-settings-widget.h"
-#include "server-settings-widget.h"
+#include "icq-advanced-options-widget.h"
+#include "icq-proxy-settings-widget.h"
+#include "icq-server-settings-widget.h"
#include <KCMTelepathyAccounts/ProtocolParameterValue>
@@ -31,7 +31,7 @@
#include <QHBoxLayout>
-class AdvancedOptionsWidget::Private
+class IcqAdvancedOptionsWidget::Private
{
public:
Private()
@@ -42,11 +42,11 @@ public:
kDebug();
}
KTabWidget *tabWidget;
- ProxySettingsWidget *proxySettings;
- ServerSettingsWidget *serverSettings;
+ IcqProxySettingsWidget *proxySettings;
+ IcqServerSettingsWidget *serverSettings;
};
-AdvancedOptionsWidget::AdvancedOptionsWidget(Tp::ProtocolParameterList parameters,
+IcqAdvancedOptionsWidget::IcqAdvancedOptionsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values,
QWidget *parent)
: AbstractAccountParametersWidget(parameters, values, parent),
@@ -58,20 +58,20 @@ AdvancedOptionsWidget::AdvancedOptionsWidget(Tp::ProtocolParameterList parameter
layout->addWidget(d->tabWidget);
// create the pages
- d->serverSettings = new ServerSettingsWidget(parameters, values, d->tabWidget);
+ d->serverSettings = new IcqServerSettingsWidget(parameters, values, d->tabWidget);
d->tabWidget->addTab(d->serverSettings, i18n("Connection Settings"));
- d->proxySettings = new ProxySettingsWidget(parameters, values, d->tabWidget);
+ d->proxySettings = new IcqProxySettingsWidget(parameters, values, d->tabWidget);
d->tabWidget->addTab(d->proxySettings, i18n("Proxy Settings"));
}
-AdvancedOptionsWidget::~AdvancedOptionsWidget()
+IcqAdvancedOptionsWidget::~IcqAdvancedOptionsWidget()
{
kDebug();
delete d;
}
-QList<ProtocolParameterValue> AdvancedOptionsWidget::parameterValues() const
+QList<ProtocolParameterValue> IcqAdvancedOptionsWidget::parameterValues() const
{
kDebug();
@@ -83,7 +83,7 @@ QList<ProtocolParameterValue> AdvancedOptionsWidget::parameterValues() const
return parameters;
}
-bool AdvancedOptionsWidget::validateParameterValues()
+bool IcqAdvancedOptionsWidget::validateParameterValues()
{
kDebug();
@@ -97,5 +97,5 @@ bool AdvancedOptionsWidget::validateParameterValues()
return true;
}
-#include "advanced-options-widget.moc"
+#include "icq-advanced-options-widget.moc"
diff --git a/gabble/advanced-options-widget.h b/haze/icq-advanced-options-widget.h
similarity index 77%
copy from gabble/advanced-options-widget.h
copy to haze/icq-advanced-options-widget.h
index e38f844..2a6b52a 100644
--- a/gabble/advanced-options-widget.h
+++ b/haze/icq-advanced-options-widget.h
@@ -18,26 +18,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ADVANCED_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ADVANCED_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ADVANCED_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ADVANCED_PARAMETERS_WIDGET_H
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class AdvancedOptionsWidget : public AbstractAccountParametersWidget
+class IcqAdvancedOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit AdvancedOptionsWidget(Tp::ProtocolParameterList parameters,
+ explicit IcqAdvancedOptionsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
- virtual ~AdvancedOptionsWidget();
+ virtual ~IcqAdvancedOptionsWidget();
virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
- Q_DISABLE_COPY(AdvancedOptionsWidget);
+ Q_DISABLE_COPY(IcqAdvancedOptionsWidget);
class Private;
Private * const d;
diff --git a/gabble/main-options-widget.cpp b/haze/icq-main-options-widget.cpp
similarity index 88%
copy from gabble/main-options-widget.cpp
copy to haze/icq-main-options-widget.cpp
index 702fd7d..d305056 100644
--- a/gabble/main-options-widget.cpp
+++ b/haze/icq-main-options-widget.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-options-widget.h"
+#include "icq-main-options-widget.h"
-#include "ui_main-options-widget.h"
+#include "ui_icq-main-options-widget.h"
#include <KCMTelepathyAccounts/ProtocolParameterValue>
@@ -28,7 +28,7 @@
#include <KMessageBox>
-class MainOptionsWidget::Private
+class IcqMainOptionsWidget::Private
{
public:
Private()
@@ -40,10 +40,10 @@ public:
Tp::ProtocolParameter accountParameter;
Tp::ProtocolParameter passwordParameter;
- Ui::MainOptionsWidget *ui;
+ Ui::IcqMainOptionsWidget *ui;
};
-MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
+IcqMainOptionsWidget::IcqMainOptionsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values,
QWidget *parent)
: AbstractAccountParametersWidget(parameters, values, parent),
@@ -61,7 +61,7 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
}
// Set up the UI.
- d->ui = new Ui::MainOptionsWidget;
+ d->ui = new Ui::IcqMainOptionsWidget;
d->ui->setupUi(this);
// Prefill UI elements if appropriate.
@@ -93,14 +93,14 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
}
}
-MainOptionsWidget::~MainOptionsWidget()
+IcqMainOptionsWidget::~IcqMainOptionsWidget()
{
kDebug();
delete d;
}
-QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
+QList<ProtocolParameterValue> IcqMainOptionsWidget::parameterValues() const
{
kDebug();
@@ -118,7 +118,7 @@ QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
return parameters;
}
-bool MainOptionsWidget::validateParameterValues()
+bool IcqMainOptionsWidget::validateParameterValues()
{
kDebug();
@@ -135,5 +135,5 @@ bool MainOptionsWidget::validateParameterValues()
}
-#include "main-options-widget.moc"
+#include "icq-main-options-widget.moc"
diff --git a/gabble/main-options-widget.h b/haze/icq-main-options-widget.h
similarity index 77%
copy from gabble/main-options-widget.h
copy to haze/icq-main-options-widget.h
index a0ba4f3..ea3898b 100644
--- a/gabble/main-options-widget.h
+++ b/haze/icq-main-options-widget.h
@@ -18,26 +18,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_PARAMETERS_WIDGET_H
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MainOptionsWidget : public AbstractAccountParametersWidget
+class IcqMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit MainOptionsWidget(Tp::ProtocolParameterList parameters,
+ explicit IcqMainOptionsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
- virtual ~MainOptionsWidget();
+ virtual ~IcqMainOptionsWidget();
virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
- Q_DISABLE_COPY(MainOptionsWidget);
+ Q_DISABLE_COPY(IcqMainOptionsWidget);
class Private;
Private * const d;
diff --git a/gabble/main-options-widget.ui b/haze/icq-main-options-widget.ui
similarity index 95%
copy from gabble/main-options-widget.ui
copy to haze/icq-main-options-widget.ui
index ad60065..e73a0b2 100644
--- a/gabble/main-options-widget.ui
+++ b/haze/icq-main-options-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MainOptionsWidget</class>
- <widget class="QWidget" name="MainOptionsWidget">
+ <class>IcqMainOptionsWidget</class>
+ <widget class="QWidget" name="IcqMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/gabble/proxy-settings-widget.cpp b/haze/icq-proxy-settings-widget.cpp
similarity index 95%
copy from gabble/proxy-settings-widget.cpp
copy to haze/icq-proxy-settings-widget.cpp
index ce9c411..1bb3b98 100644
--- a/gabble/proxy-settings-widget.cpp
+++ b/haze/icq-proxy-settings-widget.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "proxy-settings-widget.h"
+#include "icq-proxy-settings-widget.h"
-#include "ui_proxy-settings-widget.h"
+#include "ui_icq-proxy-settings-widget.h"
#include <KCMTelepathyAccounts/ProtocolParameterValue>
@@ -28,7 +28,7 @@
#include <KMessageBox>
-class ProxySettingsWidget::Private
+class IcqProxySettingsWidget::Private
{
public:
Private()
@@ -46,10 +46,10 @@ public:
Tp::ProtocolParameter fallbackSocks5ProxiesParameter;
Tp::ProtocolParameter fallbackConferenceServerParameter;
- Ui::ProxySettingsWidget *ui;
+ Ui::IcqProxySettingsWidget *ui;
};
-ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
+IcqProxySettingsWidget::IcqProxySettingsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values,
QWidget *parent)
: AbstractAccountParametersWidget(parameters, values, parent),
@@ -85,7 +85,7 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
}
// Set up the UI.
- d->ui = new Ui::ProxySettingsWidget;
+ d->ui = new Ui::IcqProxySettingsWidget;
d->ui->setupUi(this);
// Prefill UI elements if appropriate.
@@ -230,14 +230,14 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
}
}
-ProxySettingsWidget::~ProxySettingsWidget()
+IcqProxySettingsWidget::~IcqProxySettingsWidget()
{
kDebug();
delete d;
}
-QList<ProtocolParameterValue> ProxySettingsWidget::parameterValues() const
+QList<ProtocolParameterValue> IcqProxySettingsWidget::parameterValues() const
{
kDebug();
@@ -282,7 +282,7 @@ QList<ProtocolParameterValue> ProxySettingsWidget::parameterValues() const
return parameters;
}
-bool ProxySettingsWidget::validateParameterValues()
+bool IcqProxySettingsWidget::validateParameterValues()
{
kDebug();
@@ -292,5 +292,5 @@ bool ProxySettingsWidget::validateParameterValues()
}
-#include "proxy-settings-widget.moc"
+#include "icq-proxy-settings-widget.moc"
diff --git a/gabble/proxy-settings-widget.h b/haze/icq-proxy-settings-widget.h
similarity index 77%
copy from gabble/proxy-settings-widget.h
copy to haze/icq-proxy-settings-widget.h
index 0add7fd..41d060c 100644
--- a/gabble/proxy-settings-widget.h
+++ b/haze/icq-proxy-settings-widget.h
@@ -18,26 +18,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_PROXY_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_PROXY_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_PROXY_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_PROXY_SETTINGS_WIDGET_H
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class ProxySettingsWidget : public AbstractAccountParametersWidget
+class IcqProxySettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit ProxySettingsWidget(Tp::ProtocolParameterList parameters,
+ explicit IcqProxySettingsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
- virtual ~ProxySettingsWidget();
+ virtual ~IcqProxySettingsWidget();
virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
- Q_DISABLE_COPY(ProxySettingsWidget);
+ Q_DISABLE_COPY(IcqProxySettingsWidget);
class Private;
Private * const d;
diff --git a/gabble/proxy-settings-widget.ui b/haze/icq-proxy-settings-widget.ui
similarity index 97%
copy from gabble/proxy-settings-widget.ui
copy to haze/icq-proxy-settings-widget.ui
index 566d42b..d959fca 100644
--- a/gabble/proxy-settings-widget.ui
+++ b/haze/icq-proxy-settings-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ProxySettingsWidget</class>
- <widget class="QWidget" name="ProxySettingsWidget">
+ <class>IcqProxySettingsWidget</class>
+ <widget class="QWidget" name="IcqProxySettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/gabble/server-settings-widget.cpp b/haze/icq-server-settings-widget.cpp
similarity index 94%
copy from gabble/server-settings-widget.cpp
copy to haze/icq-server-settings-widget.cpp
index ddd5e2e..4178ac1 100644
--- a/gabble/server-settings-widget.cpp
+++ b/haze/icq-server-settings-widget.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "server-settings-widget.h"
+#include "icq-server-settings-widget.h"
-#include "ui_server-settings-widget.h"
+#include "ui_icq-server-settings-widget.h"
#include <KCMTelepathyAccounts/ProtocolParameterValue>
@@ -28,7 +28,7 @@
#include <KMessageBox>
-class ServerSettingsWidget::Private
+class IcqServerSettingsWidget::Private
{
public:
Private()
@@ -45,10 +45,10 @@ public:
Tp::ProtocolParameter ignoreSslErrorsParameter;
Tp::ProtocolParameter oldSslParameter;
- Ui::ServerSettingsWidget *ui;
+ Ui::IcqServerSettingsWidget *ui;
};
-ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
+IcqServerSettingsWidget::IcqServerSettingsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values,
QWidget *parent)
: AbstractAccountParametersWidget(parameters, values, parent),
@@ -76,7 +76,7 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
}
// Set up the UI.
- d->ui = new Ui::ServerSettingsWidget;
+ d->ui = new Ui::IcqServerSettingsWidget;
d->ui->setupUi(this);
// Prefill UI elements if appropriate.
@@ -192,14 +192,14 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
}
}
-ServerSettingsWidget::~ServerSettingsWidget()
+IcqServerSettingsWidget::~IcqServerSettingsWidget()
{
kDebug();
delete d;
}
-QList<ProtocolParameterValue> ServerSettingsWidget::parameterValues() const
+QList<ProtocolParameterValue> IcqServerSettingsWidget::parameterValues() const
{
kDebug();
@@ -238,7 +238,7 @@ QList<ProtocolParameterValue> ServerSettingsWidget::parameterValues() const
return parameters;
}
-bool ServerSettingsWidget::validateParameterValues()
+bool IcqServerSettingsWidget::validateParameterValues()
{
kDebug();
@@ -248,5 +248,5 @@ bool ServerSettingsWidget::validateParameterValues()
}
-#include "server-settings-widget.moc"
+#include "icq-server-settings-widget.moc"
diff --git a/gabble/server-settings-widget.h b/haze/icq-server-settings-widget.h
similarity index 77%
copy from gabble/server-settings-widget.h
copy to haze/icq-server-settings-widget.h
index 67ec59f..261b9b5 100644
--- a/gabble/server-settings-widget.h
+++ b/haze/icq-server-settings-widget.h
@@ -18,26 +18,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_SERVER_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_SERVER_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_SERVER_SETTINGS_WIDGET_H
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class ServerSettingsWidget : public AbstractAccountParametersWidget
+class IcqServerSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit ServerSettingsWidget(Tp::ProtocolParameterList parameters,
+ explicit IcqServerSettingsWidget(Tp::ProtocolParameterList parameters,
const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
- virtual ~ServerSettingsWidget();
+ virtual ~IcqServerSettingsWidget();
virtual QList<ProtocolParameterValue> parameterValues() const;
virtual bool validateParameterValues();
private:
- Q_DISABLE_COPY(ServerSettingsWidget);
+ Q_DISABLE_COPY(IcqServerSettingsWidget);
class Private;
Private * const d;
diff --git a/gabble/server-settings-widget.ui b/haze/icq-server-settings-widget.ui
similarity index 97%
copy from gabble/server-settings-widget.ui
copy to haze/icq-server-settings-widget.ui
index 7113553..79384a4 100644
--- a/gabble/server-settings-widget.ui
+++ b/haze/icq-server-settings-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ServerSettingsWidget</class>
- <widget class="QWidget" name="ServerSettingsWidget">
+ <class>IcqServerSettingsWidget</class>
+ <widget class="QWidget" name="IcqServerSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/haze/kcmtelepathyaccounts_plugin_haze.desktop b/haze/kcmtelepathyaccounts_plugin_haze.desktop
new file mode 100644
index 0000000..e59382c
--- /dev/null
+++ b/haze/kcmtelepathyaccounts_plugin_haze.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Custom account configuration user interface for accounts using the Haze connection manager.
+Icon=blockdevice
+Name=Haze Account Configuration User Interface
+Type=Service
+ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+
+X-KDE-Library=kcmtelepathyaccounts_plugin_haze_
+X-KDE-PluginInfo-Author=Dominik Schmidt
+X-KDE-PluginInfo-Email=kde at dominik-schmidt.de
+X-KDE-PluginInfo-Name=haze
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://techbase.kde.org/Projects/Telepathy
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list