From cc64a76c8be5f344ab0645e2797e319c0b5b32cc Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Wed, 23 Jan 2013 11:29:43 +0100 Subject: [PATCH] Replace #include "Swiften/Swiften.h" by particular headers. 25% compilation speedup. --- include/transport/adhoccommand.h | 4 +++- include/transport/adhoccommandfactory.h | 1 - include/transport/adhocmanager.h | 5 +++- include/transport/admininterface.h | 3 ++- include/transport/buddy.h | 2 +- include/transport/conversation.h | 1 - include/transport/conversationmanager.h | 3 ++- include/transport/discoitemsresponder.h | 2 +- include/transport/factory.h | 1 - include/transport/gatewayresponder.h | 1 - include/transport/memoryreadbytestream.h | 3 ++- include/transport/mysqlbackend.h | 1 - include/transport/networkpluginserver.h | 4 +++- include/transport/pqxxbackend.h | 1 - include/transport/rostermanager.h | 6 ++++- include/transport/rosterresponder.h | 3 ++- include/transport/rosterstorage.h | 4 +++- include/transport/settingsadhoccommand.h | 1 - include/transport/sqlite3backend.h | 1 - include/transport/statsresponder.h | 1 - include/transport/threadpool.h | 2 +- include/transport/transport.h | 30 ++++++++++++++---------- include/transport/user.h | 3 ++- include/transport/usermanager.h | 6 ++++- include/transport/userregistration.h | 3 ++- include/transport/userregistry.h | 4 +++- include/transport/usersreconnecter.h | 3 ++- include/transport/vcardresponder.h | 4 +++- spectrum/src/main.cpp | 1 + src/blockresponder.cpp | 1 - src/blockresponder.h | 2 +- src/buddy.cpp | 2 ++ src/conversation.cpp | 5 ++++ src/discoinforesponder.cpp | 2 +- src/discoinforesponder.h | 3 ++- src/discoitemsresponder.cpp | 1 - src/filetransfermanager.cpp | 1 + src/gatewayresponder.cpp | 1 - src/networkpluginserver.cpp | 8 ++++++- src/presenceoracle.cpp | 2 +- src/rostermanager.cpp | 3 +++ src/rosterresponder.cpp | 1 - src/rosterstorage.cpp | 2 ++ src/statsresponder.cpp | 1 - src/storagebackend.cpp | 2 +- src/storageresponder.cpp | 4 +++- src/storageresponder.h | 2 +- src/tests/userregistry.cpp | 2 ++ src/transport.cpp | 2 +- src/user.cpp | 1 - src/usermanager.cpp | 3 ++- src/userregistration.cpp | 3 +++ src/userregistry.cpp | 1 - src/usersreconnecter.cpp | 3 ++- src/vcardresponder.cpp | 1 - 55 files changed, 104 insertions(+), 59 deletions(-) diff --git a/include/transport/adhoccommand.h b/include/transport/adhoccommand.h index 24dbe8e6..e1734b12 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 93c9d4a5..859421c5 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 8b418640..b8f77f87 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 48f85dc1..3ab03941 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 e11ed425..06792dc8 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 121794d6..eb2885f8 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 0ef2842f..7aa606bf 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 ddc1a2af..ff12cdcf 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 0c4595d7..7df6e252 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 8cefedbe..59b765ea 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 0f423a55..cb36389f 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 eeb0a65f..60733240 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 b5aa0b71..322e2048 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 bf5abf25..5ec0c409 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 fd649b57..fbd652ff 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 f716ddcd..4aaa2138 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 726425c4..21703442 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 3a2450a1..02eff3d9 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 d654ffa6..3c6411ca 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 ecdd331f..8f7fd8b6 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 6f498afa..27cb1a08 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 c69ca396..b27ddd37 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 f7752f07..580fda41 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 38a5c7bc..4ccefb53 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 2e9b6136..1c994423 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 0b6cac14..58590a01 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 52497e64..0c813b0c 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 156a95e4..852500e2 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 a024138e..176c618d 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 708fec43..6a5ad41c 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 8f77bea8..ed415502 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 eb5388f5..300053cf 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 1a8b8383..6074fc78 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 15ce1544..448ec17d 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 0ce5883b..33dfe6b8 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 72ac8390..90c153ea 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 73c08a86..dd893fb1 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 5a268312..1306a9da 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 2493d630..dd4ced39 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 a846a061..49284321 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 1cfedd0f..8e6dcbef 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 6bc496c1..109f30c5 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 34a40b3a..eacc205d 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 4ba24e71..faed68b0 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 ce27dfae..7714df36 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 1b3d2aa9..607dca20 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 0bf033cb..c92691ba 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 9b5a7aa0..7e567cfd 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 7bd92b4d..16e2de68 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 442a34a1..0046ae30 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 61872258..eb091156 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 174587fd..75f2d942 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 c6cbdf32..a740e898 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 ada0283a..1ba6cfff 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 214e94e2..f216c92a 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"