SVN commit 1009805 by gberg: Move all the other files used by Kopete into the library. Merge branch 'lib' M +4 -20 CMakeLists.txt A KCMTelepathyAccounts (directory) A KCMTelepathyAccounts/CMakeLists.txt A KCMTelepathyAccounts/abstract-account-parameters-widget.cpp libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/abstract-account-parameters-widget.h libkcmtelepathyaccounts/abstract-account-parameters-widget.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/abstract-account-ui-plugin.cpp libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/abstract-account-ui-plugin.h libkcmtelepathyaccounts/abstract-account-ui-plugin.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/abstract-account-ui.cpp libkcmtelepathyaccounts/abstract-account-ui.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/abstract-account-ui.h libkcmtelepathyaccounts/abstract-account-ui.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/connection-manager-item.cpp connection-manager-item.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/connection-manager-item.h connection-manager-item.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/dictionary.cpp dictionary.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/dictionary.h dictionary.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/include (directory) A KCMTelepathyAccounts/include/AbstractAccountParametersWidget libkcmtelepathyaccounts/include/AbstractAccountParametersWidget#1009753 A KCMTelepathyAccounts/include/AbstractAccountUi libkcmtelepathyaccounts/include/AbstractAccountUi#1009753 A KCMTelepathyAccounts/include/AbstractAccountUiPlugin libkcmtelepathyaccounts/include/AbstractAccountUiPlugin#1009753 A KCMTelepathyAccounts/include/ConnectionManagerItem A KCMTelepathyAccounts/include/IntegerEdit libkcmtelepathyaccounts/include/IntegerEdit#1009753 A KCMTelepathyAccounts/include/MandatoryParameterEditWidget A KCMTelepathyAccounts/include/OptionalParameterEditWidget A KCMTelepathyAccounts/include/ParameterEditWidget A KCMTelepathyAccounts/include/PluginMacros libkcmtelepathyaccounts/include/PluginMacros#1009753 A KCMTelepathyAccounts/include/PluginManager A KCMTelepathyAccounts/include/ProtocolItem A KCMTelepathyAccounts/include/ProtocolSelectWidget A KCMTelepathyAccounts/include/UnsignedIntegerEdit libkcmtelepathyaccounts/include/UnsignedIntegerEdit#1009753 A KCMTelepathyAccounts/integer-edit.cpp libkcmtelepathyaccounts/integer-edit.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/integer-edit.h libkcmtelepathyaccounts/integer-edit.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/kcmtelepathyaccounts-accountuiplugin.desktop libkcmtelepathyaccounts/kcmtelepathyaccounts-accountuiplugin.desktop#1009753 A KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp defaultaccountui/mandatory-parameter-edit-widget.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/mandatory-parameter-edit-widget.h defaultaccountui/mandatory-parameter-edit-widget.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/optional-parameter-edit-widget.cpp defaultaccountui/optional-parameter-edit-widget.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/optional-parameter-edit-widget.h defaultaccountui/optional-parameter-edit-widget.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-delegate.cpp defaultaccountui/parameter-edit-delegate.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-delegate.h defaultaccountui/parameter-edit-delegate.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-model.cpp defaultaccountui/parameter-edit-model.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-model.h defaultaccountui/parameter-edit-model.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-widget.cpp defaultaccountui/parameter-edit-widget.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-widget.h defaultaccountui/parameter-edit-widget.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-edit-widget.ui defaultaccountui/parameter-edit-widget.ui#1009753 A KCMTelepathyAccounts/parameter-item.cpp defaultaccountui/parameter-item.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/parameter-item.h defaultaccountui/parameter-item.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/plugin-macros.h libkcmtelepathyaccounts/plugin-macros.h#1009753 [License: UNKNOWN] A KCMTelepathyAccounts/plugin-manager.cpp plugin-manager.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/plugin-manager.h plugin-manager.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-item.cpp protocol-item.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-item.h protocol-item.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-list-model.cpp protocol-list-model.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-list-model.h protocol-list-model.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-select-widget.cpp protocol-select-widget.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-select-widget.h protocol-select-widget.h#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/protocol-select-widget.ui protocol-select-widget.ui#1009753 A KCMTelepathyAccounts/unsigned-integer-edit.cpp libkcmtelepathyaccounts/unsigned-integer-edit.cpp#1009753 [License: LGPL (v2.1+)] A KCMTelepathyAccounts/unsigned-integer-edit.h libkcmtelepathyaccounts/unsigned-integer-edit.h#1009753 [License: LGPL (v2.1+)] M +8 -9 add-account-assistant.cpp D connection-manager-item.cpp D connection-manager-item.h D defaultaccountui/integer-edit.cpp D defaultaccountui/integer-edit.h D defaultaccountui/mandatory-parameter-edit-widget.cpp D defaultaccountui/mandatory-parameter-edit-widget.h D defaultaccountui/optional-parameter-edit-widget.cpp D defaultaccountui/optional-parameter-edit-widget.h D defaultaccountui/parameter-edit-delegate.cpp D defaultaccountui/parameter-edit-delegate.h D defaultaccountui/parameter-edit-model.cpp D defaultaccountui/parameter-edit-model.h D defaultaccountui/parameter-edit-widget.cpp D defaultaccountui/parameter-edit-widget.h D defaultaccountui/parameter-edit-widget.ui D defaultaccountui/parameter-item.cpp D defaultaccountui/parameter-item.h D defaultaccountui/unsigned-integer-edit.cpp D defaultaccountui/unsigned-integer-edit.h D dictionary.cpp D dictionary.h M +5 -7 edit-account-dialog.cpp D libkcmtelepathyaccounts/CMakeLists.txt D libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp D libkcmtelepathyaccounts/abstract-account-parameters-widget.h D libkcmtelepathyaccounts/abstract-account-ui-plugin.cpp D libkcmtelepathyaccounts/abstract-account-ui-plugin.h D libkcmtelepathyaccounts/abstract-account-ui.cpp D libkcmtelepathyaccounts/abstract-account-ui.h D libkcmtelepathyaccounts/include/AbstractAccountParametersWidget D libkcmtelepathyaccounts/include/AbstractAccountUi D libkcmtelepathyaccounts/include/AbstractAccountUiPlugin D libkcmtelepathyaccounts/include/IntegerEdit D libkcmtelepathyaccounts/include/PluginMacros D libkcmtelepathyaccounts/include/UnsignedIntegerEdit D libkcmtelepathyaccounts/integer-edit.cpp D libkcmtelepathyaccounts/integer-edit.h D libkcmtelepathyaccounts/kcmtelepathyaccounts-accountuiplugin.desktop D libkcmtelepathyaccounts/plugin-macros.h D libkcmtelepathyaccounts/unsigned-integer-edit.cpp D libkcmtelepathyaccounts/unsigned-integer-edit.h D plugin-manager.cpp D plugin-manager.h D protocol-item.cpp D protocol-item.h D protocol-list-model.cpp D protocol-list-model.h D protocol-select-widget.cpp D protocol-select-widget.h D protocol-select-widget.ui --- trunk/playground/network/telepathy-accounts-kcm/src/CMakeLists.txt #1009804:1009805 @@ -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 --- trunk/playground/network/telepathy-accounts-kcm/src/add-account-assistant.cpp #1009804:1009805 @@ -20,16 +20,15 @@ #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 "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 "libkcmtelepathyaccounts/abstract-account-parameters-widget.h" -#include "libkcmtelepathyaccounts/abstract-account-ui.h" - #include #include #include --- trunk/playground/network/telepathy-accounts-kcm/src/edit-account-dialog.cpp #1009804:1009805 @@ -20,13 +20,12 @@ #include "edit-account-dialog.h" -#include "mandatory-parameter-edit-widget.h" -#include "optional-parameter-edit-widget.h" -#include "plugin-manager.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 "libkcmtelepathyaccounts/abstract-account-parameters-widget.h" -#include "libkcmtelepathyaccounts/abstract-account-ui.h" - #include #include #include @@ -260,7 +259,6 @@ unsetParameters.append(pp->name()); } - // FIXME: Ask the user to submit a Display Name Tp::PendingStringList *psl = d->item->account()->updateParameters(parameters, unsetParameters); connect(psl,