[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:04 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=19d3987
The following commit has been merged in the master branch:
commit 19d3987b7159e5fe9719a5ff73c7f729e2d5a05e
Author: George Goldberg <grundleborg at googlemail.com>
Date: Mon Aug 10 21:29:54 2009 +0000
Move all the other files used by Kopete into the library.
Merge branch 'lib'
svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1009805
---
src/CMakeLists.txt | 24 +-----
.../CMakeLists.txt | 31 +++++++
.../abstract-account-parameters-widget.cpp | 0
.../abstract-account-parameters-widget.h | 0
.../abstract-account-ui-plugin.cpp | 0
.../abstract-account-ui-plugin.h | 0
.../abstract-account-ui.cpp | 0
.../abstract-account-ui.h | 0
.../connection-manager-item.cpp | 0
.../connection-manager-item.h | 4 +-
src/{ => KCMTelepathyAccounts}/dictionary.cpp | 0
src/{ => KCMTelepathyAccounts}/dictionary.h | 0
.../include/AbstractAccountParametersWidget | 0
.../include/AbstractAccountUi | 0
.../include/AbstractAccountUiPlugin | 0
.../include/ConnectionManagerItem | 7 ++
.../include/IntegerEdit | 0
.../include/MandatoryParameterEditWidget | 7 ++
.../include/OptionalParameterEditWidget | 7 ++
.../include/ParameterEditWidget | 7 ++
.../include/PluginMacros | 0
src/KCMTelepathyAccounts/include/PluginManager | 7 ++
src/KCMTelepathyAccounts/include/ProtocolItem | 7 ++
.../include/ProtocolSelectWidget | 7 ++
.../include/UnsignedIntegerEdit | 0
.../integer-edit.cpp | 0
.../integer-edit.h | 0
.../kcmtelepathyaccounts-accountuiplugin.desktop | 0
.../mandatory-parameter-edit-widget.cpp | 0
.../mandatory-parameter-edit-widget.h | 6 +-
.../optional-parameter-edit-widget.cpp | 0
.../optional-parameter-edit-widget.h | 6 +-
.../parameter-edit-delegate.cpp | 5 +-
.../parameter-edit-delegate.h | 0
.../parameter-edit-model.cpp | 0
.../parameter-edit-model.h | 0
.../parameter-edit-widget.cpp | 0
.../parameter-edit-widget.h | 6 +-
.../parameter-edit-widget.ui | 0
.../parameter-item.cpp | 0
.../parameter-item.h | 0
.../plugin-macros.h | 0
src/{ => KCMTelepathyAccounts}/plugin-manager.cpp | 4 +-
src/{ => KCMTelepathyAccounts}/plugin-manager.h | 4 +-
src/{ => KCMTelepathyAccounts}/protocol-item.cpp | 0
src/{ => KCMTelepathyAccounts}/protocol-item.h | 4 +-
.../protocol-list-model.cpp | 0
.../protocol-list-model.h | 0
.../protocol-select-widget.cpp | 0
.../protocol-select-widget.h | 4 +-
.../protocol-select-widget.ui | 0
.../unsigned-integer-edit.cpp | 0
.../unsigned-integer-edit.h | 0
src/add-account-assistant.cpp | 17 ++--
src/defaultaccountui/integer-edit.cpp | 98 ----------------------
src/defaultaccountui/integer-edit.h | 48 -----------
src/defaultaccountui/unsigned-integer-edit.cpp | 85 -------------------
src/defaultaccountui/unsigned-integer-edit.h | 48 -----------
src/edit-account-dialog.cpp | 12 ++-
59 files changed, 125 insertions(+), 330 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09f71fd..6ebed12 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,37 +1,21 @@
-add_subdirectory (libkcmtelepathyaccounts)
-
-project (telepathy-accounts-kcm)
-
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/defaultaccountui
- ${CMAKE_CURRENT_SOURCE_DIR}/defaultaccountui
)
+add_subdirectory (KCMTelepathyAccounts)
+
+project (telepathy-accounts-kcm)
+
set (telepathy_accounts_kcm_SRCS
kcm-telepathy-accounts.cpp
accounts-list-model.cpp
account-item.cpp
add-account-assistant.cpp
- protocol-select-widget.cpp
- protocol-list-model.cpp
- connection-manager-item.cpp
- protocol-item.cpp
- defaultaccountui/parameter-edit-widget.cpp
- defaultaccountui/parameter-edit-delegate.cpp
- defaultaccountui/parameter-edit-model.cpp
- defaultaccountui/parameter-item.cpp
- defaultaccountui/mandatory-parameter-edit-widget.cpp
- defaultaccountui/optional-parameter-edit-widget.cpp
- dictionary.cpp
- plugin-manager.cpp
edit-account-dialog.cpp
)
kde4_add_ui_files (telepathy_accounts_kcm_SRCS
main-widget.ui
- protocol-select-widget.ui
- defaultaccountui/parameter-edit-widget.ui
)
kde4_add_plugin (kcm_telepathy_accounts
diff --git a/src/libkcmtelepathyaccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
similarity index 65%
rename from src/libkcmtelepathyaccounts/CMakeLists.txt
rename to src/KCMTelepathyAccounts/CMakeLists.txt
index 6a42018..f7e42d6 100644
--- a/src/libkcmtelepathyaccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@ -10,6 +10,18 @@ set (libkcmtelepathyaccounts_SRCS
abstract-account-parameters-widget.cpp
integer-edit.cpp
unsigned-integer-edit.cpp
+ protocol-select-widget.cpp
+ protocol-list-model.cpp
+ connection-manager-item.cpp
+ protocol-item.cpp
+ parameter-edit-widget.cpp
+ parameter-edit-delegate.cpp
+ parameter-edit-model.cpp
+ parameter-item.cpp
+ mandatory-parameter-edit-widget.cpp
+ optional-parameter-edit-widget.cpp
+ dictionary.cpp
+ plugin-manager.cpp
)
set (libkcmtelepathyaccounts_HDRS
@@ -19,6 +31,13 @@ set (libkcmtelepathyaccounts_HDRS
plugin-macros.h
integer-edit.h
unsigned-integer-edit.h
+ connection-manager-item.h
+ mandatory-parameter-edit-widget.h
+ optional-parameter-edit-widget.h
+ plugin-manager.h
+ protocol-select-widget.h
+ protocol-item.h
+ parameter-edit-widget.h
)
set (libkcmtelepathyaccounts_PRETTY_HDRS
@@ -28,6 +47,18 @@ set (libkcmtelepathyaccounts_PRETTY_HDRS
include/PluginMacros
include/IntegerEdit
include/UnsignedIntegerEdit
+ include/ConnectionManagerItem
+ include/MandatoryParameterEditWidget
+ include/OptionalParameterEditWidget
+ include/PluginManager
+ include/ProtocolSelectWidget
+ include/ProtocolItem
+ include/ParameterEditWidget
+)
+
+kde4_add_ui_files (libkcmtelepathyaccounts_SRCS
+ parameter-edit-widget.ui
+ protocol-select-widget.ui
)
kde4_add_library (kcmtelepathyaccounts
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
similarity index 100%
rename from src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
rename to src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
similarity index 100%
rename from src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
rename to src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
similarity index 100%
rename from src/libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp
rename to src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
similarity index 100%
rename from src/libkcmtelepathyaccounts/abstract-account-ui-plugin.h
rename to src/KCMTelepathyAccounts/abstract-account-ui-plugin.h
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui.cpp b/src/KCMTelepathyAccounts/abstract-account-ui.cpp
similarity index 100%
rename from src/libkcmtelepathyaccounts/abstract-account-ui.cpp
rename to src/KCMTelepathyAccounts/abstract-account-ui.cpp
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui.h b/src/KCMTelepathyAccounts/abstract-account-ui.h
similarity index 100%
rename from src/libkcmtelepathyaccounts/abstract-account-ui.h
rename to src/KCMTelepathyAccounts/abstract-account-ui.h
diff --git a/src/connection-manager-item.cpp b/src/KCMTelepathyAccounts/connection-manager-item.cpp
similarity index 100%
rename from src/connection-manager-item.cpp
rename to src/KCMTelepathyAccounts/connection-manager-item.cpp
diff --git a/src/connection-manager-item.h b/src/KCMTelepathyAccounts/connection-manager-item.h
similarity index 95%
rename from src/connection-manager-item.h
rename to src/KCMTelepathyAccounts/connection-manager-item.h
index dfb589a..aa3480e 100644
--- a/src/connection-manager-item.h
+++ b/src/KCMTelepathyAccounts/connection-manager-item.h
@@ -21,6 +21,8 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_CONNECTION_MANAGER_ITEM_H
#define TELEPATHY_ACCOUNTS_KCM_CONNECTION_MANAGER_ITEM_H
+#include <kdemacros.h>
+
#include <QtCore/QObject>
#include <TelepathyQt4/ConnectionManager>
@@ -31,7 +33,7 @@ namespace Tp {
class PendingOperation;
}
-class ConnectionManagerItem : public QObject
+class KDE_EXPORT ConnectionManagerItem : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(ConnectionManagerItem);
diff --git a/src/dictionary.cpp b/src/KCMTelepathyAccounts/dictionary.cpp
similarity index 100%
rename from src/dictionary.cpp
rename to src/KCMTelepathyAccounts/dictionary.cpp
diff --git a/src/dictionary.h b/src/KCMTelepathyAccounts/dictionary.h
similarity index 100%
rename from src/dictionary.h
rename to src/KCMTelepathyAccounts/dictionary.h
diff --git a/src/libkcmtelepathyaccounts/include/AbstractAccountParametersWidget b/src/KCMTelepathyAccounts/include/AbstractAccountParametersWidget
similarity index 100%
rename from src/libkcmtelepathyaccounts/include/AbstractAccountParametersWidget
rename to src/KCMTelepathyAccounts/include/AbstractAccountParametersWidget
diff --git a/src/libkcmtelepathyaccounts/include/AbstractAccountUi b/src/KCMTelepathyAccounts/include/AbstractAccountUi
similarity index 100%
rename from src/libkcmtelepathyaccounts/include/AbstractAccountUi
rename to src/KCMTelepathyAccounts/include/AbstractAccountUi
diff --git a/src/libkcmtelepathyaccounts/include/AbstractAccountUiPlugin b/src/KCMTelepathyAccounts/include/AbstractAccountUiPlugin
similarity index 100%
rename from src/libkcmtelepathyaccounts/include/AbstractAccountUiPlugin
rename to src/KCMTelepathyAccounts/include/AbstractAccountUiPlugin
diff --git a/src/KCMTelepathyAccounts/include/ConnectionManagerItem b/src/KCMTelepathyAccounts/include/ConnectionManagerItem
new file mode 100644
index 0000000..449ac29
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/ConnectionManagerItem
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_CONNECTION_MANAGER_ITEM_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_CONNECTION_MANAGER_ITEM_PRETTY_H
+
+#include <KCMTelepathyAccounts/connection-manager-item.h>
+
+#endif
+
diff --git a/src/libkcmtelepathyaccounts/include/IntegerEdit b/src/KCMTelepathyAccounts/include/IntegerEdit
similarity index 100%
rename from src/libkcmtelepathyaccounts/include/IntegerEdit
rename to src/KCMTelepathyAccounts/include/IntegerEdit
diff --git a/src/KCMTelepathyAccounts/include/MandatoryParameterEditWidget b/src/KCMTelepathyAccounts/include/MandatoryParameterEditWidget
new file mode 100644
index 0000000..c529544
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/MandatoryParameterEditWidget
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_MANDATORY_PARAMETER_EDIT_WIDGET_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_MANDATORY_PARAMETER_EDIT_WIDGET_PRETTY_H
+
+#include <KCMTelepathyAccounts/mandatory-parameter-edit-widget.h>
+
+#endif
+
diff --git a/src/KCMTelepathyAccounts/include/OptionalParameterEditWidget b/src/KCMTelepathyAccounts/include/OptionalParameterEditWidget
new file mode 100644
index 0000000..f1f99bb
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/OptionalParameterEditWidget
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_OPTIONAL_PARAMETER_EDIT_WIDGET_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_OPTIONAL_PARAMETER_EDIT_WIDGET_PRETTY_H
+
+#include <KCMTelepathyAccounts/optional-parameter-edit-widget.h>
+
+#endif
+
diff --git a/src/KCMTelepathyAccounts/include/ParameterEditWidget b/src/KCMTelepathyAccounts/include/ParameterEditWidget
new file mode 100644
index 0000000..1e30540
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/ParameterEditWidget
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_WIDGET_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_PARAMETER_EDIT_WIDGET_PRETTY_H
+
+#include <KCMTelepathyAccounts/parameter-edit-widget.h>
+
+#endif
+
diff --git a/src/libkcmtelepathyaccounts/include/PluginMacros b/src/KCMTelepathyAccounts/include/PluginMacros
similarity index 100%
rename from src/libkcmtelepathyaccounts/include/PluginMacros
rename to src/KCMTelepathyAccounts/include/PluginMacros
diff --git a/src/KCMTelepathyAccounts/include/PluginManager b/src/KCMTelepathyAccounts/include/PluginManager
new file mode 100644
index 0000000..2bb19f6
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/PluginManager
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MANAGER_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_PLUGIN_MANAGER_PRETTY_H
+
+#include <KCMTelepathyAccounts/plugin-manager.h>
+
+#endif
+
diff --git a/src/KCMTelepathyAccounts/include/ProtocolItem b/src/KCMTelepathyAccounts/include/ProtocolItem
new file mode 100644
index 0000000..39b7a58
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/ProtocolItem
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PROTOCOL_ITEM_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_PROTOCOL_ITEM_PRETTY_H
+
+#include <KCMTelepathyAccounts/protocol-item.h>
+
+#endif
+
diff --git a/src/KCMTelepathyAccounts/include/ProtocolSelectWidget b/src/KCMTelepathyAccounts/include/ProtocolSelectWidget
new file mode 100644
index 0000000..d2cbc63
--- /dev/null
+++ b/src/KCMTelepathyAccounts/include/ProtocolSelectWidget
@@ -0,0 +1,7 @@
+#ifndef LIB_KCM_TELEPATHY_ACCOUNTS_PROTOCOL_SELECT_WIDGET_PRETTY_H
+#define LIB_KCM_TELEPATHY_ACCOUNTS_PROTOCOL_SELECT_WIDGET_PRETTY_H
+
+#include <KCMTelepathyAccounts/protocol-select-widget.h>
+
+#endif
+
diff --git a/src/libkcmtelepathyaccounts/include/UnsignedIntegerEdit b/src/KCMTelepathyAccounts/include/UnsignedIntegerEdit
similarity index 100%
rename from src/libkcmtelepathyaccounts/include/UnsignedIntegerEdit
rename to src/KCMTelepathyAccounts/include/UnsignedIntegerEdit
diff --git a/src/libkcmtelepathyaccounts/integer-edit.cpp b/src/KCMTelepathyAccounts/integer-edit.cpp
similarity index 100%
rename from src/libkcmtelepathyaccounts/integer-edit.cpp
rename to src/KCMTelepathyAccounts/integer-edit.cpp
diff --git a/src/libkcmtelepathyaccounts/integer-edit.h b/src/KCMTelepathyAccounts/integer-edit.h
similarity index 100%
rename from src/libkcmtelepathyaccounts/integer-edit.h
rename to src/KCMTelepathyAccounts/integer-edit.h
diff --git a/src/libkcmtelepathyaccounts/kcmtelepathyaccounts-accountuiplugin.desktop b/src/KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop
similarity index 100%
rename from src/libkcmtelepathyaccounts/kcmtelepathyaccounts-accountuiplugin.desktop
rename to src/KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop
diff --git a/src/defaultaccountui/mandatory-parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp
similarity index 100%
rename from src/defaultaccountui/mandatory-parameter-edit-widget.cpp
rename to src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp
diff --git a/src/defaultaccountui/mandatory-parameter-edit-widget.h b/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.h
similarity index 90%
rename from src/defaultaccountui/mandatory-parameter-edit-widget.h
rename to src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.h
index 78d10d6..d9550b1 100644
--- a/src/defaultaccountui/mandatory-parameter-edit-widget.h
+++ b/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.h
@@ -21,9 +21,11 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_MANDATORY_PARAMETER_EDIT_WIDGET_H
#define TELEPATHY_ACCOUNTS_KCM_MANDATORY_PARAMETER_EDIT_WIDGET_H
-#include "parameter-edit-widget.h"
+#include <KCMTelepathyAccounts/parameter-edit-widget.h>
-class MandatoryParameterEditWidget : public ParameterEditWidget
+#include <kdemacros.h>
+
+class KDE_EXPORT MandatoryParameterEditWidget : public ParameterEditWidget
{
Q_OBJECT
diff --git a/src/defaultaccountui/optional-parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/optional-parameter-edit-widget.cpp
similarity index 100%
rename from src/defaultaccountui/optional-parameter-edit-widget.cpp
rename to src/KCMTelepathyAccounts/optional-parameter-edit-widget.cpp
diff --git a/src/defaultaccountui/optional-parameter-edit-widget.h b/src/KCMTelepathyAccounts/optional-parameter-edit-widget.h
similarity index 90%
rename from src/defaultaccountui/optional-parameter-edit-widget.h
rename to src/KCMTelepathyAccounts/optional-parameter-edit-widget.h
index 6a8e788..68feb90 100644
--- a/src/defaultaccountui/optional-parameter-edit-widget.h
+++ b/src/KCMTelepathyAccounts/optional-parameter-edit-widget.h
@@ -21,9 +21,11 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_OPTIONAL_PARAMETER_EDIT_WIDGET_H
#define TELEPATHY_ACCOUNTS_KCM_OPTIONAL_PARAMETER_EDIT_WIDGET_H
-#include "parameter-edit-widget.h"
+#include <KCMTelepathyAccounts/parameter-edit-widget.h>
-class OptionalParameterEditWidget : public ParameterEditWidget
+#include <kdemacros.h>
+
+class KDE_EXPORT OptionalParameterEditWidget : public ParameterEditWidget
{
Q_OBJECT
diff --git a/src/defaultaccountui/parameter-edit-delegate.cpp b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
similarity index 98%
rename from src/defaultaccountui/parameter-edit-delegate.cpp
rename to src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
index 0b7f023..e386271 100644
--- a/src/defaultaccountui/parameter-edit-delegate.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
@@ -21,9 +21,8 @@
#include "parameter-edit-delegate.h"
#include "parameter-edit-model.h"
-
-#include "libkcmtelepathyaccounts/integer-edit.h"
-#include "libkcmtelepathyaccounts/unsigned-integer-edit.h"
+#include "integer-edit.h"
+#include "unsigned-integer-edit.h"
#include <KDebug>
diff --git a/src/defaultaccountui/parameter-edit-delegate.h b/src/KCMTelepathyAccounts/parameter-edit-delegate.h
similarity index 100%
rename from src/defaultaccountui/parameter-edit-delegate.h
rename to src/KCMTelepathyAccounts/parameter-edit-delegate.h
diff --git a/src/defaultaccountui/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
similarity index 100%
rename from src/defaultaccountui/parameter-edit-model.cpp
rename to src/KCMTelepathyAccounts/parameter-edit-model.cpp
diff --git a/src/defaultaccountui/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
similarity index 100%
rename from src/defaultaccountui/parameter-edit-model.h
rename to src/KCMTelepathyAccounts/parameter-edit-model.h
diff --git a/src/defaultaccountui/parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
similarity index 100%
rename from src/defaultaccountui/parameter-edit-widget.cpp
rename to src/KCMTelepathyAccounts/parameter-edit-widget.cpp
diff --git a/src/defaultaccountui/parameter-edit-widget.h b/src/KCMTelepathyAccounts/parameter-edit-widget.h
similarity index 90%
rename from src/defaultaccountui/parameter-edit-widget.h
rename to src/KCMTelepathyAccounts/parameter-edit-widget.h
index da29b06..7726e62 100644
--- a/src/defaultaccountui/parameter-edit-widget.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.h
@@ -21,11 +21,13 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
#define TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
-#include "libkcmtelepathyaccounts/abstract-account-parameters-widget.h"
+#include <KCMTelepathyAccounts/abstract-account-parameters-widget.h>
+
+#include <kdemacros.h>
#include <TelepathyQt4/ConnectionManager>
-class ParameterEditWidget : public AbstractAccountParametersWidget
+class KDE_EXPORT ParameterEditWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
diff --git a/src/defaultaccountui/parameter-edit-widget.ui b/src/KCMTelepathyAccounts/parameter-edit-widget.ui
similarity index 100%
rename from src/defaultaccountui/parameter-edit-widget.ui
rename to src/KCMTelepathyAccounts/parameter-edit-widget.ui
diff --git a/src/defaultaccountui/parameter-item.cpp b/src/KCMTelepathyAccounts/parameter-item.cpp
similarity index 100%
rename from src/defaultaccountui/parameter-item.cpp
rename to src/KCMTelepathyAccounts/parameter-item.cpp
diff --git a/src/defaultaccountui/parameter-item.h b/src/KCMTelepathyAccounts/parameter-item.h
similarity index 100%
rename from src/defaultaccountui/parameter-item.h
rename to src/KCMTelepathyAccounts/parameter-item.h
diff --git a/src/libkcmtelepathyaccounts/plugin-macros.h b/src/KCMTelepathyAccounts/plugin-macros.h
similarity index 100%
rename from src/libkcmtelepathyaccounts/plugin-macros.h
rename to src/KCMTelepathyAccounts/plugin-macros.h
diff --git a/src/plugin-manager.cpp b/src/KCMTelepathyAccounts/plugin-manager.cpp
similarity index 96%
rename from src/plugin-manager.cpp
rename to src/KCMTelepathyAccounts/plugin-manager.cpp
index 1818ac9..08afdee 100644
--- a/src/plugin-manager.cpp
+++ b/src/KCMTelepathyAccounts/plugin-manager.cpp
@@ -20,8 +20,8 @@
#include "plugin-manager.h"
-#include "libkcmtelepathyaccounts/abstract-account-ui-plugin.h"
-#include "libkcmtelepathyaccounts/abstract-account-ui.h"
+#include "abstract-account-ui-plugin.h"
+#include "abstract-account-ui.h"
#include <KDebug>
#include <KServiceTypeTrader>
diff --git a/src/plugin-manager.h b/src/KCMTelepathyAccounts/plugin-manager.h
similarity index 95%
rename from src/plugin-manager.h
rename to src/KCMTelepathyAccounts/plugin-manager.h
index f4378d5..8f6ff41 100644
--- a/src/plugin-manager.h
+++ b/src/KCMTelepathyAccounts/plugin-manager.h
@@ -21,13 +21,15 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PLUGIN_MANAGER_H
#define TELEPATHY_ACCOUNTS_KCM_PLUGIN_MANAGER_H
+#include <kdemacros.h>
+
#include <QtCore/QList>
#include <QtCore/QObject>
class AbstractAccountUi;
class AbstractAccountUiPlugin;
-class PluginManager : public QObject
+class KDE_EXPORT PluginManager : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(PluginManager)
diff --git a/src/protocol-item.cpp b/src/KCMTelepathyAccounts/protocol-item.cpp
similarity index 100%
rename from src/protocol-item.cpp
rename to src/KCMTelepathyAccounts/protocol-item.cpp
diff --git a/src/protocol-item.h b/src/KCMTelepathyAccounts/protocol-item.h
similarity index 95%
rename from src/protocol-item.h
rename to src/KCMTelepathyAccounts/protocol-item.h
index f2e9ee5..aba0ba0 100644
--- a/src/protocol-item.h
+++ b/src/KCMTelepathyAccounts/protocol-item.h
@@ -21,13 +21,15 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PROTOCOL_ITEM_H
#define TELEPATHY_ACCOUNTS_KCM_PROTOCOL_ITEM_H
+#include <kdemacros.h>
+
#include <QtCore/QObject>
#include <TelepathyQt4/ConnectionManager>
class ConnectionManagerItem;
-class ProtocolItem : public QObject
+class KDE_EXPORT ProtocolItem : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(ProtocolItem);
diff --git a/src/protocol-list-model.cpp b/src/KCMTelepathyAccounts/protocol-list-model.cpp
similarity index 100%
rename from src/protocol-list-model.cpp
rename to src/KCMTelepathyAccounts/protocol-list-model.cpp
diff --git a/src/protocol-list-model.h b/src/KCMTelepathyAccounts/protocol-list-model.h
similarity index 100%
rename from src/protocol-list-model.h
rename to src/KCMTelepathyAccounts/protocol-list-model.h
diff --git a/src/protocol-select-widget.cpp b/src/KCMTelepathyAccounts/protocol-select-widget.cpp
similarity index 100%
rename from src/protocol-select-widget.cpp
rename to src/KCMTelepathyAccounts/protocol-select-widget.cpp
diff --git a/src/protocol-select-widget.h b/src/KCMTelepathyAccounts/protocol-select-widget.h
similarity index 95%
rename from src/protocol-select-widget.h
rename to src/KCMTelepathyAccounts/protocol-select-widget.h
index 1904744..ca0bd8a 100644
--- a/src/protocol-select-widget.h
+++ b/src/KCMTelepathyAccounts/protocol-select-widget.h
@@ -21,6 +21,8 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_PROTOCOL_SELECT_WIDGET_H
#define TELEPATHY_ACCOUNTS_KCM_PROTOCOL_SELECT_WIDGET_H
+#include <kdemacros.h>
+
#include <QtGui/QWidget>
class ProtocolItem;
@@ -32,7 +34,7 @@ namespace Tp {
class PendingOperation;
}
-class ProtocolSelectWidget : public QWidget
+class KDE_EXPORT ProtocolSelectWidget : public QWidget
{
Q_OBJECT
diff --git a/src/protocol-select-widget.ui b/src/KCMTelepathyAccounts/protocol-select-widget.ui
similarity index 100%
rename from src/protocol-select-widget.ui
rename to src/KCMTelepathyAccounts/protocol-select-widget.ui
diff --git a/src/libkcmtelepathyaccounts/unsigned-integer-edit.cpp b/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
similarity index 100%
rename from src/libkcmtelepathyaccounts/unsigned-integer-edit.cpp
rename to src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
diff --git a/src/libkcmtelepathyaccounts/unsigned-integer-edit.h b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
similarity index 100%
rename from src/libkcmtelepathyaccounts/unsigned-integer-edit.h
rename to src/KCMTelepathyAccounts/unsigned-integer-edit.h
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 484178d..de920c0 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -20,15 +20,14 @@
#include "add-account-assistant.h"
-#include "connection-manager-item.h"
-#include "mandatory-parameter-edit-widget.h"
-#include "optional-parameter-edit-widget.h"
-#include "plugin-manager.h"
-#include "protocol-item.h"
-#include "protocol-select-widget.h"
-
-#include "libkcmtelepathyaccounts/abstract-account-parameters-widget.h"
-#include "libkcmtelepathyaccounts/abstract-account-ui.h"
+#include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
+#include "KCMTelepathyAccounts/abstract-account-ui.h"
+#include "KCMTelepathyAccounts/connection-manager-item.h"
+#include "KCMTelepathyAccounts/mandatory-parameter-edit-widget.h"
+#include "KCMTelepathyAccounts/optional-parameter-edit-widget.h"
+#include "KCMTelepathyAccounts/plugin-manager.h"
+#include "KCMTelepathyAccounts/protocol-item.h"
+#include "KCMTelepathyAccounts/protocol-select-widget.h"
#include <KDebug>
#include <KLocale>
diff --git a/src/defaultaccountui/integer-edit.cpp b/src/defaultaccountui/integer-edit.cpp
deleted file mode 100644
index 98e9322..0000000
--- a/src/defaultaccountui/integer-edit.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "integer-edit.h"
-
-#include <KDebug>
-
-#include <QtGui/QKeyEvent>
-
-IntegerEdit::IntegerEdit(QWidget *parent)
- : QLineEdit(parent)
-{
- connect(this, SIGNAL(textChanged(QString)), SLOT(onTextChanged(QString)));
-}
-
-IntegerEdit::~IntegerEdit()
-{
-
-}
-
-void IntegerEdit::setValue(int integer)
-{
- setText(QString::number(integer));
-}
-
-void IntegerEdit::keyPressEvent(QKeyEvent *event)
-{
- kDebug() << "Key:" << event->key() << "Text:" << event->text();
-
- // If the text is empty or a modifier, allow the keypress
- if ((event->text().isEmpty()) || (event->key() < Qt::Key_Space)) {
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
-
- // If the key is backspace or delete, allow it
- if ((event->key() == Qt::Key_Delete) || (event->key() == Qt::Key_Backspace)) {
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
-
- // Check for numbers (and ensure maximum input length is not expended
- // FIXME: Have a better check to make sure the user doesn't enter a number too large.
- QString validKeys("0123456789");
- if (validKeys.contains(event->text())) {
- if (((text().contains(QString("-"))) && ((text().length() + 1) <= 5)) ||
- ((text().length() + 1) <= 4))
- {
- kDebug() << "Key is a number.";
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
- }
-
- // Check for minus sign as the first character
- if (event->text() == QString("-")) {
- if (cursorPosition() == 0) {
- if (!text().contains(QString("-"))) {
- kDebug() << "Key is a minus-sign at the start.";
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
- }
- }
-
- // Anything else, reject the keypress.
- event->accept();
-}
-
-void IntegerEdit::onTextChanged(const QString &text)
-{
- Q_EMIT integerChanged(text.toInt());
-}
-
-
-#include "integer-edit.moc"
-
diff --git a/src/defaultaccountui/integer-edit.h b/src/defaultaccountui/integer-edit.h
deleted file mode 100644
index 85f5cac..0000000
--- a/src/defaultaccountui/integer-edit.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef TELEPATHY_ACCOUNTS_KCM_INTEGER_EDIT_H
-#define TELEPATHY_ACCOUNTS_KCM_INTEGER_EDIT_H
-
-#include <QtGui/QLineEdit>
-
-class IntegerEdit : public QLineEdit
-{
- Q_OBJECT
-
-public:
- explicit IntegerEdit(QWidget *parent = 0);
- virtual ~IntegerEdit();
-
- void setValue(int integer);
-
-protected:
- void keyPressEvent(QKeyEvent *event);
-
-Q_SIGNALS:
- void integerChanged(int integer);
-
-private Q_SLOTS:
- void onTextChanged(const QString &text);
-};
-
-
-#endif // header guard
-
diff --git a/src/defaultaccountui/unsigned-integer-edit.cpp b/src/defaultaccountui/unsigned-integer-edit.cpp
deleted file mode 100644
index 98d8286..0000000
--- a/src/defaultaccountui/unsigned-integer-edit.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "unsigned-integer-edit.h"
-
-#include <KDebug>
-
-#include <QtGui/QKeyEvent>
-
-UnsignedIntegerEdit::UnsignedIntegerEdit(QWidget *parent)
- : QLineEdit(parent)
-{
- connect(this, SIGNAL(textChanged(QString)), SLOT(onTextChanged(QString)));
-}
-
-UnsignedIntegerEdit::~UnsignedIntegerEdit()
-{
-
-}
-
-void UnsignedIntegerEdit::setValue(uint unsignedInteger)
-{
- setText(QString::number(unsignedInteger));
-}
-
-void UnsignedIntegerEdit::keyPressEvent(QKeyEvent *event)
-{
- kDebug() << "Key:" << event->key() << "Text:" << event->text();
-
- // If the text is empty or a modifier, allow the keypress
- if ((event->text().isEmpty()) || (event->key() < Qt::Key_Space)) {
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
-
- // If the key is backspace or delete, allow it
- if ((event->key() == Qt::Key_Delete) || (event->key() == Qt::Key_Backspace)) {
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
-
- // Check for numbers (and ensure maximum input length is not expended
- // FIXME: Have a better check to make sure the user doesn't enter a number too large.
- QString validKeys("0123456789");
- if (validKeys.contains(event->text())) {
- if ((text().length() + 1) <= 4)
- {
- kDebug() << "Key is a number.";
- event->ignore();
- QLineEdit::keyPressEvent(event);
- return;
- }
- }
-
- // Anything else, reject the keypress.
- event->accept();
-}
-
-void UnsignedIntegerEdit::onTextChanged(const QString &text)
-{
- Q_EMIT unsignedIntegerChanged(text.toUInt());
-}
-
-
-#include "unsigned-integer-edit.moc"
-
diff --git a/src/defaultaccountui/unsigned-integer-edit.h b/src/defaultaccountui/unsigned-integer-edit.h
deleted file mode 100644
index 8f238fd..0000000
--- a/src/defaultaccountui/unsigned-integer-edit.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef TELEPATHY_ACCOUNTS_KCM_UNSIGNED_INTEGER_EDIT_H
-#define TELEPATHY_ACCOUNTS_KCM_UNSIGNED_INTEGER_EDIT_H
-
-#include <QtGui/QLineEdit>
-
-class UnsignedIntegerEdit : public QLineEdit
-{
- Q_OBJECT
-
-public:
- explicit UnsignedIntegerEdit(QWidget *parent = 0);
- virtual ~UnsignedIntegerEdit();
-
- void setValue(uint unsignedInteger);
-
-protected:
- void keyPressEvent(QKeyEvent *event);
-
-Q_SIGNALS:
- void unsignedIntegerChanged(uint unsignedInteger);
-
-private Q_SLOTS:
- void onTextChanged(const QString &text);
-};
-
-
-#endif // header guard
-
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 83bbaaf..d7ab093 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -20,12 +20,11 @@
#include "edit-account-dialog.h"
-#include "mandatory-parameter-edit-widget.h"
-#include "optional-parameter-edit-widget.h"
-#include "plugin-manager.h"
-
-#include "libkcmtelepathyaccounts/abstract-account-parameters-widget.h"
-#include "libkcmtelepathyaccounts/abstract-account-ui.h"
+#include "KCMTelepathyAccounts/abstract-account-parameters-widget.h"
+#include "KCMTelepathyAccounts/abstract-account-ui.h"
+#include "KCMTelepathyAccounts/mandatory-parameter-edit-widget.h"
+#include "KCMTelepathyAccounts/optional-parameter-edit-widget.h"
+#include "KCMTelepathyAccounts/plugin-manager.h"
#include <KDebug>
#include <KLocale>
@@ -260,7 +259,6 @@ void EditAccountDialog::accept()
unsetParameters.append(pp->name());
}
- // FIXME: Ask the user to submit a Display Name
Tp::PendingStringList *psl = d->item->account()->updateParameters(parameters, unsetParameters);
connect(psl,
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list