From cc64a76c8be5f344ab0645e2797e319c0b5b32cc 2013-01-23 11:29:43 From: Jan Kaluza Date: 2013-01-23 11:29:43 Subject: [PATCH] Replace #include "Swiften/Swiften.h" by particular headers. 25% compilation speedup. --- diff --git a/include/transport/adhoccommand.h b/include/transport/adhoccommand.h index 24dbe8e64929c310fc77ff3caeaf497e710bd82b..e1734b1235a15c991ac836c32687111fa89c758a 100644 --- a/include/transport/adhoccommand.h +++ b/include/transport/adhoccommand.h @@ -23,7 +23,9 @@ #include #include #include -#include "Swiften/Swiften.h" + +#include "Swiften/Elements/FormField.h" +#include "Swiften/Elements/Command.h" namespace Transport { diff --git a/include/transport/adhoccommandfactory.h b/include/transport/adhoccommandfactory.h index 93c9d4a524d4f91e7b09a5d7ee259d9a1591b220..859421c5c6c64841dbab7c1cd7cec433d11843af 100644 --- a/include/transport/adhoccommandfactory.h +++ b/include/transport/adhoccommandfactory.h @@ -24,7 +24,6 @@ #include #include #include "transport/adhoccommand.h" -#include "Swiften/Swiften.h" namespace Transport { diff --git a/include/transport/adhocmanager.h b/include/transport/adhocmanager.h index 8b41864091395b8a2747d1c96432a75c57b5caee..b8f77f87571cb72bd44bb719436d94cfa592959b 100644 --- a/include/transport/adhocmanager.h +++ b/include/transport/adhocmanager.h @@ -23,7 +23,10 @@ #include #include #include -#include "Swiften/Swiften.h" + +#include "Swiften/Queries/Responder.h" +#include "Swiften/Elements/Command.h" +#include "Swiften/Network/Timer.h" namespace Transport { diff --git a/include/transport/admininterface.h b/include/transport/admininterface.h index 48f85dc17911cb3e4fa58d0067d5abf0ef173b87..3ab0394174c5e02977b93f2cc6b52f196a8938ab 100644 --- a/include/transport/admininterface.h +++ b/include/transport/admininterface.h @@ -22,7 +22,8 @@ #include #include -#include "Swiften/Swiften.h" + +#include "Swiften/Elements/Message.h" namespace Transport { diff --git a/include/transport/buddy.h b/include/transport/buddy.h index e11ed4250576ab8c55ac36fd7b9e2590fc61fd19..06792dc88a174ae74f0001575e422a9e8bbaacf9 100644 --- a/include/transport/buddy.h +++ b/include/transport/buddy.h @@ -23,8 +23,8 @@ #include #include #include "transport/transport.h" +#include "Swiften/Elements/VCard.h" -#include "Swiften/Swiften.h" namespace Transport { diff --git a/include/transport/conversation.h b/include/transport/conversation.h index 121794d68481412e7d1d610520d51aff7b6fc047..eb2885f8fdaac40b22ecbbb5a054bb83e9793e30 100644 --- a/include/transport/conversation.h +++ b/include/transport/conversation.h @@ -24,7 +24,6 @@ #include #include "transport/transport.h" -#include "Swiften/Swiften.h" #include "Swiften/Elements/Message.h" namespace Transport { diff --git a/include/transport/conversationmanager.h b/include/transport/conversationmanager.h index 0ef2842f8cb6698e31380d399d645631ab04d9d7..7aa606bfaa0c236089b28cd88dc78d06c7a6915a 100644 --- a/include/transport/conversationmanager.h +++ b/include/transport/conversationmanager.h @@ -23,7 +23,8 @@ #include #include #include -#include "Swiften/Swiften.h" + +#include "Swiften/Elements/Message.h" namespace Transport { diff --git a/include/transport/discoitemsresponder.h b/include/transport/discoitemsresponder.h index ddc1a2af0c6f5fef0576d5bdb795f8a8173f9aa2..ff12cdcfacaa12bef20442166ba81c86d93ddc9d 100644 --- a/include/transport/discoitemsresponder.h +++ b/include/transport/discoitemsresponder.h @@ -21,9 +21,9 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/GetResponder.h" #include "Swiften/Elements/DiscoItems.h" +#include "Swiften/Elements/CapsInfo.h" namespace Transport { diff --git a/include/transport/factory.h b/include/transport/factory.h index 0c4595d734d29ac6a2e86771ff50fb30711bd410..7df6e252873e851accae902abe2e3b59a5dc0944 100644 --- a/include/transport/factory.h +++ b/include/transport/factory.h @@ -24,7 +24,6 @@ #include #include "transport/transport.h" -#include "Swiften/Swiften.h" #include "Swiften/Elements/Message.h" #include "transport/conversation.h" #include "transport/buddy.h" diff --git a/include/transport/gatewayresponder.h b/include/transport/gatewayresponder.h index 8cefedbed52d1fc81ba3659db7f4e80436d864df..59b765eacc6de44b3764e039d8dc7f2ef4e6caaa 100644 --- a/include/transport/gatewayresponder.h +++ b/include/transport/gatewayresponder.h @@ -21,7 +21,6 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/GatewayPayload.h" diff --git a/include/transport/memoryreadbytestream.h b/include/transport/memoryreadbytestream.h index 0f423a5564aeb97ae845f189564d625b05e7d351..cb36389f22d7292648c152789321b16929282a02 100644 --- a/include/transport/memoryreadbytestream.h +++ b/include/transport/memoryreadbytestream.h @@ -22,7 +22,8 @@ #include #include -#include "Swiften/Swiften.h" + +#include "Swiften/FileTransfer/ReadBytestream.h" namespace Transport { diff --git a/include/transport/mysqlbackend.h b/include/transport/mysqlbackend.h index eeb0a65f9c5256a0e759f6acbd8d275efb682626..6073324079fe10fa79f6ce054595f730eef3146f 100644 --- a/include/transport/mysqlbackend.h +++ b/include/transport/mysqlbackend.h @@ -24,7 +24,6 @@ #include #include -#include "Swiften/Swiften.h" #include "transport/storagebackend.h" #include "transport/config.h" #include "mysql.h" diff --git a/include/transport/networkpluginserver.h b/include/transport/networkpluginserver.h index b5aa0b71bdb7be0e1e7443b26f1a5034c8363713..322e20484c8a9a13118efc8cf8fdacb0191b5fe6 100644 --- a/include/transport/networkpluginserver.h +++ b/include/transport/networkpluginserver.h @@ -21,11 +21,13 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Presence/PresenceOracle.h" #include "Swiften/Disco/EntityCapsManager.h" #include "Swiften/Network/BoostConnectionServer.h" #include "Swiften/Network/Connection.h" +#include "Swiften/Elements/ChatState.h" +#include "Swiften/Elements/RosterItemPayload.h" +#include "Swiften/Elements/VCard.h" #include "storagebackend.h" #include "transport/filetransfermanager.h" diff --git a/include/transport/pqxxbackend.h b/include/transport/pqxxbackend.h index bf5abf25d9b9fd8ea8e5fbfa38a1c0c1a83cdd15..5ec0c40904b07607e5c6366bc3a3e91a1f4c447a 100644 --- a/include/transport/pqxxbackend.h +++ b/include/transport/pqxxbackend.h @@ -24,7 +24,6 @@ #include #include -#include "Swiften/Swiften.h" #include "transport/storagebackend.h" #include "transport/config.h" #include diff --git a/include/transport/rostermanager.h b/include/transport/rostermanager.h index fd649b57df89e3466fc310edceb26d4ee1c9c5c4..fbd652ff94353a88443f980555bc5185960022a7 100644 --- a/include/transport/rostermanager.h +++ b/include/transport/rostermanager.h @@ -25,8 +25,12 @@ #include #include #include -#include "Swiften/Swiften.h" // #include "rosterstorage.h" +#include "Swiften/Elements/RosterPayload.h" +#include "Swiften/Queries/GenericRequest.h" +#include "Swiften/Roster/SetRosterRequest.h" +#include "Swiften/Elements/Presence.h" +#include "Swiften/Network/Timer.h" namespace Transport { diff --git a/include/transport/rosterresponder.h b/include/transport/rosterresponder.h index f716ddcdbd51756689fdffdc23e7a87ebe6c679f..4aaa21380e774be2a40e158eb944c0dec162b39b 100644 --- a/include/transport/rosterresponder.h +++ b/include/transport/rosterresponder.h @@ -21,10 +21,11 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/RosterPayload.h" +#include + namespace Transport { class UserManager; diff --git a/include/transport/rosterstorage.h b/include/transport/rosterstorage.h index 726425c4b9df6b0f156392dcf8d82f02b81e7041..21703442c672449e61f0b064a0477281f7423942 100644 --- a/include/transport/rosterstorage.h +++ b/include/transport/rosterstorage.h @@ -22,7 +22,9 @@ #include #include -#include "Swiften/Swiften.h" +#include + +#include "Swiften/Network/Timer.h" namespace Transport { diff --git a/include/transport/settingsadhoccommand.h b/include/transport/settingsadhoccommand.h index 3a2450a14b1fef2c59ed0f488b1a97cfff7bd305..02eff3d905b1378c291e89a14822b036331aba31 100644 --- a/include/transport/settingsadhoccommand.h +++ b/include/transport/settingsadhoccommand.h @@ -23,7 +23,6 @@ #include #include #include -#include "Swiften/Swiften.h" #include "transport/adhoccommand.h" #include "transport/adhoccommandfactory.h" diff --git a/include/transport/sqlite3backend.h b/include/transport/sqlite3backend.h index d654ffa6b58528de3f0d696da1f2e3ee0cf90c78..3c6411cacc8a40189bd24b8b9149f9335358d481 100644 --- a/include/transport/sqlite3backend.h +++ b/include/transport/sqlite3backend.h @@ -24,7 +24,6 @@ #include #include -#include "Swiften/Swiften.h" #include "transport/storagebackend.h" #include "transport/config.h" #include "sqlite3.h" diff --git a/include/transport/statsresponder.h b/include/transport/statsresponder.h index ecdd331f5c83f4fd6a0fba05bbdf45be6c230c4b..8f7fd8b672a46e6156b8f149a45276a8919f8b2c 100644 --- a/include/transport/statsresponder.h +++ b/include/transport/statsresponder.h @@ -21,7 +21,6 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/SetResponder.h" #include "Swiften/Elements/StatsPayload.h" diff --git a/include/transport/threadpool.h b/include/transport/threadpool.h index 6f498afaa1e5019f9a0b1d50c8b095962c0fbe20..27cb1a083474a98bf4e37b9c4024dbfb419ada72 100644 --- a/include/transport/threadpool.h +++ b/include/transport/threadpool.h @@ -7,7 +7,7 @@ #include #include #include "transport/logging.h" -#include "Swiften/Swiften.h" +#include "Swiften/EventLoop/EventLoop.h" /* diff --git a/include/transport/transport.h b/include/transport/transport.h index c69ca39697c2599b2e1e2b5f6983c3d61c47de08..b27ddd37c1ec7b286f5d522a3710cff9857aa1c4 100644 --- a/include/transport/transport.h +++ b/include/transport/transport.h @@ -21,7 +21,6 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Server/Server.h" #include "Swiften/Disco/GetDiscoInfoRequest.h" #include "Swiften/Disco/EntityCapsManager.h" @@ -32,6 +31,8 @@ #include "Swiften/Server/UserRegistry.h" #include "Swiften/Base/SafeByteArray.h" #include "Swiften/Jingle/JingleSessionManager.h" +#include "Swiften/Component/ComponentError.h" +#include "Swiften/Component/Component.h" #include #include "transport/config.h" @@ -40,12 +41,6 @@ #include namespace Transport { - // typedef enum { CLIENT_FEATURE_ROSTERX = 2, - // CLIENT_FEATURE_XHTML_IM = 4, - // CLIENT_FEATURE_FILETRANSFER = 8, - // CLIENT_FEATURE_CHATSTATES = 16 - // } SpectrumImportantFeatures; - // class StorageBackend; class Factory; class UserRegistry; @@ -68,7 +63,9 @@ namespace Transport { /// - service.server /// - service.port /// - service.server_mode + /// \param factories Swift::NetworkFactories. /// \param factory Transport Abstract factory used to create basic transport structures. + /// \param userRegistery UserRegistry class instance. It's needed only when running transport in server-mode. Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories, Config *config, Factory *factory, Transport::UserRegistry *userRegistry = NULL); /// Component destructor. @@ -96,9 +93,13 @@ namespace Transport { /// \return True if the component is in server mode. bool inServerMode() { return m_server != NULL; } - /// Connects the Jabber server. - + /// Starts the Component. + + /// In server-mode, it starts listening on particular port for new client connections. + /// In gateway-mode, it connects the XMPP server. void start(); + + /// Stops the component. void stop(); /// Returns Jabber ID of this transport. @@ -139,14 +140,17 @@ namespace Transport { /// This signal is emitted when presence from XMPP user is received. /// It's emitted only for presences addressed to transport itself - /// (for example to="j2j.domain.tld"). - /// \param presence presence data + /// (for example to="j2j.domain.tld") and for presences comming to + /// MUC (for example to="#chat%irc.freenode.org@irc.domain.tld") + /// \param presence Presence. boost::signal onUserPresenceReceived; + /// Component class asks the XMPP clients automatically for their capabilities. + /// This signal is emitted when capabilities have been received or changed. + /// \param jid JID of the client for which we received capabilities + /// \param info disco#info with response. boost::signal info)> onUserDiscoInfoReceived; -// boost::signal info, Swift::ErrorPayload::ref error, const Swift::JID& jid)> onDiscoInfoResponse; - private: void handleConnected(); void handleConnectionError(const Swift::ComponentError &error); diff --git a/include/transport/user.h b/include/transport/user.h index f7752f0755e0b9e82c2424b5541282defc712d0c..580fda410a3c36b6fb5d83762279086761c5ce73 100644 --- a/include/transport/user.h +++ b/include/transport/user.h @@ -21,12 +21,13 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Disco/EntityCapsManager.h" #include "Swiften/Disco/EntityCapsProvider.h" #include "storagebackend.h" #include #include "Swiften/Elements/SpectrumErrorPayload.h" +#include "Swiften/Network/Timer.h" +#include "Swiften/Network/Connection.h" namespace Transport { diff --git a/include/transport/usermanager.h b/include/transport/usermanager.h index 38a5c7bcb0cdab778de40ea4821111a4af71ec75..4ccefb537112dbb6a9fbe09a27e3e62266d28bf2 100644 --- a/include/transport/usermanager.h +++ b/include/transport/usermanager.h @@ -22,8 +22,12 @@ #include #include -#include "Swiften/Swiften.h" #include "transport/userregistry.h" +#include "Swiften/Elements/Message.h" +#include "Swiften/Elements/Presence.h" +#include "Swiften/Disco/EntityCapsProvider.h" +#include "Swiften/Elements/DiscoInfo.h" +#include "Swiften/Network/Timer.h" namespace Transport { diff --git a/include/transport/userregistration.h b/include/transport/userregistration.h index 2e9b6136ea47f7b58a3c54d0f27d8aec3859ba73..1c994423cec675a058228a355be03a8d03fe9944 100644 --- a/include/transport/userregistration.h +++ b/include/transport/userregistration.h @@ -20,9 +20,10 @@ #pragma once -#include "Swiften/Swiften.h" #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/InBandRegistrationPayload.h" +#include "Swiften/Elements/RosterPayload.h" +#include namespace Transport { diff --git a/include/transport/userregistry.h b/include/transport/userregistry.h index 0b6cac145778c555203f915056aa4c6737a12258..58590a0185b2eb08126f48cb3a7ba729e77f5685 100644 --- a/include/transport/userregistry.h +++ b/include/transport/userregistry.h @@ -22,8 +22,10 @@ #include #include -#include "Swiften/Swiften.h" #include "Swiften/Server/UserRegistry.h" +#include "Swiften/Network/NetworkFactories.h" +#include "Swiften/Network/Timer.h" +#include "Swiften/Network/TimerFactory.h" #include "transport/config.h" namespace Transport { diff --git a/include/transport/usersreconnecter.h b/include/transport/usersreconnecter.h index 52497e64a6f8e235cc6994875f8eb414788b5962..0c813b0c49b5500d6007e3eaf270fa1fd58b30e9 100644 --- a/include/transport/usersreconnecter.h +++ b/include/transport/usersreconnecter.h @@ -23,7 +23,8 @@ #include #include #include -#include "Swiften/Swiften.h" + +#include "Swiften/Network/Timer.h" namespace Transport { diff --git a/include/transport/vcardresponder.h b/include/transport/vcardresponder.h index 156a95e46d6128b31ee8cb728088e4b4602d66cf..852500e2f898eac0e1f3af4ab11fac00666ce2ba 100644 --- a/include/transport/vcardresponder.h +++ b/include/transport/vcardresponder.h @@ -21,9 +21,11 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/VCard.h" +#include "Swiften/Network/NetworkFactories.h" +#include "Swiften/Network/Timer.h" +#include namespace Transport { diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp index a024138e97cb5feccab77f381eb2fd75e6ed2878..176c618d099f0aa9221068cd878288ce7b803722 100644 --- a/spectrum/src/main.cpp +++ b/spectrum/src/main.cpp @@ -17,6 +17,7 @@ #include "transport/adhocmanager.h" #include "transport/settingsadhoccommand.h" #include "Swiften/EventLoop/SimpleEventLoop.h" +#include "Swiften/Network/BoostNetworkFactories.h" #include #include #ifndef WIN32 diff --git a/src/blockresponder.cpp b/src/blockresponder.cpp index 708fec439c9e9388ab29641c5629b1029b18ea67..6a5ad41c6e4b0328004a899afe4c8b4627184f99 100644 --- a/src/blockresponder.cpp +++ b/src/blockresponder.cpp @@ -24,7 +24,6 @@ #include #include "Swiften/Queries/IQRouter.h" #include "transport/BlockPayload.h" -#include "Swiften/Swiften.h" #include "transport/usermanager.h" #include "transport/user.h" #include "transport/buddy.h" diff --git a/src/blockresponder.h b/src/blockresponder.h index 8f77bea83567d0991ef255ff77757e7f42b22f3e..ed415502e9bc259c128adceb8ea90110b0baa31e 100644 --- a/src/blockresponder.h +++ b/src/blockresponder.h @@ -21,9 +21,9 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/SetResponder.h" #include "transport/BlockPayload.h" +#include namespace Transport { diff --git a/src/buddy.cpp b/src/buddy.cpp index eb5388f51bee6bfb2e0edac848710208501c7c13..300053cf3d0a20d4f05c9d32654d685af042e10c 100644 --- a/src/buddy.cpp +++ b/src/buddy.cpp @@ -26,6 +26,8 @@ #include "transport/usermanager.h" #include "transport/discoitemsresponder.h" +#include "Swiften/Elements/VCardUpdate.h" + namespace Transport { Buddy::Buddy(RosterManager *rosterManager, long id, BuddyFlag flags) : m_id(id), m_flags(flags), m_rosterManager(rosterManager), diff --git a/src/conversation.cpp b/src/conversation.cpp index 1a8b838336de41d20f7a7f1da6f28ff86f54f4ad..6074fc7890b854eab779f21f934c36e52a173469 100644 --- a/src/conversation.cpp +++ b/src/conversation.cpp @@ -26,6 +26,11 @@ #include "transport/buddy.h" #include "transport/rostermanager.h" +#include "Swiften/Elements/MUCItem.h" +#include "Swiften/Elements/MUCOccupant.h" +#include "Swiften/Elements/MUCUserPayload.h" +#include "Swiften/Elements/Delay.h" + namespace Transport { Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) { diff --git a/src/discoinforesponder.cpp b/src/discoinforesponder.cpp index 15ce154426eb36b669ae6aefe1a01d6ffc8d8f49..448ec17dec382b2951ac2b7178d91952185aa635 100644 --- a/src/discoinforesponder.cpp +++ b/src/discoinforesponder.cpp @@ -26,9 +26,9 @@ #include "Swiften/Disco/DiscoInfoResponder.h" #include "Swiften/Queries/IQRouter.h" #include "Swiften/Elements/DiscoInfo.h" -#include "Swiften/Swiften.h" #include "transport/config.h" #include "transport/logging.h" +#include "Swiften/Disco/CapsInfoGenerator.h" using namespace Swift; using namespace boost; diff --git a/src/discoinforesponder.h b/src/discoinforesponder.h index 0ce5883bd7ab47f10a6db3280d2cb7090f060757..33dfe6b85aaf37a7f3d08966d96b96c56bb02e05 100644 --- a/src/discoinforesponder.h +++ b/src/discoinforesponder.h @@ -21,7 +21,8 @@ #pragma once #include -#include "Swiften/Swiften.h" +#include +#include #include "Swiften/Queries/GetResponder.h" #include "Swiften/Elements/DiscoInfo.h" #include "Swiften/Elements/CapsInfo.h" diff --git a/src/discoitemsresponder.cpp b/src/discoitemsresponder.cpp index 72ac83906dd1bcfb6d1b88f0a318b54a00488719..90c153eab17a611f45cfda41ae749abd93c98d29 100644 --- a/src/discoitemsresponder.cpp +++ b/src/discoitemsresponder.cpp @@ -23,7 +23,6 @@ #include #include #include "Swiften/Queries/IQRouter.h" -#include "Swiften/Swiften.h" #include "transport/transport.h" #include "transport/logging.h" #include "discoinforesponder.h" diff --git a/src/filetransfermanager.cpp b/src/filetransfermanager.cpp index 73c08a86459faa1c1d80f40325586506df673229..dd893fb12c222eaae36806e898c90cfff0500986 100644 --- a/src/filetransfermanager.cpp +++ b/src/filetransfermanager.cpp @@ -24,6 +24,7 @@ #include "transport/user.h" #include "transport/buddy.h" #include "transport/logging.h" +#include "Swiften/Network/ConnectionServerFactory.h" namespace Transport { diff --git a/src/gatewayresponder.cpp b/src/gatewayresponder.cpp index 5a2683123ddf39c4f3ce4d46f357ac919327782c..1306a9dae074f8f6207da9a8dfda4bd7c6f6a92d 100644 --- a/src/gatewayresponder.cpp +++ b/src/gatewayresponder.cpp @@ -24,7 +24,6 @@ #include #include "Swiften/Queries/IQRouter.h" #include "Swiften/Elements/RawXMLPayload.h" -#include "Swiften/Swiften.h" #include "transport/usermanager.h" #include "transport/user.h" #include "transport/transport.h" diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp index 2493d6309a9583ec9569e2c8e1086bc0e9dffd9d..dd4ced3976fcbe565fca7c2b1e60803647033f6b 100644 --- a/src/networkpluginserver.cpp +++ b/src/networkpluginserver.cpp @@ -34,18 +34,24 @@ #include "transport/logging.h" #include "transport/admininterface.h" #include "blockresponder.h" -#include "Swiften/Swiften.h" #include "Swiften/Server/ServerStanzaChannel.h" #include "Swiften/Elements/StreamError.h" #include "Swiften/Network/BoostConnectionServer.h" +#include "Swiften/Network/ConnectionServerFactory.h" #include "Swiften/Elements/AttentionPayload.h" #include "Swiften/Elements/XHTMLIMPayload.h" +#include "Swiften/Elements/Delay.h" +#include "Swiften/Elements/DeliveryReceipt.h" +#include "Swiften/Elements/DeliveryReceiptRequest.h" #include "Swiften/Elements/InvisiblePayload.h" #include "Swiften/Elements/SpectrumErrorPayload.h" #include "transport/protocol.pb.h" #include "transport/util.h" #include "transport/discoitemsresponder.h" +#include "boost/date_time/posix_time/posix_time.hpp" +#include "boost/signal.hpp" + #include "utf8.h" #include diff --git a/src/presenceoracle.cpp b/src/presenceoracle.cpp index a846a061754ff5abeace6c2b40fe65569bcbc101..492843215236571d8b7743e85af89334f87ae0bb 100644 --- a/src/presenceoracle.cpp +++ b/src/presenceoracle.cpp @@ -19,7 +19,7 @@ */ #include "transport/presenceoracle.h" -#include "Swiften/Swiften.h" +#include "Swiften/Elements/MUCPayload.h" #include diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp index 1cfedd0fadff2916581b2cb1bf194f100350ee68..8e6dcbef11a975bbd200b24a4ad55bab674dd96a 100644 --- a/src/rostermanager.cpp +++ b/src/rostermanager.cpp @@ -30,7 +30,10 @@ #include "Swiften/Elements/RosterPayload.h" #include "Swiften/Elements/RosterItemPayload.h" #include "Swiften/Elements/RosterItemExchangePayload.h" +#include "Swiften/Elements/Nickname.h" +#include "Swiften/Queries/IQRouter.h" #include +#include #include #include diff --git a/src/rosterresponder.cpp b/src/rosterresponder.cpp index 6bc496c1933703140c0d8ce5fce41a3967211c65..109f30c5d9de633ab8529d032a9a86068923d05b 100644 --- a/src/rosterresponder.cpp +++ b/src/rosterresponder.cpp @@ -23,7 +23,6 @@ #include #include #include "Swiften/Queries/IQRouter.h" -#include "Swiften/Swiften.h" #include "transport/user.h" #include "transport/usermanager.h" #include "transport/rostermanager.h" diff --git a/src/rosterstorage.cpp b/src/rosterstorage.cpp index 34a40b3a2bb4541f2161a96c39e7f5c1b94f8dc5..eacc205dc6d6573f387795071b10ce9c280ffa88 100644 --- a/src/rosterstorage.cpp +++ b/src/rosterstorage.cpp @@ -24,6 +24,8 @@ #include "transport/storagebackend.h" #include "transport/logging.h" +#include "Swiften/Network/NetworkFactories.h" + DEFINE_LOGGER(logger, "RosterStorage"); namespace Transport { diff --git a/src/statsresponder.cpp b/src/statsresponder.cpp index 4ba24e71e20e32610c670047db6f4514a2416b23..faed68b0b18bd321a250c8ec62ad6b6f899c78eb 100644 --- a/src/statsresponder.cpp +++ b/src/statsresponder.cpp @@ -24,7 +24,6 @@ #include #include "Swiften/Queries/IQRouter.h" #include "transport/BlockPayload.h" -#include "Swiften/Swiften.h" #include "transport/usermanager.h" #include "transport/user.h" #include "transport/buddy.h" diff --git a/src/storagebackend.cpp b/src/storagebackend.cpp index ce27dfae0e46cb7914b86e68977b3befb73e2f27..7714df3632c8017e5a1bb15cbead9c51124d6369 100644 --- a/src/storagebackend.cpp +++ b/src/storagebackend.cpp @@ -4,8 +4,8 @@ #include "transport/sqlite3backend.h" #include "transport/mysqlbackend.h" #include "transport/pqxxbackend.h" +#include "Swiften/StringCodecs/Base64.h" -#include "Swiften/Swiften.h" namespace Transport { diff --git a/src/storageresponder.cpp b/src/storageresponder.cpp index 1b3d2aa95598ceaddcce08a0bb5951b77410797e..607dca20687234556ebfd213d7c314ca69dab7a6 100644 --- a/src/storageresponder.cpp +++ b/src/storageresponder.cpp @@ -24,7 +24,9 @@ #include #include "Swiften/Queries/IQRouter.h" #include "Swiften/Elements/RawXMLPayload.h" -#include "Swiften/Swiften.h" +#include "Swiften/Elements/Storage.h" +#include "Swiften/Elements/Storage.h" +#include "Swiften/Serializer/PayloadSerializers/StorageSerializer.h" #include "transport/usermanager.h" #include "transport/user.h" #include "transport/logging.h" diff --git a/src/storageresponder.h b/src/storageresponder.h index 0bf033cb1d8f7a40892e6c1789b330cf0b6b867a..c92691ba10ab70cb54804ed71a6b48c7a9e49f52 100644 --- a/src/storageresponder.h +++ b/src/storageresponder.h @@ -21,9 +21,9 @@ #pragma once #include -#include "Swiften/Swiften.h" #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/RosterPayload.h" +#include "Swiften/Elements/PrivateStorage.h" namespace Transport { diff --git a/src/tests/userregistry.cpp b/src/tests/userregistry.cpp index 9b5a7aa0b2d875cad9515ad7089803a888fe88e7..7e567cfdd7443e40ea95fcaf45582b1202eb350b 100644 --- a/src/tests/userregistry.cpp +++ b/src/tests/userregistry.cpp @@ -6,6 +6,8 @@ #include #include #include +#include +#include using namespace Transport; diff --git a/src/transport.cpp b/src/transport.cpp index 7bd92b4dd5d59bc7bd4330220877a1e39b8f6146..16e2de68cdd2053ddf2cc6d8c18f8eb5fe3515cf 100644 --- a/src/transport.cpp +++ b/src/transport.cpp @@ -51,7 +51,7 @@ #include "transport/BlockSerializer.h" #include "Swiften/Parser/PayloadParsers/InvisibleParser.h" #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h" -#include "Swiften/Swiften.h" +#include "Swiften/Parser/GenericPayloadParserFactory.h" using namespace Swift; using namespace boost; diff --git a/src/user.cpp b/src/user.cpp index 442a34a16b48a2eaad2fdfd4b1403fce03c21d89..0046ae302ddf41849a2038a6bb46e4d5b3db5fe2 100644 --- a/src/user.cpp +++ b/src/user.cpp @@ -26,7 +26,6 @@ #include "transport/conversationmanager.h" #include "transport/presenceoracle.h" #include "transport/logging.h" -#include "Swiften/Swiften.h" #include "Swiften/Server/ServerStanzaChannel.h" #include "Swiften/Elements/StreamError.h" #include "Swiften/Elements/MUCPayload.h" diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 6187225891a0aebcb456b503e080c674fa00887a..eb09115629f081f8eb2ca6260394384d05056b55 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -29,9 +29,10 @@ #include "transport/discoitemsresponder.h" #include "storageresponder.h" -#include "Swiften/Swiften.h" #include "Swiften/Server/ServerStanzaChannel.h" #include "Swiften/Elements/StreamError.h" +#include "Swiften/Elements/MUCPayload.h" +#include "Swiften/Elements/ChatState.h" #ifndef __FreeBSD__ #include "malloc.h" #endif diff --git a/src/userregistration.cpp b/src/userregistration.cpp index 174587fd6c0cfc9f128571b7cc2e3e0f871c1bfb..75f2d9423af138665e0eeef216489dab03e1f653 100644 --- a/src/userregistration.cpp +++ b/src/userregistration.cpp @@ -26,6 +26,9 @@ #include "transport/user.h" #include "transport/logging.h" #include "Swiften/Elements/ErrorPayload.h" +#include "Swiften/EventLoop/SimpleEventLoop.h" +#include "Swiften/Network/BoostNetworkFactories.h" +#include "Swiften/Client/Client.h" #include #include #include diff --git a/src/userregistry.cpp b/src/userregistry.cpp index c6cbdf321609182532297dff73ff9f735b905515..a740e898e77319482cf841fb5b5045c0a1892ed2 100644 --- a/src/userregistry.cpp +++ b/src/userregistry.cpp @@ -20,7 +20,6 @@ #include #include -#include "Swiften/Swiften.h" #include "Swiften/Server/UserRegistry.h" #include "transport/userregistry.h" #include "transport/logging.h" diff --git a/src/usersreconnecter.cpp b/src/usersreconnecter.cpp index ada0283ab061f0c952b51ee9f7668a9aa0babe49..1ba6cfff1d2a994b9550575daf5438b0fc294b29 100644 --- a/src/usersreconnecter.cpp +++ b/src/usersreconnecter.cpp @@ -23,11 +23,12 @@ #include #include #include "Swiften/Queries/IQRouter.h" -#include "Swiften/Swiften.h" #include "transport/storagebackend.h" #include "transport/transport.h" #include "transport/logging.h" +#include "Swiften/Network/NetworkFactories.h" + using namespace Swift; using namespace boost; diff --git a/src/vcardresponder.cpp b/src/vcardresponder.cpp index 214e94e245564fc8e3c5e543a6ab6f6c5921c8fe..f216c92a051185f0b5fa34c0b52e4733e4e8c94a 100644 --- a/src/vcardresponder.cpp +++ b/src/vcardresponder.cpp @@ -23,7 +23,6 @@ #include #include #include "Swiften/Queries/IQRouter.h" -#include "Swiften/Swiften.h" #include "transport/user.h" #include "transport/usermanager.h" #include "transport/rostermanager.h"