diff --git a/.travis.yml b/.travis.yml index 47fccd57..9b68152e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_script: - echo "deb http://packages.spectrum.im/spectrum2/ trusty main" | sudo tee -a /etc/apt/sources.list - echo " deb http://packages.prosody.im/debian trusty main" | sudo tee -a /etc/apt/sources.list - sudo apt-get update -qq - - sudo apt-get install -y --force-yes prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler pidgin-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev + - sudo apt-get install -y --force-yes prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler pidgin-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev libminiupnpc-dev libnatpmp-dev - sudo killall lua5.1 install: "pip install --user sleekxmpp" script: diff --git a/CMakeLists.txt b/CMakeLists.txt index d5ce8f9f..5a5ae2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,8 @@ if(NOT SWIFTEN_FOUND) set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Secur32") set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Iphlpapi") set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Winscard") - message(STATUS "Using swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY}") + message(STATUS "XXXUsing swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY} + Version: ${SWIFTEN_VERSION}") endif() # FIND BOOST @@ -484,4 +485,3 @@ if(NOT SQLITE3_FOUND AND NOT MYSQL_FOUND AND NOT PQXX_FOUND) message("Please enable at least one of SQLITE3, MYSQL, PQXX databases to use transport mode.") endif() endif() - diff --git a/backends/frotz/main.cpp b/backends/frotz/main.cpp index 79aaced1..3aa4ed7d 100644 --- a/backends/frotz/main.cpp +++ b/backends/frotz/main.cpp @@ -11,6 +11,7 @@ #include "transport/Config.h" #include "transport/NetworkPlugin.h" #include "Swiften/Swiften.h" +#include "Swiften/SwiftenCompat.h" #include #include "unistd.h" #include "signal.h" @@ -148,7 +149,7 @@ class FrotzNetworkPlugin : public NetworkPlugin { public: Swift::BoostNetworkFactories *m_factories; Swift::BoostIOServiceThread m_boostIOServiceThread; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; FrotzNetworkPlugin(Config *config, Swift::SimpleEventLoop *loop, const std::string &host, int port) : NetworkPlugin() { this->config = config; @@ -164,7 +165,7 @@ class FrotzNetworkPlugin : public NetworkPlugin { m_conn->write(Swift::createSafeByteArray(string)); } - void _handleDataRead(boost::shared_ptr data) { + void _handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { std::string d(data->begin(), data->end()); handleDataRead(d); } diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index e07208ff..6189e461 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -16,6 +16,7 @@ #include "transport/Config.h" #include "transport/StorageBackend.h" #include "geventloop.h" +#include "Swiften/SwiftenCompat.h" // #include "valgrind/memcheck.h" #if !defined(__FreeBSD__) && !defined(__APPLE__) @@ -82,7 +83,7 @@ static void transportDataReceived(gpointer data, gint source, PurpleInputConditi class SpectrumNetworkPlugin; -boost::shared_ptr config; +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr config; SpectrumNetworkPlugin *np; StorageBackend *storagebackend; @@ -2260,7 +2261,7 @@ int main(int argc, char **argv) { return 1; } - config = boost::shared_ptr(cfg); + config = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(cfg); Logging::initBackendLogging(config.get()); if (CONFIG_STRING(config, "service.protocol") == "prpl-hangouts") { diff --git a/backends/smstools3/main.cpp b/backends/smstools3/main.cpp index b31d496c..a285ef8e 100644 --- a/backends/smstools3/main.cpp +++ b/backends/smstools3/main.cpp @@ -16,6 +16,7 @@ #include "transport/PQXXBackend.h" #include "transport/StorageBackend.h" #include "Swiften/Swiften.h" +#include "Swiften/SwiftenCompat.h" #include #include "unistd.h" #include "signal.h" @@ -45,7 +46,7 @@ class SMSNetworkPlugin : public NetworkPlugin { public: Swift::BoostNetworkFactories *m_factories; Swift::BoostIOServiceThread m_boostIOServiceThread; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; Swift::Timer::ref m_timer; int m_internalUser; StorageBackend *storageBackend; @@ -169,7 +170,7 @@ class SMSNetworkPlugin : public NetworkPlugin { m_conn->write(Swift::createSafeByteArray(string)); } - void _handleDataRead(boost::shared_ptr data) { + void _handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { std::string d(data->begin(), data->end()); handleDataRead(d); } diff --git a/backends/swiften/main.cpp b/backends/swiften/main.cpp index 51e57f27..d13fabd0 100644 --- a/backends/swiften/main.cpp +++ b/backends/swiften/main.cpp @@ -7,6 +7,7 @@ // Swiften #include "Swiften/Swiften.h" +#include "Swiften/SwiftenCompat.h" #include #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) @@ -51,7 +52,7 @@ class ForwardIQHandler : public Swift::IQHandler { m_user = user; } - bool handleIQ(boost::shared_ptr iq) { + bool handleIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { if (iq->getPayload() != NULL) { return false; } @@ -75,7 +76,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { public: Swift::BoostNetworkFactories *m_factories; Swift::BoostIOServiceThread m_boostIOServiceThread; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; bool m_firstPing; Swift::FullPayloadSerializerCollection collection; @@ -106,7 +107,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { } // This method has to call handleDataRead with all received data from network plugin server - void _handleDataRead(boost::shared_ptr data) { + void _handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { if (m_firstPing) { m_firstPing = false; NetworkPlugin::PluginConfig cfg; @@ -120,36 +121,36 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { void handleStreamStart(const Swift::ProtocolHeader&) {} #if HAVE_SWIFTEN_3 - void handleElement(boost::shared_ptr element) { + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #else - void handleElement(boost::shared_ptr element) { + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #endif - boost::shared_ptr stanza = boost::dynamic_pointer_cast(element); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stanza = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(element); if (!stanza) { return; } std::string user = stanza->getFrom().toBare(); - boost::shared_ptr client = m_users[user]; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = m_users[user]; if (!client) return; stanza->setFrom(client->getJID()); - boost::shared_ptr message = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (message) { client->sendMessage(message); return; } - boost::shared_ptr presence = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (presence) { client->sendPresence(presence); return; } - boost::shared_ptr iq = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (iq) { if (m_handlers[user]->m_id2resource.find(stanza->getID()) != m_handlers[user]->m_id2resource.end()) { std::string resource = m_handlers[user]->m_id2resource[stanza->getID()]; @@ -211,7 +212,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { LOG4CXX_INFO(logger, user << ": Disconnected " << message); handleDisconnected(user, reconnect ? 0 : 3, message); - boost::shared_ptr client = m_users[user]; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = m_users[user]; if (client) { client->onConnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftConnected, this, user)); client->onDisconnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftDisconnected, this, user, _1)); @@ -250,7 +251,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { } void handleSwiftPresenceChanged(const std::string &user, Swift::Presence::ref presence) { -// boost::shared_ptr client = m_users[user]; +// SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = m_users[user]; // if (client->getMUCRegistry()->isMUC(presence->getFrom().toBare())) { // return; // } @@ -264,7 +265,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { // std::string message = presence->getStatus(); // std::string photo = ""; // -// boost::shared_ptr update = presence->getPayload(); +// SWIFTEN_SHRPTR_NAMESPACE::shared_ptr update = presence->getPayload(); // if (update) { // photo = update->getPhotoHash(); // } @@ -305,7 +306,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { if (legacyName.find("/") == std::string::npos) { jid = Swift::JID(legacyName + "/Spectrum"); } - boost::shared_ptr client = boost::make_shared(jid, password, m_factories); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = SWIFTEN_SHRPTR_NAMESPACE::make_shared(jid, password, m_factories); m_users[user] = client; client->setAlwaysTrustCertificates(); client->onConnected.connect(boost::bind(&SwiftenPlugin::handleSwiftConnected, this, user)); @@ -321,7 +322,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { opt.allowPLAINWithoutTLS = true; client->connect(opt); - boost::shared_ptr handler = boost::make_shared(this, user); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr handler = SWIFTEN_SHRPTR_NAMESPACE::make_shared(this, user); client->getIQRouter()->addHandler(handler); m_handlers[user] = handler; } @@ -339,7 +340,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { } void handleLogoutRequest(const std::string &user, const std::string &legacyName) { - boost::shared_ptr client = m_users[user]; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = m_users[user]; if (client) { client->onConnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftConnected, this, user)); // client->onDisconnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftDisconnected, this, user, _1)); @@ -357,7 +358,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { } void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector &groups) { - boost::shared_ptr client = m_users[user]; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = m_users[user]; if (client) { LOG4CXX_INFO(logger, user << ": Added/Updated buddy " << buddyName << "."); if (!client->getRoster()->containsJID(buddyName) || client->getRoster()->getSubscriptionStateForJID(buddyName) != Swift::RosterItemPayload::Both) { @@ -365,7 +366,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { item.setName(alias); item.setJID(buddyName); item.setGroups(groups); - boost::shared_ptr roster(new Swift::RosterPayload()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr roster(new Swift::RosterPayload()); roster->addItem(item); Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(roster, client->getIQRouter()); // request->onResponse.connect(boost::bind(&RosterController::handleRosterSetError, this, _1, roster)); @@ -376,7 +377,7 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { Swift::JID contact(buddyName); Swift::RosterItemPayload item(contact, alias, client->getRoster()->getSubscriptionStateForJID(contact)); item.setGroups(groups); - boost::shared_ptr roster(new Swift::RosterPayload()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr roster(new Swift::RosterPayload()); roster->addItem(item); Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(roster, client->getIQRouter()); // request->onResponse.connect(boost::bind(&RosterController::handleRosterSetError, this, _1, roster)); @@ -387,10 +388,10 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { } void handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector &groups) { - boost::shared_ptr client = m_users[user]; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client = m_users[user]; if (client) { Swift::RosterItemPayload item(buddyName, "", Swift::RosterItemPayload::Remove); - boost::shared_ptr roster(new Swift::RosterPayload()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr roster(new Swift::RosterPayload()); roster->addItem(item); Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(roster, client->getIQRouter()); // request->onResponse.connect(boost::bind(&RosterController::handleRosterSetError, this, _1, roster)); @@ -408,8 +409,8 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { private: Config *config; - std::map > m_users; - std::map > m_handlers; + std::map > m_users; + std::map > m_handlers; }; #ifndef WIN32 diff --git a/backends/template/plugin.cpp b/backends/template/plugin.cpp index f761184a..4f6cfa84 100644 --- a/backends/template/plugin.cpp +++ b/backends/template/plugin.cpp @@ -31,7 +31,7 @@ void Plugin::sendData(const std::string &string) { } // This method has to call handleDataRead with all received data from network plugin server -void Plugin::_handleDataRead(boost::shared_ptr data) { +void Plugin::_handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { std::string d(data->begin(), data->end()); handleDataRead(d); } diff --git a/backends/template/plugin.h b/backends/template/plugin.h index b67ac7a9..bcab5fd4 100644 --- a/backends/template/plugin.h +++ b/backends/template/plugin.h @@ -1,6 +1,7 @@ #pragma once #include "Swiften/Swiften.h" +#include "Swiften/SwiftenCompat.h" #include "transport/Config.h" #include "transport/NetworkPlugin.h" @@ -24,11 +25,11 @@ class Plugin : public Transport::NetworkPlugin { private: // This method has to call handleDataRead with all received data from network plugin server - void _handleDataRead(boost::shared_ptr data); + void _handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data); private: Swift::BoostNetworkFactories *m_factories; Swift::BoostIOServiceThread m_boostIOServiceThread; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; Transport::Config *config; }; diff --git a/backends/twitter/TwitterPlugin.cpp b/backends/twitter/TwitterPlugin.cpp index 0b0cec7b..f206e80c 100644 --- a/backends/twitter/TwitterPlugin.cpp +++ b/backends/twitter/TwitterPlugin.cpp @@ -87,7 +87,7 @@ TwitterPlugin::TwitterPlugin(Config *config, Swift::SimpleEventLoop *loop, Stora message_timer->start(); #if HAVE_SWIFTEN_3 - cryptoProvider = boost::shared_ptr(Swift::PlatformCryptoProvider::create()); + cryptoProvider = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(Swift::PlatformCryptoProvider::create()); #endif @@ -109,7 +109,7 @@ void TwitterPlugin::sendData(const std::string &string) } // Receive date from the NetworkPlugin server and invoke the appropirate payload handler (implement in the NetworkPlugin class) -void TwitterPlugin::_handleDataRead(boost::shared_ptr data) +void TwitterPlugin::_handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { if (m_firstPing) { m_firstPing = false; diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h index b4655630..cb826676 100644 --- a/backends/twitter/TwitterPlugin.h +++ b/backends/twitter/TwitterPlugin.h @@ -11,6 +11,7 @@ #include "transport/ThreadPool.h" #include "Swiften/Swiften.h" +#include "Swiften/SwiftenCompat.h" #ifndef _WIN32 #include "unistd.h" #include "signal.h" @@ -55,9 +56,9 @@ class TwitterPlugin : public NetworkPlugin { public: Swift::BoostNetworkFactories *m_factories; Swift::BoostIOServiceThread m_boostIOServiceThread; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; #if HAVE_SWIFTEN_3 - boost::shared_ptr cryptoProvider; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr cryptoProvider; #endif Swift::Timer::ref tweet_timer; Swift::Timer::ref message_timer; @@ -70,7 +71,7 @@ class TwitterPlugin : public NetworkPlugin { void sendData(const std::string &string); // Receive date from the NetworkPlugin server and invoke the appropirate payload handler (implement in the NetworkPlugin class) - void _handleDataRead(boost::shared_ptr data); + void _handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data); // User trying to login into his twitter account void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password); diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake index 34217b3a..105ee807 100644 --- a/cmake_modules/SwiftenConfig.cmake +++ b/cmake_modules/SwiftenConfig.cmake @@ -5,6 +5,7 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable" HINTS ../bin) set( SWIFTEN_CFLAGS "" ) if (SWIFTEN_CONFIG_EXECUTABLE) + # Libs execute_process( COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE SWIFTEN_LIB) @@ -29,7 +30,21 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) else() list(APPEND SWIFTEN_LIBRARY ${f}) endif() - endforeach(f) + endforeach(f) + + # Version + execute_process( + COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --version + OUTPUT_VARIABLE SWIFTEN_VERSION) + string(REGEX REPLACE "[\r\n]" " " SWIFTEN_VERSION "${SWIFTEN_VERSION}") + string(REGEX REPLACE " +$" "" SWIFTEN_VERSION "${SWIFTEN_VERSION}") + string(REGEX REPLACE "swiften-config " "" SWIFTEN_VERSION "${SWIFTEN_VERSION}") + + if("${SWIFTEN_VERSION}" STRGREATER "4") + message( STATUS "Found Swiften > 4 requesting C++11") + add_definitions(-std=c++11) + endif() + set( SWIFTEN_FOUND 1 ) else() message( STATUS "Could NOT find swiften-config" ) diff --git a/include/Swiften/Elements/AttentionPayload.h b/include/Swiften/Elements/AttentionPayload.h index 9901843f..62528cc6 100644 --- a/include/Swiften/Elements/AttentionPayload.h +++ b/include/Swiften/Elements/AttentionPayload.h @@ -12,10 +12,12 @@ #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class AttentionPayload : public Payload { public: - typedef boost::shared_ptr ref; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ref; public: AttentionPayload(); diff --git a/include/Swiften/Elements/InvisiblePayload.h b/include/Swiften/Elements/InvisiblePayload.h index 4966eddb..6a555ccf 100644 --- a/include/Swiften/Elements/InvisiblePayload.h +++ b/include/Swiften/Elements/InvisiblePayload.h @@ -12,12 +12,14 @@ #include +#include "Swiften/SwiftenCompat.h" + // This payload is NOT part of ANY XEP and it is only // libtransport related extension. namespace Swift { class InvisiblePayload : public Payload { public: - typedef boost::shared_ptr ref; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ref; public: InvisiblePayload(); diff --git a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp index 102de374..3f98cbb9 100644 --- a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp +++ b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp @@ -31,30 +31,30 @@ CombinedOutgoingFileTransferManager::~CombinedOutgoingFileTransferManager() { delete idGenerator; } -boost::shared_ptr CombinedOutgoingFileTransferManager::createOutgoingFileTransfer(const JID& from, const JID& receipient, boost::shared_ptr readBytestream, const StreamInitiationFileInfo& fileInfo) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr CombinedOutgoingFileTransferManager::createOutgoingFileTransfer(const JID& from, const JID& receipient, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr readBytestream, const StreamInitiationFileInfo& fileInfo) { // check if receipient support Jingle FT boost::optional fullJID = highestPriorityJIDSupportingJingle(receipient); if (!fullJID.is_initialized()) { fullJID = highestPriorityJIDSupportingSI(receipient); } else { - JingleSessionImpl::ref jingleSession = boost::make_shared(from, receipient, idGenerator->generateID(), iqRouter); + JingleSessionImpl::ref jingleSession = SWIFTEN_SHRPTR_NAMESPACE::make_shared(from, receipient, idGenerator->generateID(), iqRouter); //jsManager->getSession(receipient, idGenerator->generateID()); assert(jingleSession); jsManager->registerOutgoingSession(from, jingleSession); #if !HAVE_SWIFTEN_3 - boost::shared_ptr jingleFT = boost::shared_ptr(new OutgoingJingleFileTransfer(jingleSession, remoteFactory, localFactory, iqRouter, idGenerator, from, receipient, readBytestream, fileInfo, bytestreamRegistry, bytestreamProxy)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr jingleFT = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new OutgoingJingleFileTransfer(jingleSession, remoteFactory, localFactory, iqRouter, idGenerator, from, receipient, readBytestream, fileInfo, bytestreamRegistry, bytestreamProxy)); return jingleFT; #endif } if (!fullJID.is_initialized()) { - return boost::shared_ptr(); + return SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(); } // otherwise try SI - boost::shared_ptr jingleFT = boost::shared_ptr(new MyOutgoingSIFileTransfer(idGenerator->generateID(), from, fullJID.get(), fileInfo.getName(), fileInfo.getSize(), fileInfo.getDescription(), readBytestream, iqRouter, bytestreamServer, bytestreamRegistry)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr jingleFT = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new MyOutgoingSIFileTransfer(idGenerator->generateID(), from, fullJID.get(), fileInfo.getName(), fileInfo.getSize(), fileInfo.getDescription(), readBytestream, iqRouter, bytestreamServer, bytestreamRegistry)); // else fail return jingleFT; diff --git a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h index 2a5a9ffb..4710c151 100644 --- a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h +++ b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h @@ -12,6 +12,9 @@ #include #include "transport/PresenceOracle.h" + +#include "Swiften/SwiftenCompat.h" + #include #include #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) @@ -38,7 +41,7 @@ public: CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, Transport::PresenceOracle* presOracle, SOCKS5BytestreamServer *server); ~CombinedOutgoingFileTransferManager(); - boost::shared_ptr createOutgoingFileTransfer(const JID& from, const JID& to, boost::shared_ptr, const StreamInitiationFileInfo&); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr createOutgoingFileTransfer(const JID& from, const JID& to, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr, const StreamInitiationFileInfo&); private: boost::optional highestPriorityJIDSupportingJingle(const JID& bareJID); diff --git a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp index 5f1253ec..8c24a945 100644 --- a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp +++ b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp @@ -14,9 +14,11 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { -MyOutgoingSIFileTransfer::MyOutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, int size, const std::string& description, boost::shared_ptr bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer, SOCKS5BytestreamRegistry* registry) : id(id), from(from), to(to), name(name), size(size), description(description), bytestream(bytestream), iqRouter(iqRouter), socksServer(socksServer), registry(registry) { +MyOutgoingSIFileTransfer::MyOutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, int size, const std::string& description, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer, SOCKS5BytestreamRegistry* registry) : id(id), from(from), to(to), name(name), size(size), description(description), bytestream(bytestream), iqRouter(iqRouter), socksServer(socksServer), registry(registry) { } void MyOutgoingSIFileTransfer::start() { @@ -69,7 +71,7 @@ void MyOutgoingSIFileTransfer::handleStreamInitiationRequestResponse(StreamIniti request->send(); } else if (response->getRequestedMethod() == "http://jabber.org/protocol/ibb") { - ibbSession = boost::shared_ptr(new IBBSendSession(id, from, to, bytestream, iqRouter)); + ibbSession = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new IBBSendSession(id, from, to, bytestream, iqRouter)); ibbSession->onFinished.connect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1)); ibbSession->start(); #if !HAVE_SWIFTEN_3 diff --git a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h index 369a29ac..528e739c 100644 --- a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h +++ b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h @@ -7,10 +7,12 @@ #pragma once #include +#include + +#include "Swiften/SwiftenCompat.h" #include #include -#include #include #include #include @@ -28,7 +30,7 @@ namespace Swift { class MyOutgoingSIFileTransfer : public OutgoingFileTransfer { public: - MyOutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, int size, const std::string& description, boost::shared_ptr bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer, SOCKS5BytestreamRegistry* registry); + MyOutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, int size, const std::string& description, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer, SOCKS5BytestreamRegistry* registry); virtual void start(); virtual void stop(); @@ -49,10 +51,10 @@ namespace Swift { std::string name; int size; std::string description; - boost::shared_ptr bytestream; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr bytestream; IQRouter* iqRouter; SOCKS5BytestreamServer* socksServer; - boost::shared_ptr ibbSession; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ibbSession; SOCKS5BytestreamRegistry *registry; }; } diff --git a/include/Swiften/Network/DummyConnectionServer.cpp b/include/Swiften/Network/DummyConnectionServer.cpp index e4c8ef2b..bd84ca0f 100644 --- a/include/Swiften/Network/DummyConnectionServer.cpp +++ b/include/Swiften/Network/DummyConnectionServer.cpp @@ -6,12 +6,15 @@ #include +#include #include #include #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { DummyConnectionServer::DummyConnectionServer(EventLoop* eventLoop) : eventLoop(eventLoop) { @@ -25,10 +28,10 @@ void DummyConnectionServer::stop() { } -void DummyConnectionServer::acceptConnection(boost::shared_ptr connection) { +void DummyConnectionServer::acceptConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection) { eventLoop->postEvent( boost::bind(boost::ref(onNewConnection), connection), - shared_from_this()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(this)); // connection->listen(); } diff --git a/include/Swiften/Network/DummyConnectionServer.h b/include/Swiften/Network/DummyConnectionServer.h index b80e6af3..bbd2ef0d 100644 --- a/include/Swiften/Network/DummyConnectionServer.h +++ b/include/Swiften/Network/DummyConnectionServer.h @@ -10,28 +10,29 @@ #include #include #include -#include #include #include #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class DummyConnectionServer : public ConnectionServer, public EventOwner, public boost::enable_shared_from_this { public: - typedef boost::shared_ptr ref; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ref; enum Error { Conflict, UnknownError }; - static ref create(EventLoop* eventLoop) { - return ref(new DummyConnectionServer(eventLoop)); + static SWIFTEN_SHRPTR_NAMESPACE::shared_ptr create(EventLoop* eventLoop) { + return SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new DummyConnectionServer(eventLoop)); } - void acceptConnection(boost::shared_ptr connection); + void acceptConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection); #if (SWIFTEN_VERSION >= 0x030000) virtual boost::optional tryStart() { diff --git a/include/Swiften/Network/DummyConnectionServerFactory.cpp b/include/Swiften/Network/DummyConnectionServerFactory.cpp index 4fbabbc2..4b49c2cc 100644 --- a/include/Swiften/Network/DummyConnectionServerFactory.cpp +++ b/include/Swiften/Network/DummyConnectionServerFactory.cpp @@ -12,11 +12,11 @@ namespace Swift { DummyConnectionServerFactory::DummyConnectionServerFactory(EventLoop* eventLoop) : eventLoop(eventLoop) { } -boost::shared_ptr DummyConnectionServerFactory::createConnectionServer(int port) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr DummyConnectionServerFactory::createConnectionServer(int port) { return DummyConnectionServer::create(eventLoop); } -boost::shared_ptr DummyConnectionServerFactory::createConnectionServer(const Swift::HostAddress &hostAddress, int port) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr DummyConnectionServerFactory::createConnectionServer(const Swift::HostAddress &hostAddress, int port) { return DummyConnectionServer::create(eventLoop); } diff --git a/include/Swiften/Network/DummyConnectionServerFactory.h b/include/Swiften/Network/DummyConnectionServerFactory.h index a4bdbfd2..e5a4356f 100644 --- a/include/Swiften/Network/DummyConnectionServerFactory.h +++ b/include/Swiften/Network/DummyConnectionServerFactory.h @@ -11,6 +11,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class ConnectionServer; @@ -18,9 +20,9 @@ namespace Swift { public: DummyConnectionServerFactory(EventLoop* eventLoop); - virtual boost::shared_ptr createConnectionServer(int port); + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr createConnectionServer(int port); - virtual boost::shared_ptr createConnectionServer(const Swift::HostAddress &hostAddress, int port); + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr createConnectionServer(const Swift::HostAddress &hostAddress, int port); private: EventLoop* eventLoop; diff --git a/include/Swiften/Network/DummyNetworkFactories.cpp b/include/Swiften/Network/DummyNetworkFactories.cpp index cbd258cc..16a35443 100644 --- a/include/Swiften/Network/DummyNetworkFactories.cpp +++ b/include/Swiften/Network/DummyNetworkFactories.cpp @@ -22,7 +22,7 @@ DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) { timerFactory = new DummyTimerFactory(); connectionFactory = new DummyConnectionFactory(eventLoop); #if HAVE_SWIFTEN_3 - idnConverter = boost::shared_ptr(PlatformIDNConverter::create()); + idnConverter = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(PlatformIDNConverter::create()); domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop); cryptoProvider = PlatformCryptoProvider::create(); networkEnvironment = new PlatformNetworkEnvironment(); diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h index 9f2662c1..db47a61a 100644 --- a/include/Swiften/Network/DummyNetworkFactories.h +++ b/include/Swiften/Network/DummyNetworkFactories.h @@ -16,6 +16,8 @@ #include #endif +#include "Swiften/SwiftenCompat.h" + namespace Swift { class EventLoop; @@ -77,7 +79,7 @@ namespace Swift { TimerFactory* timerFactory; ConnectionFactory* connectionFactory; #if HAVE_SWIFTEN_3 - boost::shared_ptr idnConverter; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr idnConverter; CryptoProvider* cryptoProvider; NetworkEnvironment* networkEnvironment; #endif diff --git a/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.cpp b/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.cpp index 53444af2..1497cb38 100644 --- a/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.cpp +++ b/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.cpp @@ -4,8 +4,10 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +#include #include #include +#include "Swiften/SwiftenCompat.h" namespace Swift { @@ -50,7 +52,7 @@ void XHTMLIMParser::handleCharacterData(const std::string& data) { } } -boost::shared_ptr XHTMLIMParser::getLabelPayload() const { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr XHTMLIMParser::getLabelPayload() const { return getPayloadInternal(); } diff --git a/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.h b/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.h index 25b11056..390654ff 100644 --- a/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.h +++ b/include/Swiften/Parser/PayloadParsers/XHTMLIMParser.h @@ -9,6 +9,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class SerializingParser; @@ -19,7 +21,7 @@ namespace Swift { virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes); virtual void handleEndElement(const std::string& element, const std::string&); virtual void handleCharacterData(const std::string& data); - boost::shared_ptr getLabelPayload() const; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr getLabelPayload() const; private: enum Level { TopLevel = 0, diff --git a/include/Swiften/Parser/StringTreeParser.h b/include/Swiften/Parser/StringTreeParser.h index 06089a7d..0a92282d 100644 --- a/include/Swiften/Parser/StringTreeParser.h +++ b/include/Swiften/Parser/StringTreeParser.h @@ -14,6 +14,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { /** * Generics parser offering something a bit like a DOM to work with. @@ -24,7 +26,7 @@ namespace Swift { virtual void handleStartElement(const std::string& element, const std::string& xmlns, const AttributeMap& attributes) { if (!root_) { - root_ = boost::make_shared(element, xmlns, attributes); + root_ = SWIFTEN_SHRPTR_NAMESPACE::make_shared(element, xmlns, attributes); elementStack_.push_back(root_); } else { diff --git a/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.cpp index 2c305313..72682cfc 100644 --- a/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.cpp +++ b/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.cpp @@ -17,7 +17,7 @@ namespace Swift { AttentionSerializer::AttentionSerializer() : GenericPayloadSerializer() { } -std::string AttentionSerializer::serializePayload(boost::shared_ptr attention) const { +std::string AttentionSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr attention) const { XMLElement attentionElement("attention", "urn:xmpp:attention:0"); return attentionElement.serialize(); diff --git a/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.h b/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.h index c067091b..5b37d71c 100644 --- a/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.h +++ b/include/Swiften/Serializer/PayloadSerializers/AttentionSerializer.h @@ -9,11 +9,13 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class AttentionSerializer : public GenericPayloadSerializer { public: AttentionSerializer(); - virtual std::string serializePayload(boost::shared_ptr) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) const; }; } diff --git a/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.cpp index 6b7cd9e7..c63351f5 100644 --- a/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.cpp +++ b/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.cpp @@ -11,27 +11,29 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { GatewayPayloadSerializer::GatewayPayloadSerializer() : GenericPayloadSerializer() { } -std::string GatewayPayloadSerializer::serializePayload(boost::shared_ptr payload) const { +std::string GatewayPayloadSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) const { XMLElement query("query", "jabber:iq:gateway"); if (payload->getJID().isValid()) { - boost::shared_ptr jid(new XMLElement("jid", "", payload->getJID().toBare().toString())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr jid(new XMLElement("jid", "", payload->getJID().toBare().toString())); query.addNode(jid); } if (!payload->getDesc().empty()) { - boost::shared_ptr desc(new XMLElement("desc", "", payload->getDesc())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr desc(new XMLElement("desc", "", payload->getDesc())); query.addNode(desc); } if (!payload->getPrompt().empty()) { - boost::shared_ptr prompt(new XMLElement("prompt", "", payload->getPrompt())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr prompt(new XMLElement("prompt", "", payload->getPrompt())); query.addNode(prompt); } diff --git a/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h b/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h index 1b64ac17..6e94d112 100644 --- a/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h +++ b/include/Swiften/Serializer/PayloadSerializers/GatewayPayloadSerializer.h @@ -9,11 +9,13 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class GatewayPayloadSerializer : public GenericPayloadSerializer { public: GatewayPayloadSerializer(); - virtual std::string serializePayload(boost::shared_ptr item) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr item) const; }; } diff --git a/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.cpp index 0cf1b1b9..eeb1a6a3 100644 --- a/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.cpp +++ b/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.cpp @@ -19,7 +19,7 @@ namespace Swift { InvisibleSerializer::InvisibleSerializer() : GenericPayloadSerializer() { } -std::string InvisibleSerializer::serializePayload(boost::shared_ptr attention) const { +std::string InvisibleSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr attention) const { XMLElement attentionElement("invisible", "urn:xmpp:invisible:0"); return attentionElement.serialize(); diff --git a/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h b/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h index 034ab2e1..66149b5d 100644 --- a/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h +++ b/include/Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h @@ -9,6 +9,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + // This payload is NOT part of ANY XEP and it is only // libtransport related extension. namespace Swift { @@ -16,6 +18,6 @@ namespace Swift { public: InvisibleSerializer(); - virtual std::string serializePayload(boost::shared_ptr) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) const; }; } diff --git a/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.cpp index 552e1936..9f7d70af 100644 --- a/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.cpp +++ b/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.cpp @@ -19,7 +19,7 @@ namespace Swift { SpectrumErrorSerializer::SpectrumErrorSerializer() : GenericPayloadSerializer() { } -std::string SpectrumErrorSerializer::serializePayload(boost::shared_ptr error) const { +std::string SpectrumErrorSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr error) const { std::string data; switch (error->getError()) { case SpectrumErrorPayload::CONNECTION_ERROR_NETWORK_ERROR: data = "CONNECTION_ERROR_NETWORK_ERROR"; break; diff --git a/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h b/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h index 112e79e2..2d713d79 100644 --- a/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h +++ b/include/Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h @@ -9,11 +9,13 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class SpectrumErrorSerializer : public GenericPayloadSerializer { public: SpectrumErrorSerializer(); - virtual std::string serializePayload(boost::shared_ptr) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) const; }; } diff --git a/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp index 0bd85f5f..41aa171a 100644 --- a/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp +++ b/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp @@ -13,15 +13,17 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { StatsSerializer::StatsSerializer() : GenericPayloadSerializer() { } -std::string StatsSerializer::serializePayload(boost::shared_ptr stats) const { +std::string StatsSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stats) const { XMLElement queryElement("query", "http://jabber.org/protocol/stats"); foreach(const StatsPayload::Item& item, stats->getItems()) { - boost::shared_ptr statElement(new XMLElement("stat")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr statElement(new XMLElement("stat")); statElement->setAttribute("name", item.getName()); if (!item.getUnits().empty()) { statElement->setAttribute("units", item.getUnits()); diff --git a/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.h b/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.h index cf45941d..88ead07a 100644 --- a/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.h +++ b/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.h @@ -9,11 +9,13 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class StatsSerializer : public GenericPayloadSerializer { public: StatsSerializer(); - virtual std::string serializePayload(boost::shared_ptr) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) const; }; } diff --git a/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.cpp index 260aad2b..192ef7fc 100644 --- a/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.cpp +++ b/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.cpp @@ -10,16 +10,18 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { XHTMLIMSerializer::XHTMLIMSerializer() : GenericPayloadSerializer() { } -std::string XHTMLIMSerializer::serializePayload(boost::shared_ptr payload) const { +std::string XHTMLIMSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) const { XMLElement html("html", "http://jabber.org/protocol/xhtml-im"); - boost::shared_ptr body(new XMLElement("body", "http://www.w3.org/1999/xhtml")); - body->addNode(boost::shared_ptr(new XMLRawTextNode(payload->getBody()))); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr body(new XMLElement("body", "http://www.w3.org/1999/xhtml")); + body->addNode(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new XMLRawTextNode(payload->getBody()))); html.addNode(body); return html.serialize(); diff --git a/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.h b/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.h index 0abc523c..287f0a63 100644 --- a/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.h +++ b/include/Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.h @@ -9,11 +9,13 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class XHTMLIMSerializer : public GenericPayloadSerializer { public: XHTMLIMSerializer(); - virtual std::string serializePayload(boost::shared_ptr xhtml) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr xhtml) const; }; } diff --git a/include/Swiften/Server/Server.cpp b/include/Swiften/Server/Server.cpp index 4313e1b3..c1606393 100644 --- a/include/Swiften/Server/Server.cpp +++ b/include/Swiften/Server/Server.cpp @@ -8,6 +8,7 @@ #include #include +#include #include "Swiften/Base/String.h" #include "Swiften/Base/foreach.h" @@ -88,14 +89,14 @@ void Server::stop() { stopping = true; -// foreach(boost::shared_ptr session, serverFromClientSessions) { +// foreach(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session, serverFromClientSessions) { // session->finishSession(); // } serverFromClientSessions.clear(); if (serverFromClientConnectionServer) { serverFromClientConnectionServer->stop(); - foreach(boost::bsignals::connection& connection, serverFromClientConnectionServerSignalConnections) { + foreach(SWIFTEN_SIGNAL_NAMESPACE::connection& connection, serverFromClientConnectionServerSignalConnections) { connection.disconnect(); } serverFromClientConnectionServerSignalConnections.clear(); @@ -106,9 +107,9 @@ void Server::stop() { // onStopped(e); } -void Server::handleNewClientConnection(boost::shared_ptr connection) { +void Server::handleNewClientConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection) { - boost::shared_ptr serverFromClientSession = boost::shared_ptr( + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr serverFromClientSession = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr( new ServerFromClientSession(idGenerator.generateID(), connection, getPayloadParserFactories(), getPayloadSerializers(), userRegistry_, parserFactory_)); //serverFromClientSession->setAllowSASLEXTERNAL(); @@ -138,11 +139,11 @@ void Server::handleDataWritten(const SafeByteArray& data) { onDataWritten(data); } -void Server::handleSessionStarted(boost::shared_ptr session) { +void Server::handleSessionStarted(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session) { dynamic_cast(stanzaChannel_)->addSession(session); } -void Server::handleSessionFinished(boost::shared_ptr session) { +void Server::handleSessionFinished(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session) { // if (!session->getRemoteJID().isValid()) { // Swift::Presence::ref presence = Swift::Presence::create(); // presence->setFrom(session->getBareJID()); diff --git a/include/Swiften/Server/Server.h b/include/Swiften/Server/Server.h index b32ae463..90bce626 100644 --- a/include/Swiften/Server/Server.h +++ b/include/Swiften/Server/Server.h @@ -8,6 +8,7 @@ #include #include +#include #include #include "Swiften/Network/BoostIOServiceThread.h" @@ -21,6 +22,7 @@ #include "Swiften/Entity/Entity.h" #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h" #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h" +#include "Swiften/SwiftenCompat.h" #include #include @@ -53,7 +55,7 @@ namespace Swift { return iqRouter_; } - boost::shared_ptr getConnectionServer() const { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr getConnectionServer() const { return serverFromClientConnectionServer; } @@ -63,10 +65,10 @@ namespace Swift { void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, CertificateWithKey::ref cert); private: - void handleNewClientConnection(boost::shared_ptr c); - void handleSessionStarted(boost::shared_ptr); - void handleSessionFinished(boost::shared_ptr); - void handleElementReceived(boost::shared_ptr element, boost::shared_ptr session); + void handleNewClientConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr c); + void handleSessionStarted(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); + void handleSessionFinished(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); + void handleElementReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session); void handleDataRead(const SafeByteArray&); void handleDataWritten(const SafeByteArray&); @@ -77,9 +79,9 @@ namespace Swift { EventLoop* eventLoop; NetworkFactories* networkFactories_; bool stopping; - boost::shared_ptr serverFromClientConnectionServer; - std::vector serverFromClientConnectionServerSignalConnections; - std::list > serverFromClientSessions; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr serverFromClientConnectionServer; + std::vector serverFromClientConnectionServerSignalConnections; + std::list > serverFromClientSessions; JID selfJID; StanzaChannel *stanzaChannel_; IQRouter *iqRouter_; diff --git a/include/Swiften/Server/ServerFromClientSession.cpp b/include/Swiften/Server/ServerFromClientSession.cpp index 49138fb9..304ca25e 100644 --- a/include/Swiften/Server/ServerFromClientSession.cpp +++ b/include/Swiften/Server/ServerFromClientSession.cpp @@ -29,6 +29,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + #include #if (SWIFTEN_VERSION >= 0x030000) #include @@ -38,7 +40,7 @@ namespace Swift { ServerFromClientSession::ServerFromClientSession( const std::string& id, - boost::shared_ptr connection, + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection, PayloadParserFactoryCollection* payloadParserFactories, PayloadSerializerCollection* payloadSerializers, UserRegistry* userRegistry, @@ -63,7 +65,7 @@ ServerFromClientSession::~ServerFromClientSession() { void ServerFromClientSession::handlePasswordValid() { if (!isInitialized()) { - getXMPPLayer()->writeElement(boost::shared_ptr(new AuthSuccess())); + getXMPPLayer()->writeElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new AuthSuccess())); authenticated_ = true; getXMPPLayer()->resetParser(); } @@ -71,9 +73,9 @@ void ServerFromClientSession::handlePasswordValid() { void ServerFromClientSession::handlePasswordInvalid(const std::string &error) { if (!isInitialized()) { - getXMPPLayer()->writeElement(boost::shared_ptr(new AuthFailure)); + getXMPPLayer()->writeElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new AuthFailure)); if (!error.empty()) { - boost::shared_ptr msg(new StreamError(StreamError::UndefinedCondition, error)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new StreamError(StreamError::UndefinedCondition, error)); getXMPPLayer()->writeElement(msg); } @@ -82,9 +84,9 @@ void ServerFromClientSession::handlePasswordInvalid(const std::string &error) { } #if (SWIFTEN_VERSION >= 0x030000) -void ServerFromClientSession::handleElement(boost::shared_ptr element) { +void ServerFromClientSession::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #else -void ServerFromClientSession::handleElement(boost::shared_ptr element) { +void ServerFromClientSession::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #endif if (isInitialized()) { onElementReceived(element); @@ -93,7 +95,7 @@ void ServerFromClientSession::handleElement(boost::shared_ptr element) if (AuthRequest* authRequest = dynamic_cast(element.get())) { if (authRequest->getMechanism() == "PLAIN" || (allowSASLEXTERNAL && authRequest->getMechanism() == "EXTERNAL")) { if (authRequest->getMechanism() == "EXTERNAL") { - getXMPPLayer()->writeElement(boost::shared_ptr(new AuthSuccess())); + getXMPPLayer()->writeElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new AuthSuccess())); authenticated_ = true; getXMPPLayer()->resetParser(); } @@ -104,25 +106,25 @@ void ServerFromClientSession::handleElement(boost::shared_ptr element) } } else { - getXMPPLayer()->writeElement(boost::shared_ptr(new AuthFailure)); + getXMPPLayer()->writeElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new AuthFailure)); finishSession(NoSupportedAuthMechanismsError); } } else if (dynamic_cast(element.get()) != NULL) { - getXMPPLayer()->writeElement(boost::shared_ptr(new TLSProceed)); + getXMPPLayer()->writeElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new TLSProceed)); getStreamStack()->addLayer(tlsLayer); tlsLayer->connect(); getXMPPLayer()->resetParser(); } else if (IQ* iq = dynamic_cast(element.get())) { - if (boost::shared_ptr resourceBind = iq->getPayload()) { + if (SWIFTEN_SHRPTR_NAMESPACE::shared_ptr resourceBind = iq->getPayload()) { std::string bucket = "abcdefghijklmnopqrstuvwxyz"; std::string uuid; for (int i = 0; i < 10; i++) { uuid += bucket[rand() % bucket.size()]; } setRemoteJID(JID(user_, getLocalJID().getDomain(), uuid)); - boost::shared_ptr resultResourceBind(new ResourceBind()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr resultResourceBind(new ResourceBind()); resultResourceBind->setJID(getRemoteJID()); getXMPPLayer()->writeElement(IQ::createResult(JID(), iq->getID(), resultResourceBind)); } @@ -141,7 +143,7 @@ void ServerFromClientSession::handleStreamStart(const ProtocolHeader& incomingHe header.setID(id_); getXMPPLayer()->writeHeader(header); - boost::shared_ptr features(new StreamFeatures()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr features(new StreamFeatures()); if (!authenticated_) { if (tlsLayer && !tlsConnected) { @@ -177,7 +179,7 @@ void ServerFromClientSession::addTLSEncryption(TLSServerContextFactory* tlsConte if (!tlsLayer->setServerCertificate(cert)) { // std::cout << "error\n"; // TODO: -// onClosed(boost::shared_ptr(new Error(Error::InvalidTLSCertificateError))); +// onClosed(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Error(Error::InvalidTLSCertificateError))); } else { tlsLayer->onError.connect(boost::bind(&ServerFromClientSession::handleTLSError, this)); diff --git a/include/Swiften/Server/ServerFromClientSession.h b/include/Swiften/Server/ServerFromClientSession.h index 4496bdf1..d78fedaa 100644 --- a/include/Swiften/Server/ServerFromClientSession.h +++ b/include/Swiften/Server/ServerFromClientSession.h @@ -7,8 +7,8 @@ #pragma once #include -#include #include +#include #include #include @@ -19,6 +19,8 @@ #include #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) +#include "Swiften/SwiftenCompat.h" + namespace Swift { class ProtocolHeader; class Element; @@ -38,7 +40,7 @@ namespace Swift { public: ServerFromClientSession( const std::string& id, - boost::shared_ptr connection, + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection, PayloadParserFactoryCollection* payloadParserFactories, PayloadSerializerCollection* payloadSerializers, UserRegistry* userRegistry, @@ -63,9 +65,9 @@ namespace Swift { private: #if HAVE_SWIFTEN_3 - void handleElement(boost::shared_ptr); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); #else - void handleElement(boost::shared_ptr); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); #endif void handleStreamStart(const ProtocolHeader& header); void handleSessionFinished(const boost::optional&); diff --git a/include/Swiften/Server/ServerSession.h b/include/Swiften/Server/ServerSession.h index 486ebaa8..73a9203a 100644 --- a/include/Swiften/Server/ServerSession.h +++ b/include/Swiften/Server/ServerSession.h @@ -10,6 +10,8 @@ #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class ServerSession { public: @@ -18,6 +20,6 @@ namespace Swift { virtual const JID& getJID() const = 0; virtual int getPriority() const = 0; - virtual void sendStanza(boost::shared_ptr) = 0; + virtual void sendStanza(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) = 0; }; } diff --git a/include/Swiften/Server/ServerStanzaChannel.cpp b/include/Swiften/Server/ServerStanzaChannel.cpp index 8150d20d..dc3abe9b 100644 --- a/include/Swiften/Server/ServerStanzaChannel.cpp +++ b/include/Swiften/Server/ServerStanzaChannel.cpp @@ -21,41 +21,41 @@ namespace { struct HasJID { HasJID(const JID& jid) : jid(jid) {} - bool operator()(const boost::shared_ptr session) const { + bool operator()(const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session) const { return session->getRemoteJID().equals(jid, JID::WithResource); } JID jid; }; } -void ServerStanzaChannel::addSession(boost::shared_ptr session) { +void ServerStanzaChannel::addSession(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session) { sessions[session->getRemoteJID().toBare().toString()].push_back(session); session->onSessionFinished.connect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session)); session->onElementReceived.connect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session)); session->onDataRead.connect(boost::bind(&ServerStanzaChannel::handleDataRead, this, _1, session)); } -void ServerStanzaChannel::removeSession(boost::shared_ptr session) { +void ServerStanzaChannel::removeSession(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session) { session->onSessionFinished.disconnect(boost::bind(&ServerStanzaChannel::handleSessionFinished, this, _1, session)); session->onElementReceived.disconnect(boost::bind(&ServerStanzaChannel::handleElement, this, _1, session)); session->onDataRead.disconnect(boost::bind(&ServerStanzaChannel::handleDataRead, this, _1, session)); - std::list > &lst = sessions[session->getRemoteJID().toBare().toString()]; + std::list > &lst = sessions[session->getRemoteJID().toBare().toString()]; lst.erase(std::remove(lst.begin(), lst.end(), session), lst.end()); } -void ServerStanzaChannel::sendIQ(boost::shared_ptr iq) { +void ServerStanzaChannel::sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { send(iq); } -void ServerStanzaChannel::sendMessage(boost::shared_ptr message) { +void ServerStanzaChannel::sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) { send(message); } -void ServerStanzaChannel::sendPresence(boost::shared_ptr presence) { +void ServerStanzaChannel::sendPresence(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence) { send(presence); } -void ServerStanzaChannel::handleDataRead(const SafeByteArray &data, const boost::shared_ptr &session) { +void ServerStanzaChannel::handleDataRead(const SafeByteArray &data, const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &session) { if (safeByteArrayToString(data).find("") != std::string::npos) { Swift::Presence::ref presence = Swift::Presence::create(); presence->setFrom(session->getRemoteJID()); @@ -64,16 +64,16 @@ void ServerStanzaChannel::handleDataRead(const SafeByteArray &data, const boost: } } #if HAVE_SWIFTEN_3 -void ServerStanzaChannel::finishSession(const JID& to, boost::shared_ptr element, bool last) { +void ServerStanzaChannel::finishSession(const JID& to, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, bool last) { #else -void ServerStanzaChannel::finishSession(const JID& to, boost::shared_ptr element, bool last) { +void ServerStanzaChannel::finishSession(const JID& to, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, bool last) { #endif - std::vector > candidateSessions; - for (std::list >::const_iterator i = sessions[to.toBare().toString()].begin(); i != sessions[to.toBare().toString()].end(); ++i) { + std::vector > candidateSessions; + for (std::list >::const_iterator i = sessions[to.toBare().toString()].begin(); i != sessions[to.toBare().toString()].end(); ++i) { candidateSessions.push_back(*i); } - for (std::vector >::const_iterator i = candidateSessions.begin(); i != candidateSessions.end(); ++i) { + for (std::vector >::const_iterator i = candidateSessions.begin(); i != candidateSessions.end(); ++i) { removeSession(*i); if (element) { (*i)->sendElement(element); @@ -98,7 +98,7 @@ std::string ServerStanzaChannel::getNewIQID() { return idGenerator.generateID(); } -void ServerStanzaChannel::send(boost::shared_ptr stanza) { +void ServerStanzaChannel::send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stanza) { JID to = stanza->getTo(); assert(to.isValid()); @@ -108,7 +108,7 @@ void ServerStanzaChannel::send(boost::shared_ptr stanza) { // For a full JID, first try to route to a session with the full JID if (!to.isBare()) { - std::list >::const_iterator i = std::find_if(sessions[stanza->getTo().toBare().toString()].begin(), sessions[stanza->getTo().toBare().toString()].end(), HasJID(to)); + std::list >::const_iterator i = std::find_if(sessions[stanza->getTo().toBare().toString()].begin(), sessions[stanza->getTo().toBare().toString()].end(), HasJID(to)); if (i != sessions[stanza->getTo().toBare().toString()].end()) { (*i)->sendElement(stanza); return; @@ -117,8 +117,8 @@ void ServerStanzaChannel::send(boost::shared_ptr stanza) { // Look for candidate sessions to = to.toBare(); - std::vector > candidateSessions; - for (std::list >::const_iterator i = sessions[stanza->getTo().toBare().toString()].begin(); i != sessions[stanza->getTo().toBare().toString()].end(); ++i) { + std::vector > candidateSessions; + for (std::list >::const_iterator i = sessions[stanza->getTo().toBare().toString()].begin(); i != sessions[stanza->getTo().toBare().toString()].end(); ++i) { if ((*i)->getRemoteJID().equals(to, JID::WithoutResource)) { candidateSessions.push_back(*i); (*i)->sendElement(stanza); @@ -134,7 +134,7 @@ void ServerStanzaChannel::send(boost::shared_ptr stanza) { return; } -void ServerStanzaChannel::handleSessionFinished(const boost::optional&, const boost::shared_ptr& session) { +void ServerStanzaChannel::handleSessionFinished(const boost::optional&, const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& session) { removeSession(session); // if (!session->initiatedFinish()) { @@ -145,8 +145,8 @@ void ServerStanzaChannel::handleSessionFinished(const boost::optional element, const boost::shared_ptr& session) { - boost::shared_ptr stanza = boost::dynamic_pointer_cast(element); +void ServerStanzaChannel::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& session) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stanza = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(element); if (!stanza) { return; } @@ -157,19 +157,19 @@ void ServerStanzaChannel::handleElement(boost::shared_ptr element, cons return; - boost::shared_ptr message = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (message) { onMessageReceived(message); return; } - boost::shared_ptr presence = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (presence) { onPresenceReceived(presence); return; } - boost::shared_ptr iq = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (iq) { onIQReceived(iq); return; diff --git a/include/Swiften/Server/ServerStanzaChannel.h b/include/Swiften/Server/ServerStanzaChannel.h index bf9cdb76..14aef853 100644 --- a/include/Swiften/Server/ServerStanzaChannel.h +++ b/include/Swiften/Server/ServerStanzaChannel.h @@ -25,16 +25,16 @@ namespace Swift { ServerStanzaChannel(const JID &selfJID) : StanzaChannel() { m_jid = selfJID; } - void addSession(boost::shared_ptr session); - void removeSession(boost::shared_ptr session); + void addSession(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session); + void removeSession(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr session); - void sendIQ(boost::shared_ptr iq); - void sendMessage(boost::shared_ptr message); - void sendPresence(boost::shared_ptr presence); + void sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq); + void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); + void sendPresence(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence); #if HAVE_SWIFTEN_3 - void finishSession(const JID& to, boost::shared_ptr element, bool last = false); + void finishSession(const JID& to, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, bool last = false); #else - void finishSession(const JID& to, boost::shared_ptr element, bool last = false); + void finishSession(const JID& to, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, bool last = false); #endif bool getStreamManagementEnabled() const { return false; @@ -50,17 +50,17 @@ namespace Swift { private: std::string getNewIQID(); - void send(boost::shared_ptr stanza); - void handleSessionFinished(const boost::optional&, const boost::shared_ptr &session); - void handleElement(boost::shared_ptr element, const boost::shared_ptr &session); - void handleDataRead(const SafeByteArray &data, const boost::shared_ptr &session); + void send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stanza); + void handleSessionFinished(const boost::optional&, const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &session); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element, const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &session); + void handleDataRead(const SafeByteArray &data, const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &session); void handleSessionInitialized(); private: JID m_jid; IDGenerator idGenerator; // [JID][resources][ServerFromClientSession] - std::map > > sessions; + std::map > > sessions; }; } diff --git a/include/Swiften/Server/ServerStanzaRouter.cpp b/include/Swiften/Server/ServerStanzaRouter.cpp index 17253597..ee890f03 100644 --- a/include/Swiften/Server/ServerStanzaRouter.cpp +++ b/include/Swiften/Server/ServerStanzaRouter.cpp @@ -32,7 +32,7 @@ namespace { ServerStanzaRouter::ServerStanzaRouter() { } -bool ServerStanzaRouter::routeStanza(boost::shared_ptr stanza) { +bool ServerStanzaRouter::routeStanza(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stanza) { JID to = stanza->getTo(); assert(to.isValid()); diff --git a/include/Swiften/Server/ServerStanzaRouter.h b/include/Swiften/Server/ServerStanzaRouter.h index 4a9493be..52c23057 100644 --- a/include/Swiften/Server/ServerStanzaRouter.h +++ b/include/Swiften/Server/ServerStanzaRouter.h @@ -12,6 +12,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + namespace Swift { class ServerSession; @@ -19,7 +21,7 @@ namespace Swift { public: ServerStanzaRouter(); - bool routeStanza(boost::shared_ptr); + bool routeStanza(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); void addClientSession(ServerSession*); void removeClientSession(ServerSession*); diff --git a/include/Swiften/StreamStack/TLSServerLayer.cpp b/include/Swiften/StreamStack/TLSServerLayer.cpp index 1e16ffcc..b2377708 100644 --- a/include/Swiften/StreamStack/TLSServerLayer.cpp +++ b/include/Swiften/StreamStack/TLSServerLayer.cpp @@ -45,7 +45,7 @@ Certificate::ref TLSServerLayer::getPeerCertificate() const { return context->getPeerCertificate(); } -boost::shared_ptr TLSServerLayer::getPeerCertificateVerificationError() const { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr TLSServerLayer::getPeerCertificateVerificationError() const { return context->getPeerCertificateVerificationError(); } diff --git a/include/Swiften/StreamStack/TLSServerLayer.h b/include/Swiften/StreamStack/TLSServerLayer.h index 752ca86b..34f99a03 100644 --- a/include/Swiften/StreamStack/TLSServerLayer.h +++ b/include/Swiften/StreamStack/TLSServerLayer.h @@ -4,13 +4,14 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ -#include "Swiften/Base/boost_bsignals.h" +#include #include "Swiften/Base/SafeByteArray.h" #include "Swiften/StreamStack/StreamLayer.h" #include "Swiften/TLS/Certificate.h" #include #include "Swiften/TLS/CertificateVerificationError.h" +#include "Swiften/SwiftenCompat.h" namespace Swift { class TLSServerContext; @@ -26,7 +27,7 @@ namespace Swift { bool setServerCertificate(CertificateWithKey::ref cert); Certificate::ref getPeerCertificate() const; - boost::shared_ptr getPeerCertificateVerificationError() const; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr getPeerCertificateVerificationError() const; void writeData(const SafeByteArray& data); void handleDataRead(const SafeByteArray& data); diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h new file mode 100644 index 00000000..21fca92b --- /dev/null +++ b/include/Swiften/SwiftenCompat.h @@ -0,0 +1,44 @@ +/* + * Swift compatibility + * + * Copyright (c) 2016, Vladimir Matena + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include + +/* + * Define macros for Swiften compatible shared pointer and signal namespaces. + * + * Using these it is possible to declare shared pointers and signals like this: + * + * SWIFTEN_SIGNAL_NAMESPACE::signal signal; + * SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ptr; + * + * These are guaranteed to be the same implementation as Swift uses internally, + * thus can be used when passign/retrieveing data from/to swiften. + * + * This is due to Swift 4 moved from boost::shared_ptr to SWIFTEN_SHRPTR_NAMESPACE::shared_ptr + * and from boost::signals to boost::signals2 . + */ + +#if (SWIFTEN_VERSION >= 0x040000) +#define SWIFTEN_SHRPTR_NAMESPACE std +#define SWIFTEN_SIGNAL_NAMESPACE boost::signals2 +#else +#define SWIFTEN_SHRPTR_NAMESPACE boost +#define SWIFTEN_SIGNAL_NAMESPACE boost::signals +#endif diff --git a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp index b12708a1..dd2b328e 100644 --- a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp +++ b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp @@ -181,7 +181,7 @@ void OpenSSLServerContext::sendPendingDataToApplication() { } bool OpenSSLServerContext::setServerCertificate(CertificateWithKey::ref certref) { - boost::shared_ptr certificate = boost::dynamic_pointer_cast(certref); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr certificate = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(certref); if (certificate->isNull()) { LOG4CXX_ERROR(logger, "TLS WILL NOT WORK: Certificate can't be loaded."); return false; @@ -190,7 +190,7 @@ bool OpenSSLServerContext::setServerCertificate(CertificateWithKey::ref certref) // Create a PKCS12 structure BIO* bio = BIO_new(BIO_s_mem()); BIO_write(bio, vecptr(certificate->getData()), certificate->getData().size()); - boost::shared_ptr pkcs12(d2i_PKCS12_bio(bio, NULL), PKCS12_free); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr pkcs12(d2i_PKCS12_bio(bio, NULL), PKCS12_free); BIO_free(bio); if (!pkcs12) { LOG4CXX_ERROR(logger, "TLS WILL NOT WORK: Certificate is not in PKCS#12 format."); @@ -206,9 +206,9 @@ bool OpenSSLServerContext::setServerCertificate(CertificateWithKey::ref certref) LOG4CXX_ERROR(logger, "TLS WILL NOT WORK: Certificate is not in PKCS#12 format."); return false; } - boost::shared_ptr cert(certPtr, X509_free); - boost::shared_ptr privateKey(privateKeyPtr, EVP_PKEY_free); - boost::shared_ptr caCerts(caCertsPtr, freeX509Stack); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr cert(certPtr, X509_free); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr privateKey(privateKeyPtr, EVP_PKEY_free); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr caCerts(caCertsPtr, freeX509Stack); // Use the key & certificates if (SSL_CTX_use_certificate(context_, cert.get()) != 1) { @@ -223,7 +223,7 @@ bool OpenSSLServerContext::setServerCertificate(CertificateWithKey::ref certref) } Certificate::ref OpenSSLServerContext::getPeerCertificate() const { - boost::shared_ptr x509Cert(SSL_get_peer_certificate(handle_), X509_free); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr x509Cert(SSL_get_peer_certificate(handle_), X509_free); if (x509Cert) { return Certificate::ref(new OpenSSLCertificate(x509Cert)); } @@ -232,13 +232,13 @@ Certificate::ref OpenSSLServerContext::getPeerCertificate() const { } } -boost::shared_ptr OpenSSLServerContext::getPeerCertificateVerificationError() const { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr OpenSSLServerContext::getPeerCertificateVerificationError() const { int verifyResult = SSL_get_verify_result(handle_); if (verifyResult != X509_V_OK) { - return boost::shared_ptr(new CertificateVerificationError(getVerificationErrorTypeForResult(verifyResult))); + return SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new CertificateVerificationError(getVerificationErrorTypeForResult(verifyResult))); } else { - return boost::shared_ptr(); + return SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(); } } diff --git a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.h b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.h index d913c4da..1cb0f733 100644 --- a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.h +++ b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.h @@ -7,11 +7,11 @@ #pragma once #include -#include "Swiften/Base/boost_bsignals.h" #include #include "Swiften/TLS/TLSServerContext.h" #include "Swiften/Base/ByteArray.h" +#include "Swiften/SwiftenCompat.h" #include namespace Swift { @@ -29,7 +29,7 @@ namespace Swift { void handleDataFromApplication(const SafeByteArray&); Certificate::ref getPeerCertificate() const; - boost::shared_ptr getPeerCertificateVerificationError() const; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr getPeerCertificateVerificationError() const; virtual ByteArray getFinishMessage() const; diff --git a/include/Swiften/TLS/Schannel/SchannelServerContext.cpp b/include/Swiften/TLS/Schannel/SchannelServerContext.cpp index 96c090b5..7f796fca 100644 --- a/include/Swiften/TLS/Schannel/SchannelServerContext.cpp +++ b/include/Swiften/TLS/Schannel/SchannelServerContext.cpp @@ -520,7 +520,7 @@ void SchannelServerContext::encryptAndSendData(const SafeByteArray& data) bool SchannelServerContext::setServerCertificate(CertificateWithKey::ref certificate) { - boost::shared_ptr capiCertificate = boost::dynamic_pointer_cast(certificate); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr capiCertificate = std::dynamic_pointer_cast(certificate); if (!capiCertificate || capiCertificate->isNull()) { return false; } @@ -551,7 +551,7 @@ Certificate::ref SchannelServerContext::getPeerCertificate() const CertificateVerificationError::ref SchannelServerContext::getPeerCertificateVerificationError() const { - boost::shared_ptr pCertError; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr pCertError; if (m_state == Error) pCertError.reset( new CertificateVerificationError(m_verificationError) ); diff --git a/include/Swiften/TLS/Schannel/SchannelServerContext.h b/include/Swiften/TLS/Schannel/SchannelServerContext.h index d9e91df0..4478339f 100644 --- a/include/Swiften/TLS/Schannel/SchannelServerContext.h +++ b/include/Swiften/TLS/Schannel/SchannelServerContext.h @@ -6,8 +6,6 @@ #pragma once -#include "Swiften/Base/boost_bsignals.h" - #include "Swiften/TLS/TLSServerContext.h" #include "Swiften/TLS/Schannel/SchannelUtil.h" #include @@ -26,7 +24,7 @@ namespace Swift class SchannelServerContext : public TLSServerContext, boost::noncopyable { public: - typedef boost::shared_ptr sp_t; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr sp_t; public: SchannelServerContext(); diff --git a/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.h b/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.h index 1880787a..def8c81a 100644 --- a/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.h +++ b/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.h @@ -38,16 +38,16 @@ class SecureTransportServerContext : public TLSServerContext { static std::string stateToString(State state); void setState(State newState); - static boost::shared_ptr nativeToTLSError(OSStatus error); - boost::shared_ptr CSSMErrorToVerificationError(OSStatus resultCode); + static SWIFTEN_SHRPTR_NAMESPACE::shared_ptr nativeToTLSError(OSStatus error); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr CSSMErrorToVerificationError(OSStatus resultCode); void processHandshake(); void verifyServerCertificate(); - void fatalError(boost::shared_ptr error, boost::shared_ptr certificateError); + void fatalError(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr error, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr certificateError); private: - boost::shared_ptr sslContext_; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr sslContext_; SafeByteArray readingBuffer_; State state_; CertificateVerificationError::ref verificationError_; diff --git a/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.mm b/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.mm index 8dd40e73..c60160c3 100644 --- a/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.mm +++ b/include/Swiften/TLS/SecureTransport/SecureTransportServerContext.mm @@ -39,7 +39,7 @@ namespace { CFArrayRef CreateClientCertificateChainAsCFArrayRef(CertificateWithKey::ref key) { - boost::shared_ptr pkcs12 = boost::dynamic_pointer_cast(key); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr pkcs12 = std::dynamic_pointer_cast(key); if (!key) { return NULL; } @@ -104,7 +104,7 @@ CFArrayRef CreateClientCertificateChainAsCFArrayRef(CertificateWithKey::ref key) } SecureTransportContext::SecureTransportServerContext(bool checkCertificateRevocation) : state_(None), checkCertificateRevocation_(checkCertificateRevocation) { - sslContext_ = boost::shared_ptr(SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType), CFRelease); + sslContext_ = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType), CFRelease); OSStatus error = noErr; // set IO callbacks @@ -163,7 +163,7 @@ void SecureTransportServerContext::connect() { if (clientCertificate_) { CFArrayRef certs = CreateClientCertificateChainAsCFArrayRef(clientCertificate_); if (certs) { - boost::shared_ptr certRefs(certs, CFRelease); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr certRefs(certs, CFRelease); OSStatus result = SSLSetCertificate(sslContext_.get(), certRefs.get()); if (result != noErr) { SWIFT_LOG(error) << "SSLSetCertificate failed with error " << result << "." << std::endl; @@ -191,7 +191,7 @@ void SecureTransportServerContext::processHandshake() { } else { SWIFT_LOG(debug) << "Error returned from SSLHandshake call is " << error << "." << std::endl; - fatalError(nativeToTLSError(error), boost::make_shared()); + fatalError(nativeToTLSError(error), SWIFTEN_SHRPTR_NAMESPACE::make_shared()); } } @@ -203,15 +203,15 @@ void SecureTransportServerContext::verifyServerCertificate() { SecTrustRef trust = NULL; OSStatus error = SSLCopyPeerTrust(sslContext_.get(), &trust); if (error != noErr) { - fatalError(boost::make_shared(), boost::make_shared()); + fatalError(SWIFTEN_SHRPTR_NAMESPACE::make_shared(), SWIFTEN_SHRPTR_NAMESPACE::make_shared()); return; } - boost::shared_ptr trustRef = boost::shared_ptr(trust, CFRelease); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr trustRef = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(trust, CFRelease); if (checkCertificateRevocation_) { error = SecTrustSetOptions(trust, kSecTrustOptionRequireRevPerCert | kSecTrustOptionFetchIssuerFromNet); if (error != noErr) { - fatalError(boost::make_shared(), boost::make_shared()); + fatalError(SWIFTEN_SHRPTR_NAMESPACE::make_shared(), SWIFTEN_SHRPTR_NAMESPACE::make_shared()); return; } } @@ -219,7 +219,7 @@ void SecureTransportServerContext::verifyServerCertificate() { SecTrustResultType trustResult; error = SecTrustEvaluate(trust, &trustResult); if (error != errSecSuccess) { - fatalError(boost::make_shared(), boost::make_shared()); + fatalError(SWIFTEN_SHRPTR_NAMESPACE::make_shared(), SWIFTEN_SHRPTR_NAMESPACE::make_shared()); return; } @@ -242,7 +242,7 @@ void SecureTransportServerContext::verifyServerCertificate() { CSSM_TP_APPLE_EVIDENCE_INFO* statusChain; error = SecTrustGetResult(trustRef.get(), &trustResult, &certChain, &statusChain); if (error == errSecSuccess) { - boost::shared_ptr certChainRef = boost::shared_ptr(certChain, CFRelease); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr certChainRef = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(certChain, CFRelease); for (CFIndex index = 0; index < CFArrayGetCount(certChainRef.get()); index++) { for (CFIndex n = 0; n < statusChain[index].NumStatusCodes; n++) { // Even though Secure Transport reported CSSMERR_APPLETP_INCOMPLETE_REVOCATION_CHECK on the whole certificate @@ -259,11 +259,11 @@ void SecureTransportServerContext::verifyServerCertificate() { } } else { - verificationError_ = boost::make_shared(CertificateVerificationError::UnknownError); + verificationError_ = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::UnknownError); } break; case kSecTrustResultOtherError: - verificationError_ = boost::make_shared(CertificateVerificationError::UnknownError); + verificationError_ = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::UnknownError); break; default: SWIFT_LOG(warning) << "Unhandled trust result " << trustResult << "." << std::endl; @@ -274,7 +274,7 @@ void SecureTransportServerContext::verifyServerCertificate() { setState(Error); SSLClose(sslContext_.get()); sslContext_.reset(); - onError(boost::make_shared()); + onError(SWIFTEN_SHRPTR_NAMESPACE::make_shared()); } else { // proceed with handshake @@ -326,7 +326,7 @@ void SecureTransportServerContext::handleDataFromNetwork(const SafeByteArray& da } else { SWIFT_LOG(error) << "SSLRead failed with error " << error << ", read bytes: " << bytesRead << "." << std::endl; - fatalError(boost::make_shared(), boost::make_shared()); + fatalError(SWIFTEN_SHRPTR_NAMESPACE::make_shared(), SWIFTEN_SHRPTR_NAMESPACE::make_shared()); return; } @@ -358,7 +358,7 @@ void SecureTransportServerContext::handleDataFromApplication(const SafeByteArray return; default: SWIFT_LOG(warning) << "SSLWrite returned error code: " << error << ", processed bytes: " << processedBytes << std::endl; - fatalError(boost::make_shared(), boost::shared_ptr()); + fatalError(SWIFTEN_SHRPTR_NAMESPACE::make_shared(), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); } } @@ -367,18 +367,18 @@ std::vector SecureTransportServerContext::getPeerCertificateCh if (sslContext_) { typedef boost::remove_pointer::type SecTrust; - boost::shared_ptr securityTrust; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr securityTrust; SecTrustRef secTrust = NULL;; OSStatus error = SSLCopyPeerTrust(sslContext_.get(), &secTrust); if (error == noErr) { - securityTrust = boost::shared_ptr(secTrust, CFRelease); + securityTrust = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(secTrust, CFRelease); CFIndex chainSize = SecTrustGetCertificateCount(securityTrust.get()); for (CFIndex n = 0; n < chainSize; n++) { SecCertificateRef certificate = SecTrustGetCertificateAtIndex(securityTrust.get(), n); if (certificate) { - peerCertificateChain.push_back(boost::make_shared(certificate)); + peerCertificateChain.push_back(SWIFTEN_SHRPTR_NAMESPACE::make_shared(certificate)); } } } @@ -436,30 +436,30 @@ OSStatus SecureTransportServerContext::SSLSocketWriteCallback(SSLConnectionRef c return retValue; } -boost::shared_ptr SecureTransportServerContext::nativeToTLSError(OSStatus /* error */) { - boost::shared_ptr swiftenError; - swiftenError = boost::make_shared(); +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr SecureTransportServerContext::nativeToTLSError(OSStatus /* error */) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr swiftenError; + swiftenError = SWIFTEN_SHRPTR_NAMESPACE::make_shared(); return swiftenError; } -boost::shared_ptr SecureTransportServerContext::CSSMErrorToVerificationError(OSStatus resultCode) { - boost::shared_ptr error; +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr SecureTransportServerContext::CSSMErrorToVerificationError(OSStatus resultCode) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr error; switch(resultCode) { case CSSMERR_TP_NOT_TRUSTED: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_TP_NOT_TRUSTED" << std::endl; - error = boost::make_shared(CertificateVerificationError::Untrusted); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::Untrusted); break; case CSSMERR_TP_CERT_NOT_VALID_YET: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_TP_CERT_NOT_VALID_YET" << std::endl; - error = boost::make_shared(CertificateVerificationError::NotYetValid); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::NotYetValid); break; case CSSMERR_TP_CERT_EXPIRED: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_TP_CERT_EXPIRED" << std::endl; - error = boost::make_shared(CertificateVerificationError::Expired); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::Expired); break; case CSSMERR_TP_CERT_REVOKED: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_TP_CERT_REVOKED" << std::endl; - error = boost::make_shared(CertificateVerificationError::Revoked); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::Revoked); break; case CSSMERR_TP_VERIFY_ACTION_FAILED: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_TP_VERIFY_ACTION_FAILED" << std::endl; @@ -467,28 +467,28 @@ boost::shared_ptr SecureTransportServerContext::CS case CSSMERR_APPLETP_INCOMPLETE_REVOCATION_CHECK: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_APPLETP_INCOMPLETE_REVOCATION_CHECK" << std::endl; if (checkCertificateRevocation_) { - error = boost::make_shared(CertificateVerificationError::RevocationCheckFailed); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::RevocationCheckFailed); } break; case CSSMERR_APPLETP_OCSP_UNAVAILABLE: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_APPLETP_OCSP_UNAVAILABLE" << std::endl; if (checkCertificateRevocation_) { - error = boost::make_shared(CertificateVerificationError::RevocationCheckFailed); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::RevocationCheckFailed); } break; case CSSMERR_APPLETP_SSL_BAD_EXT_KEY_USE: SWIFT_LOG(debug) << "CSSM result code: CSSMERR_APPLETP_SSL_BAD_EXT_KEY_USE" << std::endl; - error = boost::make_shared(CertificateVerificationError::InvalidPurpose); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::InvalidPurpose); break; default: SWIFT_LOG(warning) << "unhandled CSSM error: " << resultCode << ", CSSM_TP_BASE_TP_ERROR: " << CSSM_TP_BASE_TP_ERROR << std::endl; - error = boost::make_shared(CertificateVerificationError::UnknownError); + error = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CertificateVerificationError::UnknownError); break; } return error; } -void SecureTransportServerContext::fatalError(boost::shared_ptr error, boost::shared_ptr certificateError) { +void SecureTransportServerContext::fatalError(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr error, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr certificateError) { setState(Error); if (sslContext_) { SSLClose(sslContext_.get()); diff --git a/include/Swiften/TLS/TLSServerContext.h b/include/Swiften/TLS/TLSServerContext.h index ba34dc11..f42b271b 100644 --- a/include/Swiften/TLS/TLSServerContext.h +++ b/include/Swiften/TLS/TLSServerContext.h @@ -6,8 +6,8 @@ #pragma once -#include "Swiften/Base/boost_bsignals.h" #include +#include #include "Swiften/Base/SafeByteArray.h" #include "Swiften/TLS/Certificate.h" diff --git a/include/boost/dll/import.hpp b/include/boost/dll/import.hpp index 74f23bfc..f65d353a 100644 --- a/include/boost/dll/import.hpp +++ b/include/boost/dll/import.hpp @@ -30,11 +30,11 @@ namespace boost { namespace dll { namespace detail { template class refc_function { - boost::shared_ptr lib_; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr lib_; T* func_ptr_; public: - refc_function(const boost::shared_ptr& lib, T* func_ptr) BOOST_NOEXCEPT + refc_function(const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& lib, T* func_ptr) BOOST_NOEXCEPT : lib_(lib) , func_ptr_(func_ptr) {} @@ -57,8 +57,8 @@ namespace detail { template struct import_type >::type> { - typedef boost::shared_ptr base_type; - typedef boost::shared_ptr type; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr base_type; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr type; }; } // namespace detail @@ -69,7 +69,7 @@ namespace detail { /*! -* Returns boost::function or boost::shared_ptr that holds an imported function or variable +* Returns boost::function or SWIFTEN_SHRPTR_NAMESPACE::shared_ptr that holds an imported function or variable * from the loaded library and refcounts usage * of the loaded shared library, so that it won't get unload until all copies of return value * are not destroyed. @@ -82,7 +82,7 @@ namespace detail { * \b Examples: * \code * boost::function f = import( -* boost::make_shared("test_lib.so"), +* SWIFTEN_SHRPTR_NAMESPACE::make_shared("test_lib.so"), * "integer_func_name" * ); * \endcode @@ -92,7 +92,7 @@ namespace detail { * \endcode * * \code -* boost::shared_ptr i = import("test_lib.so", "integer_name"); +* SWIFTEN_SHRPTR_NAMESPACE::shared_ptr i = import("test_lib.so", "integer_name"); * \endcode * * \b Template \b parameter \b T: Type of the symbol that we are going to import. Must be explicitly specified. @@ -101,7 +101,7 @@ namespace detail { * \param name Null-terminated C or C++ mangled name of the function to import. Can handle std::string, char*, const char*. * \param mode An mode that will be used on library load. * -* \return boost::function if T is a function type, or boost::shared_ptr if T is an object type. +* \return boost::function if T is a function type, or SWIFTEN_SHRPTR_NAMESPACE::shared_ptr if T is an object type. * * \throw boost::system::system_error if symbol does not exist or if the DLL/DSO was not loaded. * Overload that accepts path also throws std::bad_alloc in case of insufficient memory. @@ -116,28 +116,28 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const st load_mode::type mode = load_mode::default_mode) { return boost::dll::import( - boost::make_shared(lib, mode), + SWIFTEN_SHRPTR_NAMESPACE::make_shared(lib, mode), name.c_str() ); } //! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode) template -BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::shared_ptr& lib, const char* name) { +BOOST_DLL_IMPORT_RESULT_TYPE import(const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& lib, const char* name) { typedef typename boost::dll::detail::import_type::base_type type; return type(lib, &lib->get(name)); } //! \overload boost::dll::import(const boost::filesystem::path& lib, const char* name, load_mode::type mode) template -BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::shared_ptr& lib, const std::string& name) { +BOOST_DLL_IMPORT_RESULT_TYPE import(const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& lib, const std::string& name) { return boost::dll::import(lib, name.c_str()); } template BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const char* name, load_mode::type mode) { return boost::dll::import( - boost::make_shared(lib, mode), + SWIFTEN_SHRPTR_NAMESPACE::make_shared(lib, mode), name ); } @@ -146,7 +146,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const ch /*! -* Returns boost::function or boost::shared_ptr that holds an imported function or variable +* Returns boost::function or SWIFTEN_SHRPTR_NAMESPACE::shared_ptr that holds an imported function or variable * from the loaded library and refcounts usage * of the loaded shared library, so that it won't get unload until all copies of return value * are not destroyed. @@ -159,7 +159,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const ch * \b Examples: * \code * boost::function f = import_alias( -* boost::make_shared("test_lib.so"), +* SWIFTEN_SHRPTR_NAMESPACE::make_shared("test_lib.so"), * "integer_func_alias_name" * ); * \endcode @@ -169,7 +169,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const ch * \endcode * * \code -* boost::shared_ptr i = import_alias("test_lib.so", "integer_alias_name"); +* SWIFTEN_SHRPTR_NAMESPACE::shared_ptr i = import_alias("test_lib.so", "integer_alias_name"); * \endcode * * \b Template \b parameter \b T: Type of the symbol alias that we are going to import. Must be explicitly specified. @@ -178,7 +178,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import(const boost::filesystem::path& lib, const ch * \param name Null-terminated C or C++ mangled name of the function or variable to import. Can handle std::string, char*, const char*. * \param mode An mode that will be used on library load. * -* \return boost::function if T is a function type, or boost::shared_ptr if T is an object type. +* \return boost::function if T is a function type, or SWIFTEN_SHRPTR_NAMESPACE::shared_ptr if T is an object type. * * \throw boost::system::system_error if symbol does not exist or if the DLL/DSO was not loaded. * Overload that accepts path also throws std::bad_alloc in case of insufficient memory. @@ -193,20 +193,20 @@ BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::filesystem::path& lib, co load_mode::type mode = load_mode::default_mode) { return boost::dll::import_alias( - boost::make_shared(lib, mode), + SWIFTEN_SHRPTR_NAMESPACE::make_shared(lib, mode), name.c_str() ); } //! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode) template -BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::shared_ptr& lib, const std::string& name) { +BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& lib, const std::string& name) { return boost::dll::import_alias(lib, name.c_str()); } //! \overload boost::dll::import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode) template -BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::shared_ptr& lib, const char* name) { +BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const SWIFTEN_SHRPTR_NAMESPACE::shared_ptr& lib, const char* name) { typedef typename boost::dll::detail::import_type::base_type type; return type(lib, lib->get(name)); } @@ -214,7 +214,7 @@ BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::shared_ptr BOOST_DLL_IMPORT_RESULT_TYPE import_alias(const boost::filesystem::path& lib, const char* name, load_mode::type mode) { return boost::dll::import_alias( - boost::make_shared(lib, mode), + SWIFTEN_SHRPTR_NAMESPACE::make_shared(lib, mode), name ); } diff --git a/include/boost/dll/shared_library.hpp b/include/boost/dll/shared_library.hpp index a3c7442d..d292c536 100644 --- a/include/boost/dll/shared_library.hpp +++ b/include/boost/dll/shared_library.hpp @@ -12,6 +12,9 @@ /// \brief Contains the boost::dll::shared_library class, core class for all the /// DLL/DSO operations. +// Walkaround for compatibility with boost 1.54 +#include + #include #include #include diff --git a/include/boost/signalslib.hpp b/include/boost/signalslib.hpp new file mode 100644 index 00000000..6517ddba --- /dev/null +++ b/include/boost/signalslib.hpp @@ -0,0 +1,33 @@ +/* + * Walkaroung for Boost, Qt namespace clash + * + * Taken from boost documantation: + * http://www.boost.org/doc/libs/1_55_0/doc/html/signals/s04.html + */ + + +#ifndef SIGNALSLIB_HPP_INCLUDED +#define SIGNALSLIB_HPP_INCLUDED + +#if defined(signals) && defined(QOBJECTDEFS_H) && \ + !defined(QT_MOC_CPP) +# undef signals +# define signals signals +#endif + +#include +namespace boost +{ + namespace signalslib = signals; +} + +#if defined(signals) && defined(QOBJECTDEFS_H) && \ + !defined(QT_MOC_CPP) +# undef signals +// Restore the macro definition of "signals", as it was +// defined by Qt's . +# define signals protected +#endif + +#endif + diff --git a/include/transport/Config.h b/include/transport/Config.h index 97044a1d..b4f1940a 100644 --- a/include/transport/Config.h +++ b/include/transport/Config.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace Transport { diff --git a/include/transport/Conversation.h b/include/transport/Conversation.h index ab210e98..ad268008 100644 --- a/include/transport/Conversation.h +++ b/include/transport/Conversation.h @@ -25,6 +25,7 @@ #include #include "Swiften/Elements/Message.h" #include "Swiften/Elements/Presence.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -63,9 +64,9 @@ class Conversation { /// \param message Message received from legacy network. /// \param nickname For MUC conversation this is nickname of room participant who sent this message. - void handleMessage(boost::shared_ptr &message, const std::string &nickname = ""); + void handleMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message, const std::string &nickname = ""); - void handleRawMessage(boost::shared_ptr &message); + void handleRawMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message); void handleRawPresence(Swift::Presence::ref presence); /// Handles participant change in MUC. @@ -107,7 +108,7 @@ class Conversation { /// Sends message to Legacy network. /// \param message Message. - virtual void sendMessage(boost::shared_ptr &message) = 0; + virtual void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message) = 0; /// Returns ConversationManager associated with this Conversation. @@ -147,7 +148,7 @@ class Conversation { private: Swift::Presence::ref generatePresence(const std::string &nick, int flag, int status, const std::string &statusMessage, const std::string &newname = "", const std::string &iconhash = ""); - void cacheMessage(boost::shared_ptr &message); + void cacheMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message); private: ConversationManager *m_conversationManager; @@ -167,8 +168,8 @@ class Conversation { // connected to single room, we store all those things 10 times. // It would be also great to store last 100 messages per room // every time, so we can get history messages for IRC for example. - boost::shared_ptr m_subject; - std::list > m_cachedMessages; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_subject; + std::list > m_cachedMessages; typedef struct { Swift::Presence::ref presence; diff --git a/include/transport/FileTransferManager.h b/include/transport/FileTransferManager.h index 97a0fa58..0fe2273f 100644 --- a/include/transport/FileTransferManager.h +++ b/include/transport/FileTransferManager.h @@ -49,16 +49,16 @@ class Buddy; class FileTransferManager { public: typedef struct Transfer { - boost::shared_ptr ft; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ft; Swift::JID from; Swift::JID to; - boost::shared_ptr readByteStream; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr readByteStream; } Transfer; FileTransferManager(Component *component, UserManager *userManager); virtual ~FileTransferManager(); - FileTransferManager::Transfer sendFile(User *user, Buddy *buddy, boost::shared_ptr byteStream, const Swift::StreamInitiationFileInfo &info); + FileTransferManager::Transfer sendFile(User *user, Buddy *buddy, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr byteStream, const Swift::StreamInitiationFileInfo &info); private: Component *m_component; diff --git a/include/transport/Frontend.h b/include/transport/Frontend.h index 075784f6..ed217992 100644 --- a/include/transport/Frontend.h +++ b/include/transport/Frontend.h @@ -30,6 +30,7 @@ #include "Swiften/Elements/IQ.h" #include "Swiften/Elements/DiscoInfo.h" #include "Swiften/Elements/Presence.h" +#include "Swiften/SwiftenCompat.h" #include @@ -74,11 +75,11 @@ class Frontend { virtual void sendRosterRequest(Swift::RosterPayload::ref, Swift::JID to) = 0; - virtual void sendMessage(boost::shared_ptr message) = 0; + virtual void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) = 0; - virtual void sendIQ(boost::shared_ptr) = 0; + virtual void sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) = 0; - virtual boost::shared_ptr sendCapabilitiesRequest(Swift::JID to) = 0; + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr sendCapabilitiesRequest(Swift::JID to) = 0; virtual void reconnectUser(const std::string &user) = 0; @@ -98,14 +99,14 @@ class Frontend { virtual bool isRawXMLEnabled() { return false; } boost::signal onVCardRequired; - boost::signal vcard)> onVCardUpdated; + boost::signal vcard)> onVCardUpdated; boost::signal onBuddyUpdated; boost::signal onBuddyRemoved; boost::signal onBuddyAdded; boost::signal onMessageReceived; boost::signal onAvailableChanged; - boost::signal) > onPresenceReceived; - boost::signal info)> onCapabilitiesReceived; + boost::signal) > onPresenceReceived; + boost::signal info)> onCapabilitiesReceived; }; } diff --git a/include/transport/MemoryReadBytestream.h b/include/transport/MemoryReadBytestream.h index cb36389f..253c22c1 100644 --- a/include/transport/MemoryReadBytestream.h +++ b/include/transport/MemoryReadBytestream.h @@ -22,8 +22,10 @@ #include #include +#include #include "Swiften/FileTransfer/ReadBytestream.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -34,7 +36,7 @@ class MemoryReadBytestream : public Swift::ReadBytestream { unsigned long appendData(const std::string &data); - virtual boost::shared_ptr > read(size_t size); + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr > read(size_t size); void setFinished() { m_finished = true; } bool isFinished() const; diff --git a/include/transport/NetworkPluginServer.h b/include/transport/NetworkPluginServer.h index 043e447c..50b526eb 100644 --- a/include/transport/NetworkPluginServer.h +++ b/include/transport/NetworkPluginServer.h @@ -39,6 +39,7 @@ #include "Swiften/Parser/XMPPParser.h" #include "Swiften/Parser/XMPPParserClient.h" #include "Swiften/Serializer/XMPPSerializer.h" +#include "Swiften/SwiftenCompat.h" #include #include #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) @@ -68,7 +69,7 @@ class NetworkPluginServer : Swift::XMPPParserClient { int pongReceived; std::list users; Swift::SafeByteArray data; - boost::shared_ptr connection; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection; unsigned long res; unsigned long init_res; unsigned long shared; @@ -104,13 +105,13 @@ class NetworkPluginServer : Swift::XMPPParserClient { bool moveToLongRunBackend(User *user); - void handleMessageReceived(NetworkConversation *conv, boost::shared_ptr &message); + void handleMessageReceived(NetworkConversation *conv, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message); public: - void handleNewClientConnection(boost::shared_ptr c); + void handleNewClientConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr c); void handleSessionFinished(Backend *c); void handlePongReceived(Backend *c); - void handleDataRead(Backend *c, boost::shared_ptr data); + void handleDataRead(Backend *c, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data); void handleConnectedPayload(const std::string &payload); void handleDisconnectedPayload(const std::string &payload); @@ -148,7 +149,7 @@ class NetworkPluginServer : Swift::XMPPParserClient { void handleBlockToggled(Buddy *buddy); - void handleVCardUpdated(User *user, boost::shared_ptr vcard); + void handleVCardUpdated(User *user, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard); void handleVCardRequired(User *user, const std::string &name, unsigned int id); void handleFTStateChanged(Swift::FileTransfer::State state, const std::string &userName, const std::string &buddyName, const std::string &fileName, unsigned long size, unsigned long id); @@ -158,7 +159,7 @@ class NetworkPluginServer : Swift::XMPPParserClient { void handlePIDTerminated(unsigned long pid); private: - void send(boost::shared_ptr &, const std::string &data); + void send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &, const std::string &data); void pingTimeout(); void sendPing(Backend *c); @@ -166,14 +167,14 @@ class NetworkPluginServer : Swift::XMPPParserClient { Backend *getFreeClient(bool acceptUsers = true, bool longRun = false, bool check = false); void connectWaitingUsers(); void loginDelayFinished(); - void handleRawIQReceived(boost::shared_ptr iq); - void handleRawPresenceReceived(boost::shared_ptr presence); + void handleRawIQReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq); + void handleRawPresenceReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence); void handleStreamStart(const Swift::ProtocolHeader&) {} #if HAVE_SWIFTEN_3 - void handleElement(boost::shared_ptr element); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element); #else - void handleElement(boost::shared_ptr element); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element); #endif void handleStreamEnd() {} @@ -182,7 +183,7 @@ class NetworkPluginServer : Swift::XMPPParserClient { RosterResponder *m_rosterResponder; BlockResponder *m_blockResponder; Config *m_config; - boost::shared_ptr m_server; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_server; std::list m_clients; std::vector m_pids; Swift::Timer::ref m_pingTimer; diff --git a/include/transport/PresenceOracle.h b/include/transport/PresenceOracle.h index 39acc77f..fbad98ed 100644 --- a/include/transport/PresenceOracle.h +++ b/include/transport/PresenceOracle.h @@ -22,12 +22,12 @@ #include +#include + #include #include #include -#include - namespace Transport { class Frontend; diff --git a/include/transport/RosterManager.h b/include/transport/RosterManager.h index 6a36d8a8..ba991ea6 100644 --- a/include/transport/RosterManager.h +++ b/include/transport/RosterManager.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include // #include "rosterstorage.h" diff --git a/include/transport/Transport.h b/include/transport/Transport.h index 385c9f42..25264654 100644 --- a/include/transport/Transport.h +++ b/include/transport/Transport.h @@ -21,6 +21,7 @@ #pragma once #include +#include #include #include "Swiften/Network/BoostTimerFactory.h" #include "Swiften/Network/BoostIOServiceThread.h" @@ -28,6 +29,7 @@ #include "Swiften/Elements/DiscoInfo.h" #include "Swiften/Elements/Presence.h" #include "Swiften/Elements/IQ.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { class StorageBackend; @@ -108,7 +110,7 @@ namespace Transport { /// \param presence Presence. boost::signal onUserPresenceReceived; - boost::signal)> onRawIQReceived; + boost::signal)> onRawIQReceived; boost::signal onAdminInterfaceSet; @@ -134,7 +136,7 @@ namespace Transport { } private: - void handleDiscoInfoResponse(boost::shared_ptr info, Swift::ErrorPayload::ref error, const Swift::JID& jid); + void handleDiscoInfoResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info, Swift::ErrorPayload::ref error, const Swift::JID& jid); void handleCapsChanged(const Swift::JID& jid); void handleBackendConfigChanged(); diff --git a/include/transport/User.h b/include/transport/User.h index a4eda2a8..0f837ee7 100644 --- a/include/transport/User.h +++ b/include/transport/User.h @@ -20,6 +20,7 @@ #pragma once +#include #include #include "transport/StorageBackend.h" #include @@ -30,6 +31,7 @@ #include "Swiften/Elements/DiscoInfo.h" #include "Swiften/Network/Timer.h" #include "Swiften/Network/Connection.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -89,7 +91,7 @@ class User { void handleSubscription(Swift::Presence::ref presence); - void handleDiscoInfo(const Swift::JID& jid, boost::shared_ptr info); + void handleDiscoInfo(const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info); time_t &getLastActivity() { return m_lastActivity; @@ -169,10 +171,10 @@ class User { bool m_readyForConnect; bool m_ignoreDisconnect; Swift::Timer::ref m_reconnectTimer; - boost::shared_ptr connection; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connection; time_t m_lastActivity; std::map m_legacyCaps; - std::vector > m_filetransfers; + std::vector > m_filetransfers; int m_resources; int m_reconnectCounter; std::list m_joinedRooms; diff --git a/include/transport/UserManager.h b/include/transport/UserManager.h index d722970a..e4923695 100644 --- a/include/transport/UserManager.h +++ b/include/transport/UserManager.h @@ -20,6 +20,7 @@ #pragma once +#include #include #include #include "Swiften/Elements/Message.h" @@ -29,6 +30,7 @@ #include "Swiften/Elements/DiscoInfo.h" #include "Swiften/Elements/VCard.h" #include "Swiften/Network/Timer.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -143,7 +145,7 @@ class UserManager /*: public Swift::EntityCapsProvider*/ { void handleSubscription(Swift::Presence::ref presence); void handleMUCPresence(Swift::Presence::ref presence); void handleRemoveTimeout(const std::string jid, User *user, bool reconnect); - void handleDiscoInfo(const Swift::JID& jid, boost::shared_ptr info); + void handleDiscoInfo(const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info); void addUser(User *user); long m_onlineBuddies; diff --git a/include/transport/WebSocketClient.h b/include/transport/WebSocketClient.h index 80465aeb..a1efbfe0 100644 --- a/include/transport/WebSocketClient.h +++ b/include/transport/WebSocketClient.h @@ -31,6 +31,7 @@ #include #include "Swiften/Version.h" #include "Swiften/Network/Timer.h" +#include "Swiften/SwiftenCompat.h" #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) @@ -66,7 +67,7 @@ class WebSocketClient { private: void handleDNSResult(const std::vector&, boost::optional); - void handleDataRead(boost::shared_ptr data); + void handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data); void handleConnected(bool error); void handleDisconnected(const boost::optional &error); @@ -74,8 +75,8 @@ class WebSocketClient { private: Component *m_component; - boost::shared_ptr m_dnsQuery; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_dnsQuery; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; Swift::TLSConnectionFactory *m_tlsConnectionFactory; Swift::PlatformTLSFactories *m_tlsFactory; std::string m_host; diff --git a/libtransport/Buddy.cpp b/libtransport/Buddy.cpp index a4c5a216..d5161622 100644 --- a/libtransport/Buddy.cpp +++ b/libtransport/Buddy.cpp @@ -137,10 +137,10 @@ std::vector &Buddy::generatePresenceStanzas(int features, // if (features & 0/*TRANSPORT_FEATURE_AVATARS*/) { - presence->addPayload(boost::shared_ptr(new Swift::VCardUpdate (getIconHash()))); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::VCardUpdate (getIconHash()))); // } // if (isBlocked()) { -// presence->addPayload(boost::shared_ptr(new Transport::BlockPayload ())); +// presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Transport::BlockPayload ())); // } } diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index dee844d9..c0d0082f 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -59,6 +59,7 @@ if (APPLE) TARGET_LINK_LIBRARIES(transport ${APPLE_FRAMEWORKS}) endif() + INSTALL(TARGETS transport LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries) #CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc") diff --git a/libtransport/Conversation.cpp b/libtransport/Conversation.cpp index 069b62bb..cd96bb17 100644 --- a/libtransport/Conversation.cpp +++ b/libtransport/Conversation.cpp @@ -88,7 +88,7 @@ void Conversation::destroyRoom() { c2.code = 307; p->addStatusCode(c2); - presence->addPayload(boost::shared_ptr(p)); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(p)); BOOST_FOREACH(const Swift::JID &jid, m_jids) { presence->setTo(jid); m_conversationManager->getComponent()->getFrontend()->sendPresence(presence); @@ -101,9 +101,9 @@ void Conversation::setRoom(const std::string &room) { m_legacyName = m_room + "/" + m_legacyName; } -void Conversation::cacheMessage(boost::shared_ptr &message) { +void Conversation::cacheMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message) { boost::posix_time::ptime timestamp = boost::posix_time::second_clock::universal_time(); - boost::shared_ptr delay(boost::make_shared()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr delay(SWIFTEN_SHRPTR_NAMESPACE::make_shared()); delay->setStamp(timestamp); message->addPayload(delay); m_cachedMessages.push_back(message); @@ -112,7 +112,7 @@ void Conversation::cacheMessage(boost::shared_ptr &message) { } } -void Conversation::handleRawMessage(boost::shared_ptr &message) { +void Conversation::handleRawMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message) { if (message->getType() != Swift::Message::Groupchat) { if (m_conversationManager->getComponent()->inServerMode() && m_conversationManager->getUser()->shouldCacheMessages()) { cacheMessage(message); @@ -145,7 +145,7 @@ void Conversation::handleRawMessage(boost::shared_ptr &message) } } -void Conversation::handleMessage(boost::shared_ptr &message, const std::string &nickname) { +void Conversation::handleMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message, const std::string &nickname) { if (m_muc) { message->setType(Swift::Message::Groupchat); } @@ -269,7 +269,7 @@ void Conversation::sendParticipants(const Swift::JID &to, const std::string &nic } void Conversation::sendCachedMessages(const Swift::JID &to) { - for (std::list >::const_iterator it = m_cachedMessages.begin(); it != m_cachedMessages.end(); it++) { + for (std::list >::const_iterator it = m_cachedMessages.begin(); it != m_cachedMessages.end(); it++) { if (to.isValid()) { (*it)->setTo(to); } @@ -321,24 +321,24 @@ Swift::Presence::ref Conversation::generatePresence(const std::string &nick, int if (flag & PARTICIPANT_FLAG_CONFLICT) { delete p; presence->setType(Swift::Presence::Error); - presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); - presence->addPayload(boost::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::Conflict))); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::MUCPayload())); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::Conflict))); LOG4CXX_INFO(logger, m_jid.toString() << ": Generating error presence: PARTICIPANT_FLAG_CONFLICT"); return presence; } else if (flag & PARTICIPANT_FLAG_NOT_AUTHORIZED) { delete p; presence->setType(Swift::Presence::Error); - presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); - presence->addPayload(boost::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::NotAuthorized, Swift::ErrorPayload::Auth, statusMessage))); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::MUCPayload())); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::NotAuthorized, Swift::ErrorPayload::Auth, statusMessage))); LOG4CXX_INFO(logger, m_jid.toString() << ": Generating error presence: PARTICIPANT_FLAG_NOT_AUTHORIZED"); return presence; } else if (flag & PARTICIPANT_FLAG_ROOM_NOT_FOUD) { delete p; presence->setType(Swift::Presence::Error); - presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); - presence->addPayload(boost::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::ItemNotFound, Swift::ErrorPayload::Cancel, statusMessage))); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::MUCPayload())); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::ItemNotFound, Swift::ErrorPayload::Cancel, statusMessage))); LOG4CXX_INFO(logger, m_jid.toString() << ": Generating error presence: PARTICIPANT_FLAG_ROOM_NOT_FOUND"); return presence; } @@ -376,11 +376,11 @@ Swift::Presence::ref Conversation::generatePresence(const std::string &nick, int } if (!iconhash.empty()) { - presence->addPayload(boost::shared_ptr(new Swift::VCardUpdate (iconhash))); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::VCardUpdate (iconhash))); } p->addItem(item); - presence->addPayload(boost::shared_ptr(p)); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(p)); return presence; } diff --git a/libtransport/FileTransferManager.cpp b/libtransport/FileTransferManager.cpp index 069ef21a..c5487d6b 100644 --- a/libtransport/FileTransferManager.cpp +++ b/libtransport/FileTransferManager.cpp @@ -46,7 +46,7 @@ FileTransferManager::FileTransferManager(Component *component, UserManager *user // #else // m_proxyManager = new Swift::SOCKS5BytestreamProxiesManager(m_component->getNetworkFactories()->getConnectionFactory(), m_component->getNetworkFactories()->getTimerFactory(), m_component->getNetworkFactories()->getDomainNameResolver(), m_component->getIQRouter(), "bar.com"); // #endif -// boost::shared_ptr server = m_component->getNetworkFactories()->getConnectionServerFactory()->createConnectionServer(19645); +// SWIFTEN_SHRPTR_NAMESPACE::shared_ptr server = m_component->getNetworkFactories()->getConnectionServerFactory()->createConnectionServer(19645); // server->start(); // #if HAVE_SWIFTEN_3 // m_proxyServerManager = new Swift::SOCKS5BytestreamServerManager(m_bytestreamRegistry, m_component->getNetworkFactories()->getConnectionServerFactory(), m_component->getNetworkFactories()->getNetworkEnvironment(), m_component->getNetworkFactories()->getNATTraverser()); @@ -82,7 +82,7 @@ FileTransferManager::~FileTransferManager() { // #endif } -FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *buddy, boost::shared_ptr byteStream, const Swift::StreamInitiationFileInfo &info) { +FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *buddy, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr byteStream, const Swift::StreamInitiationFileInfo &info) { FileTransferManager::Transfer transfer; // transfer.from = buddy->getJID(); // transfer.to = user->getJID(); diff --git a/libtransport/MemoryReadByteStream.cpp b/libtransport/MemoryReadByteStream.cpp index 5e61122f..407493fb 100644 --- a/libtransport/MemoryReadByteStream.cpp +++ b/libtransport/MemoryReadByteStream.cpp @@ -41,14 +41,14 @@ unsigned long MemoryReadBytestream::appendData(const std::string &data) { return m_data.size(); } -boost::shared_ptr > MemoryReadBytestream::read(size_t size) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr > MemoryReadBytestream::read(size_t size) { if (m_data.empty()) { onDataNeeded(); - return boost::shared_ptr >(new std::vector()); + return SWIFTEN_SHRPTR_NAMESPACE::shared_ptr >(new std::vector()); } if (m_data.size() < size) { - boost::shared_ptr > ptr(new std::vector(m_data.begin(), m_data.end())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr > ptr(new std::vector(m_data.begin(), m_data.end())); m_sent += m_data.size(); m_data.clear(); if (m_sent == m_size) @@ -56,7 +56,7 @@ boost::shared_ptr > MemoryReadBytestream::read(size_t onDataNeeded(); return ptr; } - boost::shared_ptr > ptr(new std::vector(m_data.begin(), m_data.begin() + size)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr > ptr(new std::vector(m_data.begin(), m_data.begin() + size)); m_data.erase(m_data.begin(), m_data.begin() + size); m_sent += size; if (m_sent == m_size) diff --git a/libtransport/MySQLBackend.cpp b/libtransport/MySQLBackend.cpp index 48728076..a92c0d30 100644 --- a/libtransport/MySQLBackend.cpp +++ b/libtransport/MySQLBackend.cpp @@ -86,8 +86,6 @@ exec_ok = false; \ } -using namespace boost; - namespace Transport { DEFINE_LOGGER(logger, "MySQLBackend"); diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp index 8f8ef918..821f01bb 100644 --- a/libtransport/NetworkPluginServer.cpp +++ b/libtransport/NetworkPluginServer.cpp @@ -83,11 +83,11 @@ class NetworkConversation : public Conversation { } // Called when there's new message to legacy network from XMPP network - void sendMessage(boost::shared_ptr &message) { + void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message) { onMessageToSend(this, message); } - boost::signal &)> onMessageToSend; + boost::signal &)> onMessageToSend; }; class NetworkFactory : public Factory { @@ -389,7 +389,7 @@ void NetworkPluginServer::loginDelayFinished() { connectWaitingUsers(); } -void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr c) { +void NetworkPluginServer::handleNewClientConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr c) { // Create new Backend instance Backend *client = new Backend; client->pongReceived = -1; @@ -495,7 +495,7 @@ void NetworkPluginServer::handleVCardPayload(const std::string &data) { } std::string field; - boost::shared_ptr vcard(new Swift::VCard()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard(new Swift::VCard()); utf8::replace_invalid(payload.fullname().begin(), payload.fullname().end(), std::back_inserter(field), '_'); vcard->setFullName(field); @@ -559,8 +559,8 @@ void NetworkPluginServer::handleChatStatePayload(const std::string &data, Swift: } // Forward chatstate - boost::shared_ptr msg(new Swift::Message()); - msg->addPayload(boost::make_shared(type)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); + msg->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared(type)); conv->handleMessage(msg); } @@ -679,7 +679,7 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool user->updateLastActivity(); // Set proper body. - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); if (subject) { msg->setSubject(payload.message()); } @@ -693,12 +693,12 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool // Add xhtml-im payload. if (CONFIG_BOOL(m_config, "service.enable_xhtml") && !payload.xhtml().empty()) { - msg->addPayload(boost::make_shared(payload.xhtml())); + msg->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared(payload.xhtml())); } if (!payload.timestamp().empty()) { boost::posix_time::ptime timestamp = boost::posix_time::from_iso_string(payload.timestamp()); - boost::shared_ptr delay(boost::make_shared()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr delay(SWIFTEN_SHRPTR_NAMESPACE::make_shared()); delay->setStamp(timestamp); msg->addPayload(delay); } @@ -754,8 +754,8 @@ void NetworkPluginServer::handleConvMessageAckPayload(const std::string &data) { return; } - boost::shared_ptr msg(new Swift::Message()); - msg->addPayload(boost::make_shared(payload.id())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); + msg->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared(payload.id())); NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname()); @@ -779,9 +779,9 @@ void NetworkPluginServer::handleAttentionPayload(const std::string &data) { if (!user) return; - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody(payload.message()); - msg->addPayload(boost::make_shared()); + msg->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared()); // Attentions trigger new Conversation creation NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname()); @@ -831,7 +831,7 @@ void NetworkPluginServer::handleFTStartPayload(const std::string &data) { fileInfo.setName(payload.filename()); Backend *c = (Backend *) user->getData(); - boost::shared_ptr bytestream(new MemoryReadBytestream(payload.size())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr bytestream(new MemoryReadBytestream(payload.size())); bytestream->onDataNeeded.connect(boost::bind(&NetworkPluginServer::handleFTDataNeeded, this, c, bytestream_id + 1)); LOG4CXX_INFO(logger, "jid=" << buddy->getJID()); @@ -966,7 +966,7 @@ void NetworkPluginServer::handleQueryPayload(Backend *b, const std::string &data return; } - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody(payload.config()); m_adminInterface->handleQuery(msg); @@ -1022,11 +1022,11 @@ void NetworkPluginServer::handleRoomListPayload(const std::string &data) { } } #if HAVE_SWIFTEN_3 -void NetworkPluginServer::handleElement(boost::shared_ptr element) { +void NetworkPluginServer::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #else -void NetworkPluginServer::handleElement(boost::shared_ptr element) { +void NetworkPluginServer::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #endif - boost::shared_ptr stanza = boost::dynamic_pointer_cast(element); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stanza = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(element); if (!stanza) { return; } @@ -1073,7 +1073,7 @@ void NetworkPluginServer::handleElement(boost::shared_ptr elemen } } - boost::shared_ptr message = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (message) { if (conv) { conv->handleRawMessage(message); @@ -1084,7 +1084,7 @@ void NetworkPluginServer::handleElement(boost::shared_ptr elemen return; } - boost::shared_ptr presence = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (presence) { if (buddy) { if (!buddy->isAvailable() && presence->getType() != Swift::Presence::Unavailable) { @@ -1103,7 +1103,7 @@ void NetworkPluginServer::handleElement(boost::shared_ptr elemen } // TODO: Move m_id2resource in User and clean it up - boost::shared_ptr iq = boost::dynamic_pointer_cast(stanza); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(stanza); if (iq) { if (m_id2resource.find(stanza->getTo().toBare().toString() + stanza->getID()) != m_id2resource.end()) { iq->setTo(Swift::JID(iq->getTo().getNode(), iq->getTo().getDomain(), m_id2resource[stanza->getTo().toBare().toString() + stanza->getID()])); @@ -1126,7 +1126,7 @@ void NetworkPluginServer::handleRawXML(const std::string &xml) { m_xmppParser->parse(xml); } -void NetworkPluginServer::handleRawPresenceReceived(boost::shared_ptr presence) { +void NetworkPluginServer::handleRawPresenceReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr presence) { if (!CONFIG_BOOL_DEFAULTED(m_config, "features.rawxml", false)) { return; } @@ -1153,7 +1153,7 @@ void NetworkPluginServer::handleRawPresenceReceived(boost::shared_ptrconnection, xml); } -void NetworkPluginServer::handleRawIQReceived(boost::shared_ptr iq) { +void NetworkPluginServer::handleRawIQReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { User *user = m_userManager->getUser(iq->getFrom().toBare()); if (!user) return; @@ -1180,7 +1180,7 @@ void NetworkPluginServer::handleRawIQReceived(boost::shared_ptr iq) { send(c->connection, xml); } -void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr data) { +void NetworkPluginServer::handleDataRead(Backend *c, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { // Append data to buffer c->data.insert(c->data.end(), data->begin(), data->end()); @@ -1300,7 +1300,7 @@ void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr &c, const std::string &data) { +void NetworkPluginServer::send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &c, const std::string &data) { // generate header - size of wrapper message uint32_t size = htonl(data.size()); char *header = (char *) &size; @@ -1637,7 +1637,7 @@ void NetworkPluginServer::handleUserDestroyed(User *user) { } } -void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost::shared_ptr &msg) { +void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &msg) { conv->getConversationManager()->getUser()->updateLastActivity(); if (CONFIG_BOOL_DEFAULTED(m_config, "features.rawxml", false)) { @@ -1658,7 +1658,7 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost return; } - boost::shared_ptr statePayload = msg->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr statePayload = msg->getPayload(); if (statePayload) { pbnetwork::WrapperMessage_Type type = pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED; switch (statePayload->getChatState()) { @@ -1692,7 +1692,7 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost } } - boost::shared_ptr attentionPayload = msg->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr attentionPayload = msg->getPayload(); if (attentionPayload) { pbnetwork::ConversationMessage m; m.set_username(conv->getConversationManager()->getUser()->getJID().toBare()); @@ -1731,7 +1731,7 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost std::string xhtml; - boost::shared_ptr xhtmlPayload = msg->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr xhtmlPayload = msg->getPayload(); if (xhtmlPayload) { xhtml = xhtmlPayload->getBody(); } @@ -1748,7 +1748,7 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost m.set_buddyname(conv->getLegacyName()); m.set_message(body); m.set_xhtml(xhtml); - boost::shared_ptr receiptPayload = msg->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr receiptPayload = msg->getPayload(); if (receiptPayload && !msg->getID().empty()) { m.set_id(msg->getID()); } @@ -1873,7 +1873,7 @@ void NetworkPluginServer::handleBlockToggled(Buddy *b) { } -void NetworkPluginServer::handleVCardUpdated(User *user, boost::shared_ptr v) { +void NetworkPluginServer::handleVCardUpdated(User *user, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr v) { if (!v) { LOG4CXX_INFO(logger, user->getJID().toString() << ": Received empty VCard"); return; diff --git a/libtransport/PQXXBackend.cpp b/libtransport/PQXXBackend.cpp index 3f167b0f..c4a0037e 100644 --- a/libtransport/PQXXBackend.cpp +++ b/libtransport/PQXXBackend.cpp @@ -26,7 +26,6 @@ #include "log4cxx/logger.h" using namespace log4cxx; -using namespace boost; namespace Transport { diff --git a/libtransport/PresenceOracle.cpp b/libtransport/PresenceOracle.cpp index 31d74e7a..fbc8312a 100644 --- a/libtransport/PresenceOracle.cpp +++ b/libtransport/PresenceOracle.cpp @@ -46,7 +46,7 @@ void PresenceOracle::handleStanzaChannelAvailableChanged(bool available) { } void PresenceOracle::clearPresences(const Swift::JID& bareJID) { - std::map > jidMap = entries_[bareJID]; + std::map > jidMap = entries_[bareJID]; jidMap.clear(); entries_[bareJID] = jidMap; } @@ -69,7 +69,7 @@ void PresenceOracle::handleIncomingPresence(Presence::ref presence) { passedPresence->setFrom(bareJID); passedPresence->setStatus(presence->getStatus()); } - std::map > jidMap = entries_[bareJID]; + std::map > jidMap = entries_[bareJID]; if (passedPresence->getFrom().isBare() && presence->getType() == Presence::Unavailable) { /* Have a bare-JID only presence of offline */ jidMap.clear(); diff --git a/libtransport/RosterManager.cpp b/libtransport/RosterManager.cpp index 1dea8c75..8b8388c3 100644 --- a/libtransport/RosterManager.cpp +++ b/libtransport/RosterManager.cpp @@ -112,7 +112,7 @@ void RosterManager::sendBuddySubscribePresence(Buddy *buddy) { response->setFrom(buddy->getJID().toBare()); response->setType(Swift::Presence::Subscribe); if (!buddy->getAlias().empty()) { - response->addPayload(boost::make_shared(buddy->getAlias())); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared(buddy->getAlias())); } m_component->getFrontend()->sendPresence(response); } diff --git a/libtransport/SQLite3Backend.cpp b/libtransport/SQLite3Backend.cpp index a8edc1e4..067a89d1 100644 --- a/libtransport/SQLite3Backend.cpp +++ b/libtransport/SQLite3Backend.cpp @@ -61,8 +61,6 @@ LOG4CXX_ERROR(logger, NAME<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));\ } -using namespace boost; - namespace Transport { DEFINE_LOGGER(logger, "SQLite3Backend"); diff --git a/libtransport/ThreadPool.cpp b/libtransport/ThreadPool.cpp index 6ffdea50..8522334d 100644 --- a/libtransport/ThreadPool.cpp +++ b/libtransport/ThreadPool.cpp @@ -1,6 +1,8 @@ #include "transport/ThreadPool.h" #include "transport/Logging.h" +#include "Swiften/SwiftenCompat.h" + namespace Transport { DEFINE_LOGGER(logger, "ThreadPool") @@ -10,7 +12,7 @@ static void Worker(Thread *t, int wid, Swift::EventLoop *loop) { LOG4CXX_INFO(logger, "Starting thread " << wid) t->run(); - loop->postEvent(boost::bind(boost::ref(onWorkCompleted), t, wid), boost::shared_ptr()); + loop->postEvent(boost::bind(boost::ref(onWorkCompleted), t, wid), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); } diff --git a/libtransport/User.cpp b/libtransport/User.cpp index fffc4eb5..8a4a6d5f 100644 --- a/libtransport/User.cpp +++ b/libtransport/User.cpp @@ -39,8 +39,6 @@ #include #include -using namespace boost; - #define foreach BOOST_FOREACH namespace Transport { @@ -78,9 +76,9 @@ User::~User(){ LOG4CXX_INFO(logger, m_jid.toString() << ": Destroying"); // if (m_component->inServerMode()) { // #if HAVE_SWIFTEN_3 -// dynamic_cast(m_component->getFrontend())->finishSession(m_jid, boost::shared_ptr()); +// dynamic_cast(m_component->getFrontend())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); // #else -// dynamic_cast(m_component->getFrontend())->finishSession(m_jid, boost::shared_ptr()); +// dynamic_cast(m_component->getFrontend())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); // #endif // } @@ -174,7 +172,7 @@ void User::leaveRoom(const std::string &room) { void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) { LOG4CXX_INFO(logger, "PRESENCE " << presence->getFrom().toString() << " " << presence->getTo().toString()); - boost::shared_ptr vcardUpdate = presence->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcardUpdate = presence->getPayload(); if (vcardUpdate) { std::string value = ""; int type = (int) TYPE_STRING; @@ -193,7 +191,7 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) { if (!m_connected) { // we are not connected to legacy network, so we should do it when disco#info arrive :) if (m_readyForConnect == false) { - boost::shared_ptr capsInfo = presence->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr capsInfo = presence->getPayload(); if (capsInfo && capsInfo->getHash() == "sha-1") { if (m_component->getFrontend()->sendCapabilitiesRequest(presence->getFrom()) != Swift::DiscoInfo::ref()) { LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network"); @@ -392,7 +390,7 @@ void User::handleSubscription(Swift::Presence::ref presence) { m_rosterManager->handleSubscription(presence); } -void User::handleDiscoInfo(const Swift::JID& jid, boost::shared_ptr info) { +void User::handleDiscoInfo(const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info) { LOG4CXX_INFO(logger, jid.toString() << ": got disco#info"); #ifdef SUPPORT_LEGACY_CAPS m_legacyCaps[jid] = info; @@ -447,11 +445,11 @@ void User::handleDisconnected(const std::string &error, Swift::SpectrumErrorPayl } onDisconnected(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody(error); msg->setTo(m_jid.toBare()); msg->setFrom(m_component->getJID()); - msg->addPayload(boost::make_shared(e)); + msg->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared(e)); m_component->getFrontend()->sendMessage(msg); disconnectUser(error, e); diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp index 026d6d84..b8d85d27 100644 --- a/libtransport/UserManager.cpp +++ b/libtransport/UserManager.cpp @@ -142,7 +142,7 @@ int UserManager::getUserCount() { return m_users.size(); } -void UserManager::handleDiscoInfo(const Swift::JID& jid, boost::shared_ptr info) { +void UserManager::handleDiscoInfo(const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info) { User *user = getUser(jid.toBare().toString()); if (!user) { return; @@ -278,7 +278,7 @@ void UserManager::handlePresence(Swift::Presence::ref presence) { if (CONFIG_BOOL(m_component->getConfig(), "service.vip_only") && res.vip == false) { if (!CONFIG_STRING(m_component->getConfig(), "service.vip_message").empty()) { - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody(CONFIG_STRING(m_component->getConfig(), "service.vip_message")); msg->setTo(presence->getFrom()); msg->setFrom(m_component->getJID()); @@ -370,7 +370,7 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) { } // Do not count chatstate notification... - boost::shared_ptr statePayload = message->getPayload(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr statePayload = message->getPayload(); if (!statePayload) { messageToBackendSent(); } @@ -555,7 +555,7 @@ void UserManager::connectUser(const Swift::JID &user) { } else { // Send message to currently logged in session - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("You have signed on from another location."); msg->setTo(user); msg->setFrom(m_component->getJID()); @@ -566,9 +566,9 @@ void UserManager::connectUser(const Swift::JID &user) { m_userRegistry->onPasswordValid(user); m_component->onUserPresenceReceived.disconnect(bind(&UserManager::handlePresence, this, _1)); // #if HAVE_SWIFTEN_3 -// dynamic_cast(m_component->getFrontend())->finishSession(user, boost::shared_ptr(new Swift::StreamError()), true); +// dynamic_cast(m_component->getFrontend())->finishSession(user, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::StreamError()), true); // #else -// dynamic_cast(m_component->getFrontend())->finishSession(user, boost::shared_ptr(new Swift::StreamError()), true); +// dynamic_cast(m_component->getFrontend())->finishSession(user, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::StreamError()), true); // #endif m_component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1)); } diff --git a/libtransport/UsersReconnecter.cpp b/libtransport/UsersReconnecter.cpp index ca562363..6c114126 100644 --- a/libtransport/UsersReconnecter.cpp +++ b/libtransport/UsersReconnecter.cpp @@ -30,7 +30,6 @@ #include "Swiften/Network/NetworkFactories.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -44,11 +43,11 @@ UsersReconnecter::UsersReconnecter(Component *component, StorageBackend *storage m_nextUserTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(1000); m_nextUserTimer->onTick.connect(boost::bind(&UsersReconnecter::reconnectNextUser, this)); - m_component->onConnected.connect(bind(&UsersReconnecter::handleConnected, this)); + m_component->onConnected.connect(boost::bind(&UsersReconnecter::handleConnected, this)); } UsersReconnecter::~UsersReconnecter() { - m_component->onConnected.disconnect(bind(&UsersReconnecter::handleConnected, this)); + m_component->onConnected.disconnect(boost::bind(&UsersReconnecter::handleConnected, this)); m_nextUserTimer->stop(); m_nextUserTimer->onTick.disconnect(boost::bind(&UsersReconnecter::reconnectNextUser, this)); } diff --git a/libtransport/Util.cpp b/libtransport/Util.cpp index b5e83a16..5aa76866 100644 --- a/libtransport/Util.cpp +++ b/libtransport/Util.cpp @@ -43,8 +43,6 @@ using namespace boost::filesystem; -using namespace boost; - namespace Transport { namespace Util { diff --git a/libtransport/WebSocketClient.cpp b/libtransport/WebSocketClient.cpp index ec2ae055..d257ac05 100644 --- a/libtransport/WebSocketClient.cpp +++ b/libtransport/WebSocketClient.cpp @@ -129,7 +129,7 @@ void WebSocketClient::write(const std::string &data) { LOG4CXX_INFO(logger, m_user << ": > " << data); } -void WebSocketClient::handleDataRead(boost::shared_ptr data) { +void WebSocketClient::handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { std::string d = Swift::safeByteArrayToString(*data); m_buffer += d; diff --git a/spectrum/src/frontends/slack/SlackFrontend.cpp b/spectrum/src/frontends/slack/SlackFrontend.cpp index 96fcae3c..58946450 100644 --- a/spectrum/src/frontends/slack/SlackFrontend.cpp +++ b/spectrum/src/frontends/slack/SlackFrontend.cpp @@ -80,14 +80,14 @@ void SlackFrontend::sendVCard(Swift::VCard::ref vcard, Swift::JID to) { void SlackFrontend::sendRosterRequest(Swift::RosterPayload::ref payload, Swift::JID to) { } -void SlackFrontend::sendMessage(boost::shared_ptr message) { +void SlackFrontend::sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) { return static_cast(m_userManager)->sendMessage(message); } -void SlackFrontend::sendIQ(boost::shared_ptr iq) { +void SlackFrontend::sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { } -boost::shared_ptr SlackFrontend::sendCapabilitiesRequest(Swift::JID to) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr SlackFrontend::sendCapabilitiesRequest(Swift::JID to) { return Swift::DiscoInfo::ref(); } diff --git a/spectrum/src/frontends/slack/SlackFrontend.h b/spectrum/src/frontends/slack/SlackFrontend.h index 622047a2..0f563e23 100644 --- a/spectrum/src/frontends/slack/SlackFrontend.h +++ b/spectrum/src/frontends/slack/SlackFrontend.h @@ -53,23 +53,23 @@ namespace Transport { virtual void sendRosterRequest(Swift::RosterPayload::ref, Swift::JID to); - virtual void sendMessage(boost::shared_ptr message); + virtual void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); - virtual void sendIQ(boost::shared_ptr); + virtual void sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); virtual void reconnectUser(const std::string &user); virtual RosterManager *createRosterManager(User *user, Component *component); virtual User *createUser(const Swift::JID &jid, UserInfo &userInfo, Component *component, UserManager *userManager); virtual UserManager *createUserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend = NULL); - virtual boost::shared_ptr sendCapabilitiesRequest(Swift::JID to); + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr sendCapabilitiesRequest(Swift::JID to); virtual void clearRoomList(); virtual void addRoomToRoomList(const std::string &handle, const std::string &name); virtual std::string setOAuth2Code(const std::string &code, const std::string &state); virtual std::string getOAuth2URL(const std::vector &args); virtual std::string getRegistrationFields(); - void handleMessage(boost::shared_ptr message); + void handleMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); ThreadPool *getThreadPool() { return m_tp; diff --git a/spectrum/src/frontends/slack/SlackFrontendPlugin.cpp b/spectrum/src/frontends/slack/SlackFrontendPlugin.cpp index ba165ccb..d8c354e8 100644 --- a/spectrum/src/frontends/slack/SlackFrontendPlugin.cpp +++ b/spectrum/src/frontends/slack/SlackFrontendPlugin.cpp @@ -43,8 +43,8 @@ Frontend *SlackFrontendPlugin::createFrontend() { // SlackFrontendPlugin plugin; -boost::shared_ptr get_slack_frontend_plugin() { - return boost::make_shared(); +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr get_slack_frontend_plugin() { + return SWIFTEN_SHRPTR_NAMESPACE::make_shared(); } // BOOST_DLL_AUTO_ALIAS(plugin) diff --git a/spectrum/src/frontends/slack/SlackFrontendPlugin.h b/spectrum/src/frontends/slack/SlackFrontendPlugin.h index 66391a1a..816333e9 100644 --- a/spectrum/src/frontends/slack/SlackFrontendPlugin.h +++ b/spectrum/src/frontends/slack/SlackFrontendPlugin.h @@ -36,7 +36,7 @@ class SlackFrontendPlugin : public FrontendPlugin { Frontend *createFrontend(); }; -boost::shared_ptr get_slack_frontend_plugin(); +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr get_slack_frontend_plugin(); } diff --git a/spectrum/src/frontends/slack/SlackSession.cpp b/spectrum/src/frontends/slack/SlackSession.cpp index 9cafa908..0a7bbe04 100644 --- a/spectrum/src/frontends/slack/SlackSession.cpp +++ b/spectrum/src/frontends/slack/SlackSession.cpp @@ -118,7 +118,7 @@ void SlackSession::sendMessageToAll(const std::string &msg) { } } -void SlackSession::sendMessage(boost::shared_ptr message) { +void SlackSession::sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) { if (m_user) { std::map convs = m_user->getConversationManager()->getConversations(); for (std::map ::const_iterator it = convs.begin(); it != convs.end(); it++) { @@ -193,7 +193,7 @@ void SlackSession::handleJoinRoomCreated(const std::string &channelId, std::vect presence->setFrom(Swift::JID(m_uinfo.jid + "/default")); presence->setTo(Swift::JID(to + "/" + name)); presence->setType(Swift::Presence::Available); - presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::MUCPayload())); m_component->getFrontend()->onPresenceReceived(presence); m_onlineBuddiesTimer->start(); @@ -217,7 +217,7 @@ void SlackSession::handleSlackChannelCreated(const std::string &channelId) { presence->setFrom(Swift::JID(m_uinfo.jid + "/default")); presence->setTo(m_component->getJID()); presence->setType(Swift::Presence::Available); - presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::MUCPayload())); m_component->getFrontend()->onPresenceReceived(presence); } @@ -239,7 +239,7 @@ void SlackSession::leaveRoom(const std::string &channel_) { presence->setFrom(Swift::JID(m_uinfo.jid + "/default")); presence->setTo(Swift::JID(to + "/" + m_uinfo.uin)); presence->setType(Swift::Presence::Unavailable); - presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::MUCPayload())); m_component->getFrontend()->onPresenceReceived(presence); } @@ -250,7 +250,7 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std:: } if (!to.empty()) { - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setType(Swift::Message::Groupchat); msg->setTo(to); msg->setFrom(Swift::JID(m_uinfo.jid + "/default")); @@ -287,7 +287,7 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std:: continue; } - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setTo(b->getJID()); msg->setFrom(Swift::JID(m_uinfo.jid + "/default")); msg->setBody("<" + m_idManager->getName(user) + "> " + message); diff --git a/spectrum/src/frontends/slack/SlackSession.h b/spectrum/src/frontends/slack/SlackSession.h index d0643f83..b74b302c 100644 --- a/spectrum/src/frontends/slack/SlackSession.h +++ b/spectrum/src/frontends/slack/SlackSession.h @@ -29,6 +29,7 @@ #include "Swiften/Elements/Message.h" #include "Swiften/Network/Timer.h" +#include "Swiften/SwiftenCompat.h" #include @@ -50,7 +51,7 @@ class SlackSession { boost::signal onInstallationDone; - void sendMessage(boost::shared_ptr message); + void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); void sendMessageToAll(const std::string &msg); diff --git a/spectrum/src/frontends/slack/SlackUser.cpp b/spectrum/src/frontends/slack/SlackUser.cpp index 2fece77f..16fd1dc4 100644 --- a/spectrum/src/frontends/slack/SlackUser.cpp +++ b/spectrum/src/frontends/slack/SlackUser.cpp @@ -31,8 +31,6 @@ #include #include -using namespace boost; - namespace Transport { DEFINE_LOGGER(logger, "SlackUser"); diff --git a/spectrum/src/frontends/slack/SlackUserManager.cpp b/spectrum/src/frontends/slack/SlackUserManager.cpp index 533c649a..ca5c245d 100644 --- a/spectrum/src/frontends/slack/SlackUserManager.cpp +++ b/spectrum/src/frontends/slack/SlackUserManager.cpp @@ -232,7 +232,7 @@ void SlackUserManager::sendVCard(unsigned int id, Swift::VCard::ref vcard) { } -void SlackUserManager::sendMessage(boost::shared_ptr message) { +void SlackUserManager::sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) { User *user = getUser(message->getTo().toBare().toString()); if (!user) { LOG4CXX_ERROR(logger, "Received message for unknown user " << message->getTo().toBare().toString()); diff --git a/spectrum/src/frontends/slack/SlackUserManager.h b/spectrum/src/frontends/slack/SlackUserManager.h index c1cc579c..2724ca2b 100644 --- a/spectrum/src/frontends/slack/SlackUserManager.h +++ b/spectrum/src/frontends/slack/SlackUserManager.h @@ -57,7 +57,7 @@ class SlackUserManager : public UserManager { std::string getOAuth2URL(const std::vector &args); - void sendMessage(boost::shared_ptr message); + void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); SlackSession *moveTempSession(const std::string &user); void moveTempSession(const std::string &user, SlackSession *session); diff --git a/spectrum/src/frontends/xmpp/BlockPayload.h b/spectrum/src/frontends/xmpp/BlockPayload.h index 0a2aedeb..e074d980 100644 --- a/spectrum/src/frontends/xmpp/BlockPayload.h +++ b/spectrum/src/frontends/xmpp/BlockPayload.h @@ -12,12 +12,14 @@ #include +#include "Swiften/SwiftenCompat.h" + // This payload is NOT part of ANY XEP and it is only // libtransport related extension. namespace Transport { class BlockPayload : public Swift::Payload { public: - typedef boost::shared_ptr ref; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ref; public: BlockPayload(); diff --git a/spectrum/src/frontends/xmpp/BlockSerializer.cpp b/spectrum/src/frontends/xmpp/BlockSerializer.cpp index 8cbc02b7..6f02faec 100644 --- a/spectrum/src/frontends/xmpp/BlockSerializer.cpp +++ b/spectrum/src/frontends/xmpp/BlockSerializer.cpp @@ -19,7 +19,7 @@ namespace Transport { BlockSerializer::BlockSerializer() : Swift::GenericPayloadSerializer() { } -std::string BlockSerializer::serializePayload(boost::shared_ptr attention) const { +std::string BlockSerializer::serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr attention) const { Swift::XMLElement attentionElement("block", "urn:xmpp:block:0"); return attentionElement.serialize(); diff --git a/spectrum/src/frontends/xmpp/BlockSerializer.h b/spectrum/src/frontends/xmpp/BlockSerializer.h index 928e6e1a..da306b2f 100644 --- a/spectrum/src/frontends/xmpp/BlockSerializer.h +++ b/spectrum/src/frontends/xmpp/BlockSerializer.h @@ -9,6 +9,8 @@ #include #include +#include "Swiften/SwiftenCompat.h" + // This payload is NOT part of ANY XEP and it is only // libtransport related extension. namespace Transport { @@ -16,6 +18,6 @@ namespace Transport { public: BlockSerializer(); - virtual std::string serializePayload(boost::shared_ptr) const; + virtual std::string serializePayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr) const; }; } diff --git a/spectrum/src/frontends/xmpp/RosterResponder.h b/spectrum/src/frontends/xmpp/RosterResponder.h index f17a7822..27b6bf8c 100644 --- a/spectrum/src/frontends/xmpp/RosterResponder.h +++ b/spectrum/src/frontends/xmpp/RosterResponder.h @@ -23,6 +23,7 @@ #include #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/RosterPayload.h" +#include "Swiften/SwiftenCompat.h" #include @@ -43,8 +44,8 @@ class RosterResponder : public Swift::Responder { boost::signal onBuddyAdded; private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); UserManager *m_userManager; Swift::IQRouter *m_router; }; diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp index f4f7fcc1..3639925a 100644 --- a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp +++ b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp @@ -66,7 +66,6 @@ #include "Swiften/Elements/InBandRegistrationPayload.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -113,7 +112,7 @@ void XMPPFrontend::init(Component *transport, Swift::EventLoop *loop, Swift::Net LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert")); LOG4CXX_INFO(logger, "SSLv23_server_method used."); TLSServerContextFactory *f = new OpenSSLServerContextFactory(); - CertificateWithKey::ref certificate = boost::make_shared(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))); + CertificateWithKey::ref certificate = SWIFTEN_SHRPTR_NAMESPACE::make_shared(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))); m_server->addTLSEncryption(f, certificate); #endif #endif @@ -145,7 +144,7 @@ void XMPPFrontend::init(Component *transport, Swift::EventLoop *loop, Swift::Net m_component = new Swift::Component(loop, factories, m_jid, CONFIG_STRING(m_config, "service.password")); #endif m_component->setSoftwareVersion("Spectrum", SPECTRUM_VERSION); - m_component->onConnected.connect(bind(&XMPPFrontend::handleConnected, this)); + m_component->onConnected.connect(boost::bind(&XMPPFrontend::handleConnected, this)); m_component->onError.connect(boost::bind(&XMPPFrontend::handleConnectionError, this, _1)); m_component->onDataRead.connect(boost::bind(&XMPPFrontend::handleDataRead, this, _1)); m_component->onDataWritten.connect(boost::bind(&XMPPFrontend::handleDataWritten, this, _1)); @@ -201,7 +200,7 @@ void XMPPFrontend::handleGeneralPresence(Swift::Presence::ref presence) { onPresenceReceived(presence); } -void XMPPFrontend::handleMessage(boost::shared_ptr message) { +void XMPPFrontend::handleMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) { onMessageReceived(message); } @@ -216,14 +215,14 @@ void XMPPFrontend::addRoomToRoomList(const std::string &handle, const std::strin void XMPPFrontend::sendPresence(Swift::Presence::ref presence) { if (!presence->getFrom().getNode().empty()) { - presence->addPayload(boost::shared_ptr(new Swift::CapsInfo(static_cast(m_userManager)->getDiscoItemsResponder()->getBuddyCapsInfo()))); + presence->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::CapsInfo(static_cast(m_userManager)->getDiscoItemsResponder()->getBuddyCapsInfo()))); } m_stanzaChannel->sendPresence(presence); } void XMPPFrontend::sendVCard(Swift::VCard::ref vcard, Swift::JID to) { - boost::shared_ptr > request(new Swift::GenericRequest(Swift::IQ::Result, to, vcard, m_iqRouter)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr > request(new Swift::GenericRequest(Swift::IQ::Result, to, vcard, m_iqRouter)); request->send(); } @@ -232,15 +231,15 @@ void XMPPFrontend::sendRosterRequest(Swift::RosterPayload::ref payload, Swift::J request->send(); } -void XMPPFrontend::sendMessage(boost::shared_ptr message) { +void XMPPFrontend::sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message) { m_stanzaChannel->sendMessage(message); } -void XMPPFrontend::sendIQ(boost::shared_ptr iq) { +void XMPPFrontend::sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { m_iqRouter->sendIQ(iq); } -boost::shared_ptr XMPPFrontend::sendCapabilitiesRequest(Swift::JID to) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr XMPPFrontend::sendCapabilitiesRequest(Swift::JID to) { Swift::DiscoInfo::ref caps = m_entityCapsManager->getCaps(to); if (caps != Swift::DiscoInfo::ref()) { onCapabilitiesReceived(to, caps); @@ -291,7 +290,7 @@ UserManager *XMPPFrontend::createUserManager(Component *component, UserRegistry return m_userManager; } -bool XMPPFrontend::handleIQ(boost::shared_ptr iq) { +bool XMPPFrontend::handleIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { if (!m_rawXML) { return false; } @@ -334,8 +333,8 @@ void XMPPFrontend::connectToServer() { //Type casting to BoostConnectionServer since onStopped signal is not defined in ConnectionServer //Ideally, onStopped must be defined in ConnectionServer - if (boost::dynamic_pointer_cast(m_server->getConnectionServer())) { - boost::dynamic_pointer_cast(m_server->getConnectionServer())->onStopped.connect(boost::bind(&XMPPFrontend::handleServerStopped, this, _1)); + if (SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(m_server->getConnectionServer())) { + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(m_server->getConnectionServer())->onStopped.connect(boost::bind(&XMPPFrontend::handleServerStopped, this, _1)); } // We're connected right here, because we're in server mode... @@ -398,7 +397,7 @@ void XMPPFrontend::handleDataWritten(const Swift::SafeByteArray &data) { m_transport->handleDataWritten(d); } -void XMPPFrontend::handleDiscoInfoResponse(boost::shared_ptr info, Swift::ErrorPayload::ref error, const Swift::JID& jid) { +void XMPPFrontend::handleDiscoInfoResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info, Swift::ErrorPayload::ref error, const Swift::JID& jid) { #ifdef SUPPORT_LEGACY_CAPS onCapabilitiesReceived(jid, info); #endif diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.h b/spectrum/src/frontends/xmpp/XMPPFrontend.h index 27daf7cf..ba90641a 100644 --- a/spectrum/src/frontends/xmpp/XMPPFrontend.h +++ b/spectrum/src/frontends/xmpp/XMPPFrontend.h @@ -67,20 +67,20 @@ namespace Transport { virtual void sendRosterRequest(Swift::RosterPayload::ref, Swift::JID to); - virtual void sendMessage(boost::shared_ptr message); + virtual void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); - virtual void sendIQ(boost::shared_ptr); + virtual void sendIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); virtual void reconnectUser(const std::string &user); virtual RosterManager *createRosterManager(User *user, Component *component); virtual User *createUser(const Swift::JID &jid, UserInfo &userInfo, Component *component, UserManager *userManager); virtual UserManager *createUserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend = NULL); - virtual boost::shared_ptr sendCapabilitiesRequest(Swift::JID to); + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr sendCapabilitiesRequest(Swift::JID to); virtual void clearRoomList(); virtual void addRoomToRoomList(const std::string &handle, const std::string &name); - void handleMessage(boost::shared_ptr message); + void handleMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr message); Swift::StanzaChannel *getStanzaChannel(); @@ -104,11 +104,11 @@ namespace Transport { void handleDataRead(const Swift::SafeByteArray &data); void handleDataWritten(const Swift::SafeByteArray &data); - void handleDiscoInfoResponse(boost::shared_ptr info, Swift::ErrorPayload::ref error, const Swift::JID& jid); + void handleDiscoInfoResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info, Swift::ErrorPayload::ref error, const Swift::JID& jid); void handleCapsChanged(const Swift::JID& jid); void handleBackendConfigChanged(); - bool handleIQ(boost::shared_ptr); + bool handleIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr); Swift::NetworkFactories *m_factories; Swift::Component *m_component; diff --git a/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.cpp b/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.cpp index cb0c86a8..30a53cff 100644 --- a/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.cpp +++ b/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.cpp @@ -43,8 +43,8 @@ Frontend *XMPPFrontendPlugin::createFrontend() { // XMPPFrontendPlugin plugin; -boost::shared_ptr get_xmpp_frontend_plugin() { - return boost::make_shared(); +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr get_xmpp_frontend_plugin() { + return SWIFTEN_SHRPTR_NAMESPACE::make_shared(); } // BOOST_DLL_AUTO_ALIAS(plugin) diff --git a/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.h b/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.h index fc0a89b7..db895cfd 100644 --- a/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.h +++ b/spectrum/src/frontends/xmpp/XMPPFrontendPlugin.h @@ -36,7 +36,7 @@ class XMPPFrontendPlugin : public FrontendPlugin { Frontend *createFrontend(); }; -boost::shared_ptr get_xmpp_frontend_plugin(); +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr get_xmpp_frontend_plugin(); } diff --git a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp index 6bc733bd..6f39115c 100644 --- a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp +++ b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp @@ -194,7 +194,7 @@ void XMPPRosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref e request->onResponse.disconnect_all_slots(); } -void XMPPRosterManager::handleRemoteRosterResponse(boost::shared_ptr payload, Swift::ErrorPayload::ref error) { +void XMPPRosterManager::handleRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload, Swift::ErrorPayload::ref error) { m_remoteRosterRequest.reset(); if (error) { m_supportRemoteRoster = false; @@ -277,7 +277,7 @@ void XMPPRosterManager::sendRIE() { BOOST_FOREACH(Swift::JID &jid, jidWithRIE) { LOG4CXX_INFO(logger, "Sending RIE stanza to " << jid.toString()); - boost::shared_ptr > request(new Swift::GenericRequest(Swift::IQ::Set, jid, payload, static_cast(m_component->getFrontend())->getIQRouter())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr > request(new Swift::GenericRequest(Swift::IQ::Set, jid, payload, static_cast(m_component->getFrontend())->getIQRouter())); request->send(); } } diff --git a/spectrum/src/frontends/xmpp/XMPPRosterManager.h b/spectrum/src/frontends/xmpp/XMPPRosterManager.h index 7842b0b0..34cc23e0 100644 --- a/spectrum/src/frontends/xmpp/XMPPRosterManager.h +++ b/spectrum/src/frontends/xmpp/XMPPRosterManager.h @@ -32,6 +32,7 @@ #include "Swiften/Roster/SetRosterRequest.h" #include "Swiften/Elements/Presence.h" #include "Swiften/Network/Timer.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -44,10 +45,10 @@ class RosterStorage; // TODO: Once Swiften GetRosterRequest will support setting to="", this can be removed class AddressedRosterRequest : public Swift::GenericRequest { public: - typedef boost::shared_ptr ref; + typedef SWIFTEN_SHRPTR_NAMESPACE::shared_ptr ref; AddressedRosterRequest(Swift::IQRouter* router, Swift::JID to) : - Swift::GenericRequest(Swift::IQ::Get, to, boost::shared_ptr(new Swift::RosterPayload()), router) { + Swift::GenericRequest(Swift::IQ::Get, to, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::RosterPayload()), router) { } }; @@ -82,7 +83,7 @@ class XMPPRosterManager : public RosterManager { private: void sendRIE(); void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key); - void handleRemoteRosterResponse(boost::shared_ptr roster, Swift::ErrorPayload::ref error); + void handleRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr roster, Swift::ErrorPayload::ref error); Component *m_component; RosterStorage *m_rosterStorage; diff --git a/spectrum/src/frontends/xmpp/XMPPUser.cpp b/spectrum/src/frontends/xmpp/XMPPUser.cpp index 45a0e4e6..2f26b73f 100644 --- a/spectrum/src/frontends/xmpp/XMPPUser.cpp +++ b/spectrum/src/frontends/xmpp/XMPPUser.cpp @@ -31,8 +31,6 @@ #include #include -using namespace boost; - #define foreach BOOST_FOREACH namespace Transport { @@ -45,15 +43,15 @@ XMPPUser::XMPPUser(const Swift::JID &jid, UserInfo &userInfo, Component *compone m_component = component; m_userManager = userManager; m_userInfo = userInfo; - m_rooms = boost::shared_ptr(new Swift::DiscoItems()); + m_rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::DiscoItems()); } XMPPUser::~XMPPUser(){ if (m_component->inServerMode()) { #if HAVE_SWIFTEN_3 - dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr()); + dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); #else - dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr()); + dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); #endif } @@ -77,14 +75,14 @@ void XMPPUser::disconnectUser(const std::string &error, Swift::SpectrumErrorPayl // in finishSession(...) call and if not, remove it here. std::string jid = m_jid.toBare().toString(); #if HAVE_SWIFTEN_3 - dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error))); + dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error))); #else - dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error))); + dynamic_cast(static_cast(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error))); #endif } } -void XMPPUser::handleVCardReceived(boost::shared_ptr vcard, Swift::ErrorPayload::ref error, Swift::GetVCardRequest::ref request) { +void XMPPUser::handleVCardReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard, Swift::ErrorPayload::ref error, Swift::GetVCardRequest::ref request) { m_vcardRequests.remove(request); request->onResponse.disconnect_all_slots(); m_component->getFrontend()->onVCardUpdated(this, vcard); @@ -100,7 +98,7 @@ void XMPPUser::requestVCard() { } void XMPPUser::clearRoomList() { - m_rooms = boost::shared_ptr(new Swift::DiscoItems()); + m_rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::DiscoItems()); } void XMPPUser::addRoomToRoomList(const std::string &handle, const std::string &name) { diff --git a/spectrum/src/frontends/xmpp/XMPPUser.h b/spectrum/src/frontends/xmpp/XMPPUser.h index ca76afde..c5063225 100644 --- a/spectrum/src/frontends/xmpp/XMPPUser.h +++ b/spectrum/src/frontends/xmpp/XMPPUser.h @@ -62,20 +62,20 @@ class XMPPUser : public User { void addRoomToRoomList(const std::string &handle, const std::string &name); - boost::shared_ptr getRoomList() { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr getRoomList() { return m_rooms; } private: void onConnectingTimeout(); - void handleVCardReceived(boost::shared_ptr vcard, Swift::ErrorPayload::ref error, Swift::GetVCardRequest::ref request); + void handleVCardReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard, Swift::ErrorPayload::ref error, Swift::GetVCardRequest::ref request); Swift::JID m_jid; Component *m_component; UserManager *m_userManager; UserInfo m_userInfo; std::list m_vcardRequests; - boost::shared_ptr m_rooms; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_rooms; }; } diff --git a/spectrum/src/frontends/xmpp/XMPPUserManager.cpp b/spectrum/src/frontends/xmpp/XMPPUserManager.cpp index a9c85133..b49a4c02 100644 --- a/spectrum/src/frontends/xmpp/XMPPUserManager.cpp +++ b/spectrum/src/frontends/xmpp/XMPPUserManager.cpp @@ -130,7 +130,7 @@ void XMPPUserManager::handleVCardRequired(User *user, const std::string &name, u m_component->getFrontend()->onVCardRequired(user, name, id); } -void XMPPUserManager::handleVCardUpdated(User *user, boost::shared_ptr vcard) { +void XMPPUserManager::handleVCardUpdated(User *user, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard) { m_component->getFrontend()->onVCardUpdated(user, vcard); } diff --git a/spectrum/src/frontends/xmpp/XMPPUserManager.h b/spectrum/src/frontends/xmpp/XMPPUserManager.h index 315e9e1f..933f5b3a 100644 --- a/spectrum/src/frontends/xmpp/XMPPUserManager.h +++ b/spectrum/src/frontends/xmpp/XMPPUserManager.h @@ -58,7 +58,7 @@ class XMPPUserManager : public UserManager { private: void handleVCardRequired(User *, const std::string &name, unsigned int id); - void handleVCardUpdated(User *, boost::shared_ptr vcard); + void handleVCardUpdated(User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard); StorageResponder *m_storageResponder; VCardResponder *m_vcardResponder; diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp b/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp index 2c08fd8a..31dd8302 100644 --- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp +++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp @@ -78,7 +78,7 @@ bool XMPPUserRegistration::doUserUnregistration(const UserInfo &row) { return true; } -void XMPPUserRegistration::handleRegisterRemoteRosterResponse(boost::shared_ptr payload, Swift::ErrorPayload::ref remoteRosterNotSupported, const UserInfo &row){ +void XMPPUserRegistration::handleRegisterRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload, Swift::ErrorPayload::ref remoteRosterNotSupported, const UserInfo &row){ if (remoteRosterNotSupported || !payload) { // Remote roster is not support, so send normal Subscribe presence to add transport. Swift::Presence::ref response = Swift::Presence::create(); @@ -103,7 +103,7 @@ void XMPPUserRegistration::handleRegisterRemoteRosterResponse(boost::shared_ptr< // If the JID for registration notification is configured, send the notification message. std::vector const &x = CONFIG_VECTOR(m_component->getConfig(),"registration.notify_jid"); BOOST_FOREACH(const std::string ¬ify_jid, x) { - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody(std::string("registered: ") + row.jid); msg->setTo(notify_jid); msg->setFrom(m_component->getJID()); @@ -111,7 +111,7 @@ void XMPPUserRegistration::handleRegisterRemoteRosterResponse(boost::shared_ptr< } } -void XMPPUserRegistration::handleUnregisterRemoteRosterResponse(boost::shared_ptr payload, Swift::ErrorPayload::ref remoteRosterNotSupported, const UserInfo &userInfo) { +void XMPPUserRegistration::handleUnregisterRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload, Swift::ErrorPayload::ref remoteRosterNotSupported, const UserInfo &userInfo) { if (remoteRosterNotSupported || !payload) { // Remote roster is ont support, so get the buddies from database // and send Unsubsribe and Unsubscribed presence to them. @@ -196,7 +196,7 @@ void XMPPUserRegistration::handleUnregisterRemoteRosterResponse(boost::shared_pt // If the JID for registration notification is configured, send the notification message. std::vector const &x = CONFIG_VECTOR(m_component->getConfig(),"registration.notify_jid"); BOOST_FOREACH(const std::string ¬ify_jid, x) { - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody(std::string("unregistered: ") + userInfo.jid); msg->setTo(notify_jid); msg->setFrom(m_component->getJID()); @@ -236,8 +236,8 @@ Form::ref XMPPUserRegistration::generateRegistrationForm(const UserInfo &res, bo return form; } -boost::shared_ptr XMPPUserRegistration::generateInBandRegistrationPayload(const Swift::JID& from) { - boost::shared_ptr reg(new InBandRegistrationPayload()); +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr XMPPUserRegistration::generateInBandRegistrationPayload(const Swift::JID& from) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr reg(new InBandRegistrationPayload()); UserInfo res; bool registered = m_storageBackend->getUser(from.toBare().toString(), res); @@ -256,7 +256,7 @@ boost::shared_ptr XMPPUserRegistration::generateInBan return reg; } -bool XMPPUserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool XMPPUserRegistration::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { // TODO: backend should say itself if registration is needed or not... if (CONFIG_STRING(m_config, "service.protocol") == "irc") { sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify); @@ -272,13 +272,13 @@ bool XMPPUserRegistration::handleGetRequest(const Swift::JID& from, const Swift: } } - boost::shared_ptr reg = generateInBandRegistrationPayload(from); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr reg = generateInBandRegistrationPayload(from); sendResponse(from, id, reg); return true; } -bool XMPPUserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool XMPPUserRegistration::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { // TODO: backend should say itself if registration is needed or not... if (CONFIG_STRING(m_config, "service.protocol") == "irc") { sendError(from, id, ErrorPayload::BadRequest, ErrorPayload::Modify); diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h index cd1dc8bd..87b879fd 100644 --- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h +++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h @@ -23,6 +23,8 @@ #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/InBandRegistrationPayload.h" #include "Swiften/Elements/RosterPayload.h" +#include "Swiften/SwiftenCompat.h" + #include #include #include "transport/UserRegistration.h" @@ -60,12 +62,12 @@ class XMPPUserRegistration : public UserRegistration, public Swift::Responder payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); - void handleRegisterRemoteRosterResponse(boost::shared_ptr payload, Swift::ErrorPayload::ref error, const UserInfo &row); - void handleUnregisterRemoteRosterResponse(boost::shared_ptr payload, Swift::ErrorPayload::ref error, const UserInfo &row); - boost::shared_ptr generateInBandRegistrationPayload(const Swift::JID& from); + void handleRegisterRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload, Swift::ErrorPayload::ref error, const UserInfo &row); + void handleUnregisterRemoteRosterResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload, Swift::ErrorPayload::ref error, const UserInfo &row); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr generateInBandRegistrationPayload(const Swift::JID& from); Swift::Form::ref generateRegistrationForm(const UserInfo &res, bool registered); Component *m_component; diff --git a/spectrum/src/frontends/xmpp/adhoccommand.h b/spectrum/src/frontends/xmpp/adhoccommand.h index e1563bf6..a12b6d02 100644 --- a/spectrum/src/frontends/xmpp/adhoccommand.h +++ b/spectrum/src/frontends/xmpp/adhoccommand.h @@ -27,6 +27,7 @@ #include "Swiften/Elements/FormField.h" #include "Swiften/Elements/Command.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -44,7 +45,7 @@ class AdHocCommand { /// Destructor. virtual ~AdHocCommand(); - virtual boost::shared_ptr handleRequest(boost::shared_ptr payload) = 0; + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr handleRequest(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) = 0; const std::string &getId() { return m_id; diff --git a/spectrum/src/frontends/xmpp/adhocmanager.cpp b/spectrum/src/frontends/xmpp/adhocmanager.cpp index 6b43bc8f..e35a18cf 100644 --- a/spectrum/src/frontends/xmpp/adhocmanager.cpp +++ b/spectrum/src/frontends/xmpp/adhocmanager.cpp @@ -128,11 +128,11 @@ void AdHocManager::removeOldSessions() { } } -bool AdHocManager::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool AdHocManager::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { return false; } -bool AdHocManager::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool AdHocManager::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { AdHocCommand *command = NULL; // Try to find AdHocCommand according to 'from' and session_id if (!payload->getSessionID().empty() && m_sessions.find(from) != m_sessions.end()) { @@ -163,7 +163,7 @@ bool AdHocManager::handleSetRequest(const Swift::JID& from, const Swift::JID& to return true; } - boost::shared_ptr response = command->handleRequest(payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response = command->handleRequest(payload); if (!response) { LOG4CXX_ERROR(logger, from.toString() << ": handleRequest for node " << payload->getNode() << " returned NULL pointer"); sendError(from, id, Swift::ErrorPayload::BadRequest, Swift::ErrorPayload::Modify); diff --git a/spectrum/src/frontends/xmpp/adhocmanager.h b/spectrum/src/frontends/xmpp/adhocmanager.h index b8f77f87..1031757c 100644 --- a/spectrum/src/frontends/xmpp/adhocmanager.h +++ b/spectrum/src/frontends/xmpp/adhocmanager.h @@ -27,6 +27,7 @@ #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/Command.h" #include "Swiften/Network/Timer.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -67,8 +68,8 @@ class AdHocManager : public Swift::Responder { private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); void handleUserCreated(User *user); diff --git a/spectrum/src/frontends/xmpp/blockresponder.cpp b/spectrum/src/frontends/xmpp/blockresponder.cpp index 2d814775..be576972 100644 --- a/spectrum/src/frontends/xmpp/blockresponder.cpp +++ b/spectrum/src/frontends/xmpp/blockresponder.cpp @@ -31,7 +31,6 @@ #include "transport/Logging.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -45,7 +44,7 @@ BlockResponder::~BlockResponder() { } -bool BlockResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr info) { +bool BlockResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info) { User *user = m_userManager->getUser(from.toBare().toString()); if (!user) { LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in"); diff --git a/spectrum/src/frontends/xmpp/blockresponder.h b/spectrum/src/frontends/xmpp/blockresponder.h index aee38f66..f5e233a2 100644 --- a/spectrum/src/frontends/xmpp/blockresponder.h +++ b/spectrum/src/frontends/xmpp/blockresponder.h @@ -38,7 +38,7 @@ class BlockResponder : public Swift::SetResponder { boost::signal onBlockToggled; private: - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); UserManager *m_userManager; }; diff --git a/spectrum/src/frontends/xmpp/discoinforesponder.cpp b/spectrum/src/frontends/xmpp/discoinforesponder.cpp index 6acabf48..930bafdd 100644 --- a/spectrum/src/frontends/xmpp/discoinforesponder.cpp +++ b/spectrum/src/frontends/xmpp/discoinforesponder.cpp @@ -34,7 +34,6 @@ #include "XMPPUser.h" using namespace Swift; -using namespace boost; DEFINE_LOGGER(logger, "DiscoInfoResponder"); @@ -48,7 +47,7 @@ DiscoInfoResponder::DiscoInfoResponder(Swift::IQRouter *router, Config *config, CONFIG_STRING(m_config, "identity.category"), CONFIG_STRING(m_config, "identity.type"))); #if HAVE_SWIFTEN_3 - crypto = boost::shared_ptr(PlatformCryptoProvider::create()); + crypto = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(PlatformCryptoProvider::create()); #endif updateFeatures(); @@ -123,12 +122,12 @@ void DiscoInfoResponder::addAdHocCommand(const std::string &node, const std::str m_commands[node] = node; } -bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr info) { +bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info) { // disco#info for transport if (to.getNode().empty()) { // Adhoc command if (m_commands.find(info->getNode()) != m_commands.end()) { - boost::shared_ptr res(new DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr res(new DiscoInfo()); res->addFeature("http://jabber.org/protocol/commands"); res->addFeature("jabber:x:data"); res->addIdentity(DiscoInfo::Identity(m_commands[info->getNode()], "automation", "command-node")); @@ -136,7 +135,7 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J sendResponse(from, to, id, res); } else if (info->getNode() == "http://jabber.org/protocol/commands") { - boost::shared_ptr res(new DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr res(new DiscoInfo()); res->addIdentity(DiscoInfo::Identity("Commands", "automation", "command-list")); res->setNode(info->getNode()); sendResponse(from, to, id, res); @@ -147,7 +146,7 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J return true; } - boost::shared_ptr res(new DiscoInfo(m_transportInfo)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr res(new DiscoInfo(m_transportInfo)); res->setNode(info->getNode()); sendResponse(from, id, res); } @@ -156,7 +155,7 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J // disco#info for room if (m_rooms.find(to.toBare().toString()) != m_rooms.end()) { - boost::shared_ptr res(new DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr res(new DiscoInfo()); res->addIdentity(DiscoInfo::Identity(m_rooms[to.toBare().toString()], "conference", "text")); res->addFeature("http://jabber.org/protocol/muc"); res->setNode(info->getNode()); @@ -170,7 +169,7 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J BOOST_FOREACH(const DiscoItems::Item &item, user->getRoomList()->getItems()) { LOG4CXX_INFO(logger, "XXX " << item.getNode() << " " << to.toBare().toString()); if (item.getJID().toString() == to.toBare().toString()) { - boost::shared_ptr res(new DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr res(new DiscoInfo()); res->addIdentity(DiscoInfo::Identity(item.getName(), "conference", "text")); res->addFeature("http://jabber.org/protocol/muc"); res->setNode(info->getNode()); @@ -181,7 +180,7 @@ bool DiscoInfoResponder::handleGetRequest(const Swift::JID& from, const Swift::J } // disco#info for buddy - boost::shared_ptr res(new DiscoInfo(*m_buddyInfo)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr res(new DiscoInfo(*m_buddyInfo)); res->setNode(info->getNode()); sendResponse(from, to, id, res); return true; diff --git a/spectrum/src/frontends/xmpp/discoinforesponder.h b/spectrum/src/frontends/xmpp/discoinforesponder.h index 459d7440..5b296ae3 100644 --- a/spectrum/src/frontends/xmpp/discoinforesponder.h +++ b/spectrum/src/frontends/xmpp/discoinforesponder.h @@ -26,6 +26,7 @@ #include "Swiften/Queries/GetResponder.h" #include "Swiften/Elements/DiscoInfo.h" #include "Swiften/Elements/CapsInfo.h" +#include "Swiften/SwiftenCompat.h" #include #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) #if HAVE_SWIFTEN_3 @@ -59,7 +60,7 @@ class DiscoInfoResponder : public Swift::GetResponder { } private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); void updateFeatures(); Swift::DiscoInfo m_transportInfo; @@ -69,7 +70,7 @@ class DiscoInfoResponder : public Swift::GetResponder { std::map m_rooms; std::map m_commands; #if HAVE_SWIFTEN_3 - boost::shared_ptr crypto; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr crypto; #endif UserManager *m_userManager; }; diff --git a/spectrum/src/frontends/xmpp/discoitemsresponder.cpp b/spectrum/src/frontends/xmpp/discoitemsresponder.cpp index 97868099..90254f1b 100644 --- a/spectrum/src/frontends/xmpp/discoitemsresponder.cpp +++ b/spectrum/src/frontends/xmpp/discoitemsresponder.cpp @@ -33,7 +33,6 @@ #include "XMPPUser.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -41,10 +40,10 @@ DEFINE_LOGGER(logger, "DiscoItemsResponder"); DiscoItemsResponder::DiscoItemsResponder(Component *component, UserManager *userManager) : Swift::GetResponder(static_cast(component->getFrontend())->getIQRouter()) { m_component = component; - m_commands = boost::shared_ptr(new DiscoItems()); + m_commands = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new DiscoItems()); m_commands->setNode("http://jabber.org/protocol/commands"); - m_rooms = boost::shared_ptr(new DiscoItems()); + m_rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new DiscoItems()); m_discoInfoResponder = new DiscoInfoResponder(static_cast(component->getFrontend())->getIQRouter(), component->getConfig(), userManager); m_discoInfoResponder->start(); @@ -69,7 +68,7 @@ void DiscoItemsResponder::addRoom(const std::string &node, const std::string &na } void DiscoItemsResponder::clearRooms() { - m_rooms = boost::shared_ptr(new DiscoItems()); + m_rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new DiscoItems()); m_discoInfoResponder->clearRooms(); } @@ -78,7 +77,7 @@ Swift::CapsInfo &DiscoItemsResponder::getBuddyCapsInfo() { } -bool DiscoItemsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr info) { +bool DiscoItemsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info) { LOG4CXX_INFO(logger, "get request received with node " << info->getNode()); if (info->getNode() == "http://jabber.org/protocol/commands") { sendResponse(from, id, m_commands); @@ -90,7 +89,7 @@ bool DiscoItemsResponder::handleGetRequest(const Swift::JID& from, const Swift:: return true; } - boost::shared_ptr rooms = boost::shared_ptr(new DiscoItems()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new DiscoItems()); BOOST_FOREACH(const DiscoItems::Item &item, m_rooms->getItems()) { rooms->addItem(item); } @@ -101,7 +100,7 @@ bool DiscoItemsResponder::handleGetRequest(const Swift::JID& from, const Swift:: sendResponse(from, id, rooms); } else { - sendResponse(from, id, boost::shared_ptr(new DiscoItems())); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new DiscoItems())); } return true; } diff --git a/spectrum/src/frontends/xmpp/discoitemsresponder.h b/spectrum/src/frontends/xmpp/discoitemsresponder.h index cb828f3f..3967c715 100644 --- a/spectrum/src/frontends/xmpp/discoitemsresponder.h +++ b/spectrum/src/frontends/xmpp/discoitemsresponder.h @@ -24,6 +24,7 @@ #include "Swiften/Queries/GetResponder.h" #include "Swiften/Elements/DiscoItems.h" #include "Swiften/Elements/CapsInfo.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -46,12 +47,12 @@ class DiscoItemsResponder : public Swift::GetResponder { private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); private: Component *m_component; - boost::shared_ptr m_commands; - boost::shared_ptr m_rooms; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_commands; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_rooms; DiscoInfoResponder *m_discoInfoResponder; UserManager *m_userManager; }; diff --git a/spectrum/src/frontends/xmpp/formutils.cpp b/spectrum/src/frontends/xmpp/formutils.cpp index 913dce48..833d1508 100644 --- a/spectrum/src/frontends/xmpp/formutils.cpp +++ b/spectrum/src/frontends/xmpp/formutils.cpp @@ -21,6 +21,8 @@ #include "formutils.h" #include "adhoccommand.h" +#include "Swiften/SwiftenCompat.h" + #if HAVE_SWIFTEN_3 #include #endif @@ -38,7 +40,7 @@ HiddenFormField::ref #endif createHiddenField(const std::string &name, const std::string &value) { #if HAVE_SWIFTEN_3 - FormField::ref field = boost::make_shared(FormField::HiddenType, value); + FormField::ref field = SWIFTEN_SHRPTR_NAMESPACE::make_shared(FormField::HiddenType, value); #else HiddenFormField::ref field = HiddenFormField::create(); field->setValue(value); @@ -55,7 +57,7 @@ TextSingleFormField::ref #endif createTextSingleField(const std::string &name, const std::string &value, const std::string &label, bool required) { #if HAVE_SWIFTEN_3 - FormField::ref field = boost::make_shared(FormField::TextSingleType, value); + FormField::ref field = SWIFTEN_SHRPTR_NAMESPACE::make_shared(FormField::TextSingleType, value); #else TextSingleFormField::ref field = TextSingleFormField::create(); field->setValue(value); @@ -74,7 +76,7 @@ TextPrivateFormField::ref #endif createTextPrivateField(const std::string &name, const std::string &label, bool required) { #if HAVE_SWIFTEN_3 - FormField::ref field = boost::make_shared(FormField::TextPrivateType); + FormField::ref field = SWIFTEN_SHRPTR_NAMESPACE::make_shared(FormField::TextPrivateType); #else TextPrivateFormField::ref field = TextPrivateFormField::create(); #endif @@ -92,7 +94,7 @@ ListSingleFormField::ref #endif createListSingleField(const std::string &name, Swift::FormField::Option value, const std::string &label, const std::string &def, bool required) { #if HAVE_SWIFTEN_3 - FormField::ref field = boost::make_shared(FormField::ListSingleType); + FormField::ref field = SWIFTEN_SHRPTR_NAMESPACE::make_shared(FormField::ListSingleType); #else ListSingleFormField::ref field = ListSingleFormField::create(); #endif @@ -115,7 +117,7 @@ BooleanFormField::ref #endif createBooleanField(const std::string &name, const std::string &value, const std::string &label, bool required) { #if HAVE_SWIFTEN_3 - FormField::ref field = boost::make_shared(FormField::BooleanType, value); + FormField::ref field = SWIFTEN_SHRPTR_NAMESPACE::make_shared(FormField::BooleanType, value); #else BooleanFormField::ref field = BooleanFormField::create(); field->setValue(value == "1"); @@ -134,7 +136,7 @@ FixedFormField::ref #endif createTextFixedField(const std::string &value) { #if HAVE_SWIFTEN_3 - FormField::ref field = boost::make_shared(FormField::FixedType, value); + FormField::ref field = SWIFTEN_SHRPTR_NAMESPACE::make_shared(FormField::FixedType, value); #else FixedFormField::ref field = FixedFormField::create(value); #endif @@ -171,22 +173,22 @@ std::string fieldValue(Swift::FormField::ref field) { const std::vector values = field->getValues(); return values.empty() ? "" : values[0]; #else - TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast(field); + TextSingleFormField::ref textSingle = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(field); if (textSingle) { return textSingle->getValue(); } - TextPrivateFormField::ref textPrivate = boost::dynamic_pointer_cast(field); + TextPrivateFormField::ref textPrivate = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(field); if (textPrivate) { return textPrivate->getValue(); } - ListSingleFormField::ref listSingle = boost::dynamic_pointer_cast(field); + ListSingleFormField::ref listSingle = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(field); if (listSingle) { return listSingle->getValue(); } - BooleanFormField::ref boolean = boost::dynamic_pointer_cast(field); + BooleanFormField::ref boolean = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(field); if (boolean) { return boolean->getValue() ? "1" : "0"; } @@ -205,22 +207,22 @@ std::string fieldValue(Swift::Form::ref form, const std::string &key, const std: return values.empty() ? "" : values[0]; } #else - TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast(*it); + TextSingleFormField::ref textSingle = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(*it); if (textSingle && textSingle->getName() == key) { return textSingle->getValue(); } - TextPrivateFormField::ref textPrivate = boost::dynamic_pointer_cast(*it); + TextPrivateFormField::ref textPrivate = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(*it); if (textPrivate && textPrivate->getName() == key) { return textPrivate->getValue(); } - ListSingleFormField::ref listSingle = boost::dynamic_pointer_cast(*it); + ListSingleFormField::ref listSingle = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(*it); if (listSingle && listSingle->getName() == key) { return listSingle->getValue(); } - BooleanFormField::ref boolean = boost::dynamic_pointer_cast(*it); + BooleanFormField::ref boolean = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(*it); if (boolean && boolean->getName() == key) { return boolean->getValue() ? "1" : "0"; } diff --git a/spectrum/src/frontends/xmpp/gatewayresponder.cpp b/spectrum/src/frontends/xmpp/gatewayresponder.cpp index d42f828c..a9668f18 100644 --- a/spectrum/src/frontends/xmpp/gatewayresponder.cpp +++ b/spectrum/src/frontends/xmpp/gatewayresponder.cpp @@ -31,7 +31,6 @@ #include "transport/Config.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -44,14 +43,14 @@ GatewayResponder::GatewayResponder(Swift::IQRouter *router, UserManager *userMan GatewayResponder::~GatewayResponder() { } -bool GatewayResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool GatewayResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { std::string prompt = CONFIG_STRING(m_userManager->getComponent()->getConfig(), "gateway_responder.prompt"); std::string label = CONFIG_STRING(m_userManager->getComponent()->getConfig(), "gateway_responder.label"); - sendResponse(from, id, boost::shared_ptr(new GatewayPayload(Swift::JID(), label, prompt))); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new GatewayPayload(Swift::JID(), label, prompt))); return true; } -bool GatewayResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool GatewayResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { std::string prompt = payload->getPrompt(); std::string escaped = Swift::JID::getEscapedNode(prompt); @@ -70,7 +69,7 @@ bool GatewayResponder::handleSetRequest(const Swift::JID& from, const Swift::JID std::string jid = escaped + "@" + m_userManager->getComponent()->getJID().toBare().toString(); - sendResponse(from, id, boost::shared_ptr(new GatewayPayload(jid))); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new GatewayPayload(jid))); return true; } diff --git a/spectrum/src/frontends/xmpp/gatewayresponder.h b/spectrum/src/frontends/xmpp/gatewayresponder.h index 59b765ea..2a3ff185 100644 --- a/spectrum/src/frontends/xmpp/gatewayresponder.h +++ b/spectrum/src/frontends/xmpp/gatewayresponder.h @@ -23,6 +23,7 @@ #include #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/GatewayPayload.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -34,8 +35,8 @@ class GatewayResponder : public Swift::Responder { ~GatewayResponder(); private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); UserManager *m_userManager; }; diff --git a/spectrum/src/frontends/xmpp/rosterresponder.cpp b/spectrum/src/frontends/xmpp/rosterresponder.cpp index b0b75fe0..b0e8b35a 100644 --- a/spectrum/src/frontends/xmpp/rosterresponder.cpp +++ b/spectrum/src/frontends/xmpp/rosterresponder.cpp @@ -34,7 +34,6 @@ #include "transport/Frontend.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -48,12 +47,12 @@ RosterResponder::RosterResponder(Swift::IQRouter *router, UserManager *userManag RosterResponder::~RosterResponder() { } -bool RosterResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool RosterResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { // Get means we're in server mode and user wants to fetch his roster. // For now we send empty reponse, but TODO: Get buddies from database and send proper stored roster. User *user = m_userManager->getUser(from.toBare().toString()); if (!user) { - sendResponse(from, id, boost::shared_ptr(new RosterPayload())); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new RosterPayload())); LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in"); return true; } @@ -62,8 +61,8 @@ bool RosterResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& return true; } -bool RosterResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { - sendResponse(from, id, boost::shared_ptr(new RosterPayload())); +bool RosterResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new RosterPayload())); User *user = m_userManager->getUser(from.toBare().toString()); if (!user) { diff --git a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp index 5fdcff50..cb96b088 100644 --- a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp +++ b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp @@ -39,10 +39,10 @@ SettingsAdHocCommand::SettingsAdHocCommand(Component *component, UserManager *us SettingsAdHocCommand::~SettingsAdHocCommand() { } -boost::shared_ptr SettingsAdHocCommand::getForm() { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr SettingsAdHocCommand::getForm() { if (!m_storageBackend) { - boost::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Completed)); - boost::shared_ptr form(new Swift::Form()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Completed)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr form(new Swift::Form()); FormUtils::addTextFixedField(form, "This server does not support transport settings. There is no storage backend configured"); response->setForm(form); return response; @@ -50,15 +50,15 @@ boost::shared_ptr SettingsAdHocCommand::getForm() { UserInfo user; if (m_storageBackend->getUser(m_initiator.toBare().toString(), user) == false) { - boost::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Completed)); - boost::shared_ptr form(new Swift::Form()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Completed)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr form(new Swift::Form()); FormUtils::addTextFixedField(form, "You are not registered."); response->setForm(form); return response; } - boost::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Executing)); - boost::shared_ptr form(new Swift::Form()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Executing)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr form(new Swift::Form()); std::string value; int type = (int) TYPE_BOOLEAN; @@ -88,7 +88,7 @@ void SettingsAdHocCommand::updateUserSetting(Swift::Form::ref form, UserInfo &us m_storageBackend->updateUserSetting(user.id, name, value); } -boost::shared_ptr SettingsAdHocCommand::handleResponse(boost::shared_ptr payload) { +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr SettingsAdHocCommand::handleResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { UserInfo user; bool registered = m_storageBackend->getUser(m_initiator.toBare().toString(), user); @@ -98,14 +98,14 @@ boost::shared_ptr SettingsAdHocCommand::handleResponse(boost::sh updateUserSetting(payload->getForm(), user, "stay_connected"); } - boost::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Completed)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response(new Swift::Command("settings", m_id, Swift::Command::Completed)); return response; } -boost::shared_ptr SettingsAdHocCommand::handleRequest(boost::shared_ptr payload) { - boost::shared_ptr response; +SWIFTEN_SHRPTR_NAMESPACE::shared_ptr SettingsAdHocCommand::handleRequest(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response; if (payload->getAction() == Swift::Command::Cancel) { - response = boost::shared_ptr(new Swift::Command("settings", m_id, Swift::Command::Canceled)); + response = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings", m_id, Swift::Command::Canceled)); return response; } diff --git a/spectrum/src/frontends/xmpp/settingsadhoccommand.h b/spectrum/src/frontends/xmpp/settingsadhoccommand.h index 23630125..58a798ed 100644 --- a/spectrum/src/frontends/xmpp/settingsadhoccommand.h +++ b/spectrum/src/frontends/xmpp/settingsadhoccommand.h @@ -45,13 +45,13 @@ class SettingsAdHocCommand : public AdHocCommand { /// Destructor. virtual ~SettingsAdHocCommand(); - virtual boost::shared_ptr handleRequest(boost::shared_ptr payload); + virtual SWIFTEN_SHRPTR_NAMESPACE::shared_ptr handleRequest(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); private: void updateUserSetting(Swift::Form::ref form, UserInfo &user, const std::string &name); - boost::shared_ptr getForm(); - boost::shared_ptr handleResponse(boost::shared_ptr payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr getForm(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr handleResponse(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); State m_state; }; diff --git a/spectrum/src/frontends/xmpp/statsresponder.cpp b/spectrum/src/frontends/xmpp/statsresponder.cpp index 594d7004..5a45573c 100644 --- a/spectrum/src/frontends/xmpp/statsresponder.cpp +++ b/spectrum/src/frontends/xmpp/statsresponder.cpp @@ -37,7 +37,6 @@ #include using namespace Swift; -using namespace boost; namespace Transport { @@ -71,8 +70,8 @@ unsigned long StatsResponder::usedMemory() { return (unsigned long) rss; } -bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr stats) { - boost::shared_ptr response(new StatsPayload()); +bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stats) { + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr response(new StatsPayload()); if (stats->getItems().empty()) { response->addItem(StatsPayload::Item("uptime")); @@ -145,7 +144,7 @@ bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& return true; } -bool StatsResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr stats) { +bool StatsResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr stats) { return false; } diff --git a/spectrum/src/frontends/xmpp/statsresponder.h b/spectrum/src/frontends/xmpp/statsresponder.h index 8f7fd8b6..fd78f6b9 100644 --- a/spectrum/src/frontends/xmpp/statsresponder.h +++ b/spectrum/src/frontends/xmpp/statsresponder.h @@ -23,6 +23,7 @@ #include #include "Swiften/Queries/SetResponder.h" #include "Swiften/Elements/StatsPayload.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -37,8 +38,8 @@ class StatsResponder : public Swift::Responder { ~StatsResponder(); private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); unsigned long usedMemory(); diff --git a/spectrum/src/frontends/xmpp/storageresponder.cpp b/spectrum/src/frontends/xmpp/storageresponder.cpp index 106ac0ac..a3d4e263 100644 --- a/spectrum/src/frontends/xmpp/storageresponder.cpp +++ b/spectrum/src/frontends/xmpp/storageresponder.cpp @@ -31,7 +31,6 @@ #include "transport/Logging.h" using namespace Swift; -using namespace boost; namespace Transport { @@ -45,7 +44,7 @@ StorageResponder::StorageResponder(Swift::IQRouter *router, StorageBackend *stor StorageResponder::~StorageResponder() { } -bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { User *user = m_userManager->getUser(from.toBare().toString()); if (!user) { LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in"); @@ -58,11 +57,11 @@ bool StorageResponder::handleGetRequest(const Swift::JID& from, const Swift::JID m_storageBackend->getUserSetting(user->getUserInfo().id, "storage", type, value); LOG4CXX_INFO(logger, from.toBare().toString() << ": Sending jabber:iq:storage"); - sendResponse(from, id, boost::shared_ptr(new PrivateStorage(boost::shared_ptr(new RawXMLPayload(value))))); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new PrivateStorage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new RawXMLPayload(value))))); return true; } -bool StorageResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool StorageResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { User *user = m_userManager->getUser(from.toBare().toString()); if (!user) { sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel); @@ -70,14 +69,14 @@ bool StorageResponder::handleSetRequest(const Swift::JID& from, const Swift::JID return true; } - boost::shared_ptr storage = boost::dynamic_pointer_cast(payload->getPayload()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr storage = SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(payload->getPayload()); if (storage) { StorageSerializer serializer; - std::string value = serializer.serializePayload(boost::dynamic_pointer_cast(payload->getPayload())); + std::string value = serializer.serializePayload(SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(payload->getPayload())); m_storageBackend->updateUserSetting(user->getUserInfo().id, "storage", value); LOG4CXX_INFO(logger, from.toBare().toString() << ": Storing jabber:iq:storage"); - sendResponse(from, id, boost::shared_ptr()); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr()); } else { LOG4CXX_INFO(logger, from.toBare().toString() << ": Unknown element. Libtransport does not support serialization of this."); diff --git a/spectrum/src/frontends/xmpp/storageresponder.h b/spectrum/src/frontends/xmpp/storageresponder.h index c92691ba..e3a1e7bc 100644 --- a/spectrum/src/frontends/xmpp/storageresponder.h +++ b/spectrum/src/frontends/xmpp/storageresponder.h @@ -24,6 +24,7 @@ #include "Swiften/Queries/Responder.h" #include "Swiften/Elements/RosterPayload.h" #include "Swiften/Elements/PrivateStorage.h" +#include "Swiften/SwiftenCompat.h" namespace Transport { @@ -36,8 +37,8 @@ class StorageResponder : public Swift::Responder { ~StorageResponder(); private: - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); StorageBackend *m_storageBackend; UserManager *m_userManager; }; diff --git a/spectrum/src/frontends/xmpp/vcardresponder.cpp b/spectrum/src/frontends/xmpp/vcardresponder.cpp index 951a26f3..417feaea 100644 --- a/spectrum/src/frontends/xmpp/vcardresponder.cpp +++ b/spectrum/src/frontends/xmpp/vcardresponder.cpp @@ -31,7 +31,6 @@ #include using namespace Swift; -using namespace boost; namespace Transport { @@ -48,7 +47,7 @@ VCardResponder::VCardResponder(Swift::IQRouter *router, Swift::NetworkFactories VCardResponder::~VCardResponder() { } -void VCardResponder::sendVCard(unsigned int id, boost::shared_ptr vcard) { +void VCardResponder::sendVCard(unsigned int id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard) { if (m_queries.find(id) == m_queries.end()) { LOG4CXX_WARN(logger, "Unexpected VCard from legacy network with id " << id); return; @@ -75,12 +74,12 @@ void VCardResponder::collectTimeouted() { } BOOST_FOREACH(unsigned int id, candidates) { - sendVCard(id, boost::shared_ptr(new Swift::VCard())); + sendVCard(id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::VCard())); } m_collectTimer->start(); } -bool VCardResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool VCardResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { User *user = m_userManager->getUser(from.toBare().toString()); if (!user) { LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in"); @@ -110,7 +109,7 @@ bool VCardResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& return true; } -bool VCardResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload) { +bool VCardResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload) { if (!to.getNode().empty() && from.toBare().toString() != to.toBare().toString()) { LOG4CXX_WARN(logger, from.toBare().toString() << ": Tried to set VCard of somebody else"); return false; @@ -125,7 +124,7 @@ bool VCardResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& LOG4CXX_INFO(logger, from.toBare().toString() << ": Setting VCard"); onVCardUpdated(user, payload); - sendResponse(from, id, boost::shared_ptr(new VCard())); + sendResponse(from, id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new VCard())); return true; } diff --git a/spectrum/src/frontends/xmpp/vcardresponder.h b/spectrum/src/frontends/xmpp/vcardresponder.h index 852500e2..76c36e03 100644 --- a/spectrum/src/frontends/xmpp/vcardresponder.h +++ b/spectrum/src/frontends/xmpp/vcardresponder.h @@ -25,6 +25,7 @@ #include "Swiften/Elements/VCard.h" #include "Swiften/Network/NetworkFactories.h" #include "Swiften/Network/Timer.h" +#include "Swiften/SwiftenCompat.h" #include namespace Transport { @@ -38,10 +39,10 @@ class VCardResponder : public Swift::Responder { VCardResponder(Swift::IQRouter *router, Swift::NetworkFactories *factories, UserManager *userManager); ~VCardResponder(); - void sendVCard(unsigned int id, boost::shared_ptr vcard); + void sendVCard(unsigned int id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard); boost::signal onVCardRequired; - boost::signal vcard)> onVCardUpdated; + boost::signal vcard)> onVCardUpdated; void collectTimeouted(); @@ -53,8 +54,8 @@ class VCardResponder : public Swift::Responder { time_t received; }; - virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); - virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr payload); + virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); + virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload); UserManager *m_userManager; std::map m_queries; unsigned int m_id; diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp index abea3edc..28a1658b 100644 --- a/spectrum/src/main.cpp +++ b/spectrum/src/main.cpp @@ -18,6 +18,7 @@ #include "frontends/slack/SlackFrontendPlugin.h" #include "Swiften/EventLoop/SimpleEventLoop.h" #include "Swiften/Network/BoostNetworkFactories.h" +#include #include #include #ifndef WIN32 @@ -223,10 +224,10 @@ int mainloop() { std::string plugin_fc = "create_" + frontend_name + "_frontend_plugin"; dll::shared_library self(dll::program_location()); - boost::function()> creator; + boost::function()> creator; try { - creator = self.get_alias()>(plugin_fc); + creator = self.get_alias()>(plugin_fc); } catch(boost::system::system_error& e) { LOG4CXX_ERROR(logger, "Error when loading frontend " << e.what()); return -3; diff --git a/spectrum_manager/src/main.cpp b/spectrum_manager/src/main.cpp index a8eef61f..884608fc 100644 --- a/spectrum_manager/src/main.cpp +++ b/spectrum_manager/src/main.cpp @@ -21,8 +21,6 @@ using namespace Transport; using namespace boost::filesystem; -using namespace boost; - int main(int argc, char **argv) { ManagerConfig config; diff --git a/spectrum_manager/src/methods.cpp b/spectrum_manager/src/methods.cpp index 729128e6..9b79eed3 100644 --- a/spectrum_manager/src/methods.cpp +++ b/spectrum_manager/src/methods.cpp @@ -18,6 +18,8 @@ #include "signal.h" #include "sys/wait.h" +#include "Swiften/SwiftenCompat.h" + #define WRAP(MESSAGE, TYPE) pbnetwork::WrapperMessage wrap; \ wrap.set_type(TYPE); \ wrap.set_payload(MESSAGE); \ @@ -28,8 +30,6 @@ using namespace Transport; using namespace boost::filesystem; -using namespace boost; - std::string _data; static std::string response; @@ -440,7 +440,7 @@ int show_status(ManagerConfig *config) { return ret; } -static void handleDataRead(boost::shared_ptr m_conn, boost::shared_ptr data) { +static void handleDataRead(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr data) { _data += std::string(data->begin(), data->end()); // Parse data while there are some @@ -490,7 +490,7 @@ static void handleDataRead(boost::shared_ptr m_conn, boost::s } } -static void handleConnected(boost::shared_ptr m_conn, const std::string &msg, bool error) { +static void handleConnected(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn, const std::string &msg, bool error) { m_conn->onConnectFinished.disconnect(boost::bind(&handleConnected, m_conn, msg, _1)); if (error) { std::cerr << "Can't connect the server\n"; @@ -587,7 +587,7 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo found = true; - boost::shared_ptr m_conn; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_conn; m_conn = networkFactories.getConnectionFactory()->createConnection(); m_conn->onDataRead.connect(boost::bind(&handleDataRead, m_conn, _1)); m_conn->onConnectFinished.connect(boost::bind(&handleConnected, m_conn, message, _1)); diff --git a/tests/libtransport/AdminInterface.cpp b/tests/libtransport/AdminInterface.cpp index 20027e92..88b21d13 100644 --- a/tests/libtransport/AdminInterface.cpp +++ b/tests/libtransport/AdminInterface.cpp @@ -5,6 +5,7 @@ #include #include #include +#include "Swiften/SwiftenCompat.h" #include "Swiften/Server/ServerStanzaChannel.h" #include "Swiften/Server/ServerFromClientSession.h" #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h" @@ -48,7 +49,7 @@ class AdminInterfaceTest : public CPPUNIT_NS :: TestFixture, public BasicSlackTe } std::string sendAdminMessage(const std::string &cmd) { - Swift::Message::ref msg = boost::shared_ptr(new Swift::Message()); + Swift::Message::ref msg = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Message()); msg->setFrom(Swift::JID("me@localhost")); msg->setTo(Swift::JID("localhost")); msg->setBody(cmd); diff --git a/tests/libtransport/VCardResponder.cpp b/tests/libtransport/VCardResponder.cpp index 6c6355d5..1efa3b0d 100644 --- a/tests/libtransport/VCardResponder.cpp +++ b/tests/libtransport/VCardResponder.cpp @@ -39,8 +39,8 @@ class VCardResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTest { } void handleGetRequestMUC() { - boost::shared_ptr payload(new Swift::VCard()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "foobar", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::VCard()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "foobar", payload); iq->setFrom("user@localhost/me"); iq->setTo("#room@localhost/user"); injectIQ(iq); diff --git a/tests/libtransport/basictest.cpp b/tests/libtransport/basictest.cpp index 968a76a4..094b61ca 100644 --- a/tests/libtransport/basictest.cpp +++ b/tests/libtransport/basictest.cpp @@ -88,7 +88,7 @@ void BasicTest::setMeUp (void) { parser = new Swift::XMPPParser(this, payloadParserFactories, factories->getXMLParserFactory()); parser2 = new Swift::XMPPParser(this, payloadParserFactories, factories->getXMLParserFactory()); - serverFromClientSession = boost::shared_ptr(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(), + serverFromClientSession = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(), payloadParserFactories, payloadSerializers, userRegistry, factories->getXMLParserFactory(), Swift::JID("user@localhost/resource"))); serverFromClientSession->startSession(); @@ -166,9 +166,9 @@ void BasicTest::dumpReceived() { std::cout << receivedData2 << "\n"; } #if HAVE_SWIFTEN_3 -void BasicTest::handleElement(boost::shared_ptr element) { +void BasicTest::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #else -void BasicTest::handleElement(boost::shared_ptr element) { +void BasicTest::handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { #endif if (stream1_active) { received.push_back(element); @@ -182,19 +182,19 @@ void BasicTest::handleStreamEnd() { streamEnded = true; } -void BasicTest::injectPresence(boost::shared_ptr &response) { +void BasicTest::injectPresence(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &response) { dynamic_cast(static_cast(component->getFrontend())->getStanzaChannel())->onPresenceReceived(response); } -void BasicTest::injectIQ(boost::shared_ptr iq) { +void BasicTest::injectIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq) { dynamic_cast(static_cast(component->getFrontend())->getStanzaChannel())->onIQReceived(iq); } -void BasicTest::injectMessage(boost::shared_ptr msg) { +void BasicTest::injectMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg) { dynamic_cast(static_cast(component->getFrontend())->getStanzaChannel())->onMessageReceived(msg); } -Swift::Stanza *BasicTest::getStanza(boost::shared_ptr element) { +Swift::Stanza *BasicTest::getStanza(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element) { Swift::Stanza *stanza = dynamic_cast(element.get()); CPPUNIT_ASSERT(stanza); return stanza; @@ -226,7 +226,7 @@ void BasicTest::connectUser() { } void BasicTest::connectSecondResource() { - serverFromClientSession2 = boost::shared_ptr(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(), + serverFromClientSession2 = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::ServerFromClientSession("id", factories->getConnectionFactory()->createConnection(), payloadParserFactories, payloadSerializers, userRegistry, factories->getXMLParserFactory(), Swift::JID("user@localhost/resource2"))); serverFromClientSession2->startSession(); diff --git a/tests/libtransport/basictest.h b/tests/libtransport/basictest.h index cd56cee9..12133085 100644 --- a/tests/libtransport/basictest.h +++ b/tests/libtransport/basictest.h @@ -47,9 +47,11 @@ #include #include #include +#include "Swiften/SwiftenCompat.h" #include "Swiften/Server/ServerStanzaChannel.h" #include "Swiften/Server/ServerFromClientSession.h" #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h" +#include "Swiften/SwiftenCompat.h" #define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000) using namespace Transport; @@ -60,11 +62,11 @@ class TestingConversation : public Conversation { } // Called when there's new message to legacy network from XMPP network - void sendMessage(boost::shared_ptr &message) { + void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &message) { onMessageToSend(this, message); } - boost::signal &)> onMessageToSend; + boost::signal &)> onMessageToSend; }; class TestingFactory : public Factory { @@ -79,7 +81,7 @@ class TestingFactory : public Factory { return nc; } - void handleMessageToSend(TestingConversation *_conv, boost::shared_ptr &_msg) { + void handleMessageToSend(TestingConversation *_conv, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &_msg) { onMessageToSend(_conv, _msg); } @@ -96,7 +98,7 @@ class TestingFactory : public Factory { return buddy; } - boost::signal &)> onMessageToSend; + boost::signal &)> onMessageToSend; }; class TestingStorageBackend : public StorageBackend { @@ -228,15 +230,15 @@ class BasicTest : public Swift::XMPPParserClient { void handleStreamStart(const Swift::ProtocolHeader&); #if HAVE_SWIFTEN_3 - void handleElement(boost::shared_ptr element); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element); #else - void handleElement(boost::shared_ptr element); + void handleElement(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element); #endif void handleStreamEnd(); - void injectPresence(boost::shared_ptr &response); - void injectIQ(boost::shared_ptr iq); - void injectMessage(boost::shared_ptr msg); + void injectPresence(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &response); + void injectIQ(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq); + void injectMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg); void dumpReceived(); @@ -255,13 +257,13 @@ class BasicTest : public Swift::XMPPParserClient { void disconnectUser(); void add2Buddies(); - Swift::Stanza *getStanza(boost::shared_ptr element); + Swift::Stanza *getStanza(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr element); protected: bool streamEnded; UserManager *userManager; - boost::shared_ptr serverFromClientSession; - boost::shared_ptr serverFromClientSession2; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr serverFromClientSession; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr serverFromClientSession2; Swift::FullPayloadSerializerCollection* payloadSerializers; Swift::FullPayloadParserFactoryCollection* payloadParserFactories; Swift::XMPPParser *parser; @@ -273,8 +275,8 @@ class BasicTest : public Swift::XMPPParserClient { Swift::DummyEventLoop *loop; TestingFactory *factory; Component *component; - std::vector > received; - std::vector > received2; + std::vector > received; + std::vector > received2; std::string receivedData; std::string receivedData2; StorageBackend *storage; diff --git a/tests/libtransport/component.cpp b/tests/libtransport/component.cpp index ccd2f6f7..c3589208 100644 --- a/tests/libtransport/component.cpp +++ b/tests/libtransport/component.cpp @@ -34,7 +34,7 @@ class ComponentTest : public CPPUNIT_NS :: TestFixture, public BasicTest { tearMeDown(); } - void handleUserDiscoInfoReceived(const Swift::JID& jid, boost::shared_ptr info) { + void handleUserDiscoInfoReceived(const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr info) { onCapabilitiesReceived = true; } diff --git a/tests/libtransport/conversationmanager.cpp b/tests/libtransport/conversationmanager.cpp index d5375a25..1ba78661 100644 --- a/tests/libtransport/conversationmanager.cpp +++ b/tests/libtransport/conversationmanager.cpp @@ -44,7 +44,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe public: TestingConversation *m_conv; - boost::shared_ptr m_msg; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr m_msg; void setUp (void) { m_conv = NULL; @@ -67,7 +67,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe std::cout << " = " << sizeof(Conversation) << " B"; } - void handleMessageReceived(TestingConversation *_conv, boost::shared_ptr &_msg) { + void handleMessageReceived(TestingConversation *_conv, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr &_msg) { m_conv = _conv; m_msg = _msg; } @@ -79,8 +79,8 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe user->getConversationManager()->addConversation(conv); conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2)); - boost::shared_ptr msg(new Swift::Message()); - msg->addPayload(boost::make_shared(Swift::ChatState::Composing)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); + msg->addPayload(SWIFTEN_SHRPTR_NAMESPACE::make_shared(Swift::ChatState::Composing)); // Forward it conv->handleMessage(msg); @@ -112,7 +112,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe conv->setNickname("nickname"); conv->addJID("user@localhost/resource"); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setSubject("subject"); msg->setType(Swift::Message::Groupchat); @@ -153,7 +153,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe user->getConversationManager()->addConversation(conv); conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2)); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there<>!"); // Forward it @@ -180,7 +180,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe CPPUNIT_ASSERT_EQUAL(std::string("response<>!"), m_msg->getBody().get_value_or("")); // send another message from legacy network, should be sent to user@localhost/resource now - boost::shared_ptr msg2(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg2(new Swift::Message()); msg2->setBody("hi there!"); // Forward it @@ -220,7 +220,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe void handleNormalMessagesInitiatedFromXMPP() { User *user = userManager->getUser("user@localhost"); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setFrom("user@localhost/resource"); msg->setTo("buddy1@localhost/bot"); msg->setBody("hi there<>!"); @@ -247,7 +247,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe user->getConversationManager()->addConversation(conv); conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2)); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there<>!"); msg->setType(Swift::Message::Headline); @@ -301,7 +301,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe // reset resources should not touch this resource user->getConversationManager()->resetResources(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there!"); // Forward it @@ -351,7 +351,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe // reset resources should not touch this resource user->getConversationManager()->resetResources(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there!"); // Forward it @@ -374,7 +374,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe conv->setNickname("nickname"); conv->addJID("user@localhost/resource"); - boost::shared_ptr msg0(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg0(new Swift::Message()); msg0->setSubject("subject"); conv->handleMessage(msg0, "anotheruser"); @@ -390,11 +390,11 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe // reset resources should not touch this resource user->getConversationManager()->resetResources(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there!"); conv->handleMessage(msg, "anotheruser"); - boost::shared_ptr msg2(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg2(new Swift::Message()); msg2->setBody("hi there2!"); conv->handleMessage(msg2, "anotheruser"); @@ -413,7 +413,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -460,7 +460,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe Swift::MUCPayload *payload3 = new Swift::MUCPayload(); payload3->setPassword("password"); - response3->addPayload(boost::shared_ptr(payload3)); + response3->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload3)); injectPresence(response3); loop->processEvents(); @@ -469,11 +469,11 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe // reset resources should not touch this resource user->getConversationManager()->resetResources(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there!"); conv->handleMessage(msg, "anotheruser"); - boost::shared_ptr msg2(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg2(new Swift::Message()); msg2->setBody("hi there2!"); conv->handleMessage(msg2, "anotheruser"); @@ -492,7 +492,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -531,7 +531,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe // reset resources should not touch this resource user->getConversationManager()->resetResources(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there!"); // Forward it @@ -727,7 +727,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe loop->processEvents(); received.clear(); - boost::shared_ptr msg(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg(new Swift::Message()); msg->setBody("hi there!"); msg->setFrom("user@localhost/resource"); msg->setTo("#room@localhost/anotheruser"); @@ -742,7 +742,7 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe Conversation *pmconv = user->getConversationManager()->getConversation("#room/anotheruser"); - boost::shared_ptr msg2(new Swift::Message()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr msg2(new Swift::Message()); msg2->setBody("response!"); pmconv->handleMessage(msg2); diff --git a/tests/libtransport/discoitemsresponder.cpp b/tests/libtransport/discoitemsresponder.cpp index a93c2a65..0cbff362 100644 --- a/tests/libtransport/discoitemsresponder.cpp +++ b/tests/libtransport/discoitemsresponder.cpp @@ -38,8 +38,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe void roomList() { itemsResponder->addRoom("#room@localhost", "#room"); - boost::shared_ptr payload(new Swift::DiscoItems()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoItems()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -58,8 +58,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe user->addRoomToRoomList("#room2@localhost", "#room2"); itemsResponder->addRoom("#room@localhost", "#room"); - boost::shared_ptr payload(new Swift::DiscoItems()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoItems()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -80,8 +80,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe user->addRoomToRoomList("#room2@localhost", "#room2"); itemsResponder->addRoom("#room@localhost", "#room"); - boost::shared_ptr payload(new Swift::DiscoInfo()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); iq->setTo("#room2@localhost"); injectIQ(iq); @@ -99,8 +99,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe void roomInfo() { itemsResponder->addRoom("#room@localhost", "#room"); - boost::shared_ptr payload(new Swift::DiscoInfo()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); iq->setTo("#room@localhost"); injectIQ(iq); @@ -118,8 +118,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe void roomListEscaping() { itemsResponder->addRoom(Swift::JID::getEscapedNode("19:room@localhost") + "@" + component->getJID().toString(), "#room"); - boost::shared_ptr payload(new Swift::DiscoItems()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoItems()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -135,8 +135,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe void roomInfoEscaping() { itemsResponder->addRoom(Swift::JID::getEscapedNode("19:room@localhost") + "@" + component->getJID().toString(), "#room"); - boost::shared_ptr payload(new Swift::DiscoInfo()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); iq->setTo("19\\3aroom\\40localhost@localhost"); injectIQ(iq); @@ -155,8 +155,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe itemsResponder->addRoom("#room@localhost", "#room"); itemsResponder->clearRooms(); - boost::shared_ptr payload(new Swift::DiscoItems()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoItems()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -169,8 +169,8 @@ class DiscoItemsResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTe } void receipts() { - boost::shared_ptr payload(new Swift::DiscoInfo()); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); iq->setTo("buddy@localhost"); injectIQ(iq); diff --git a/tests/libtransport/gatewayresponder.cpp b/tests/libtransport/gatewayresponder.cpp index 50e1f51d..04c4b0e6 100644 --- a/tests/libtransport/gatewayresponder.cpp +++ b/tests/libtransport/gatewayresponder.cpp @@ -40,10 +40,10 @@ class GatewayResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTest } void escape() { - boost::shared_ptr iq(new Swift::IQ(Swift::IQ::Set)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq(new Swift::IQ(Swift::IQ::Set)); iq->setTo("icq.localhost"); iq->setFrom("user@localhost"); - iq->addPayload(boost::shared_ptr(new Swift::GatewayPayload(Swift::JID(), "", "a@b"))); + iq->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::GatewayPayload(Swift::JID(), "", "a@b"))); iq->setID("123"); injectIQ(iq); @@ -56,10 +56,10 @@ class GatewayResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTest } void noEscapeEscaped() { - boost::shared_ptr iq(new Swift::IQ(Swift::IQ::Set)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq(new Swift::IQ(Swift::IQ::Set)); iq->setTo("icq.localhost"); iq->setFrom("user@localhost"); - iq->addPayload(boost::shared_ptr(new Swift::GatewayPayload(Swift::JID(), "", "a\\40b"))); + iq->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::GatewayPayload(Swift::JID(), "", "a\\40b"))); iq->setID("123"); injectIQ(iq); CPPUNIT_ASSERT_EQUAL(1, (int) received.size()); diff --git a/tests/libtransport/networkpluginserver.cpp b/tests/libtransport/networkpluginserver.cpp index 47d71dd2..d06633f0 100644 --- a/tests/libtransport/networkpluginserver.cpp +++ b/tests/libtransport/networkpluginserver.cpp @@ -62,7 +62,7 @@ class NetworkPluginServerTest : public CPPUNIT_NS :: TestFixture, public BasicTe connectUser(); User *user = userManager->getUser("user@localhost"); user->setData(&backend); - boost::shared_ptr client1 = factories->getConnectionFactory()->createConnection(); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client1 = factories->getConnectionFactory()->createConnection(); dynamic_cast(client1.get())->onDataSent.connect(boost::bind(&NetworkPluginServerTest::handleDataSent, this, _1)); backend.connection = client1; diff --git a/tests/libtransport/rosterresponder.cpp b/tests/libtransport/rosterresponder.cpp index 5c053c95..f30713b2 100644 --- a/tests/libtransport/rosterresponder.cpp +++ b/tests/libtransport/rosterresponder.cpp @@ -62,7 +62,7 @@ class RosterResponderTest : public CPPUNIT_NS :: TestFixture, public BasicTest { p->addItem(item); Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(p, "user@localhost", static_cast(component->getFrontend())->getIQRouter()); - boost::shared_ptr iq(new Swift::IQ(Swift::IQ::Set)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq(new Swift::IQ(Swift::IQ::Set)); iq->setTo("icq.localhost"); iq->setFrom("user@localhost"); iq->addPayload(p); diff --git a/tests/libtransport/settingsadhoccommand.cpp b/tests/libtransport/settingsadhoccommand.cpp index 3ac54dd9..54e4672b 100644 --- a/tests/libtransport/settingsadhoccommand.cpp +++ b/tests/libtransport/settingsadhoccommand.cpp @@ -41,9 +41,9 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT } void getItems() { - boost::shared_ptr payload(new Swift::DiscoItems()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoItems()); payload->setNode("http://jabber.org/protocol/commands"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -57,9 +57,9 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT } void getInfo() { - boost::shared_ptr payload(new Swift::DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoInfo()); payload->setNode("settings"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -73,9 +73,9 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT } void getInfoBare() { - boost::shared_ptr payload(new Swift::DiscoInfo()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::DiscoInfo()); payload->setNode("http://jabber.org/protocol/commands"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -89,8 +89,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT } void executeNotRegistered() { - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -107,8 +107,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT void execute() { addUser(); - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -131,7 +131,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT #if (SWIFTEN_VERSION >= 0x030000) f->setBoolValue(false); #else - boost::dynamic_pointer_cast(f)->setValue(false); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(f)->setValue(false); #endif std::string sessionId = getStanza(received[0])->getPayload()->getSessionID(); @@ -144,7 +144,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT } // finish the command - payload = boost::shared_ptr(new Swift::Command("settings")); + payload = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings")); payload->setSessionID(sessionId); payload->setForm(getStanza(received[0])->getPayload()->getForm()); iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); @@ -171,7 +171,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT received.clear(); - payload = boost::shared_ptr(new Swift::Command("settings")); + payload = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings")); iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); @@ -195,14 +195,14 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT #if (SWIFTEN_VERSION >= 0x030000) CPPUNIT_ASSERT_EQUAL(false, f->getBoolValue()); #else - CPPUNIT_ASSERT_EQUAL(false, boost::dynamic_pointer_cast(f)->getValue()); + CPPUNIT_ASSERT_EQUAL(false, SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(f)->getValue()); #endif } void executeTwoCommands() { addUser(); - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -221,7 +221,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT CPPUNIT_ASSERT(getStanza(received[0])->getPayload()->getForm()->getField("enable_transport")); received.clear(); - payload = boost::shared_ptr(new Swift::Command("settings")); + payload = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings")); iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); @@ -243,8 +243,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT void executeBadSessionID() { addUser(); - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -263,7 +263,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT std::string sessionId = "somethingwrong"; // finish the command - payload = boost::shared_ptr(new Swift::Command("settings")); + payload = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings")); payload->setSessionID(sessionId); payload->setForm(getStanza(received[0])->getPayload()->getForm()); iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); @@ -279,8 +279,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT void cancel() { addUser(); - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -299,7 +299,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT std::string sessionId = getStanza(received[0])->getPayload()->getSessionID(); // cancel the command - payload = boost::shared_ptr(new Swift::Command("settings")); + payload = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings")); payload->setSessionID(sessionId); payload->setAction(Swift::Command::Cancel); iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); @@ -323,8 +323,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT User *user = userManager->getUser("user@localhost"); CPPUNIT_ASSERT_EQUAL(std::string("0"), user->getUserSetting("send_headlines")); - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -347,13 +347,13 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT #if (SWIFTEN_VERSION >= 0x030000) f->setBoolValue(true); #else - boost::dynamic_pointer_cast(f)->setValue(true); + SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(f)->setValue(true); #endif std::string sessionId = getStanza(received[0])->getPayload()->getSessionID(); // finish the command - payload = boost::shared_ptr(new Swift::Command("settings")); + payload = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::Command("settings")); payload->setSessionID(sessionId); payload->setForm(getStanza(received[0])->getPayload()->getForm()); iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); @@ -371,8 +371,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT connectUser(); User *user = userManager->getUser("user@localhost"); CPPUNIT_ASSERT_EQUAL(std::string("1"), user->getUserSetting("send_headlines")); - boost::shared_ptr payload(new Swift::Command("settings")); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr payload(new Swift::Command("settings")); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -393,7 +393,7 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT #if (SWIFTEN_VERSION >= 0x030000) CPPUNIT_ASSERT_EQUAL(true, f->getBoolValue()); #else - CPPUNIT_ASSERT_EQUAL(true, boost::dynamic_pointer_cast(f)->getValue()); + CPPUNIT_ASSERT_EQUAL(true, SWIFTEN_SHRPTR_NAMESPACE::dynamic_pointer_cast(f)->getValue()); #endif } diff --git a/tests/libtransport/user.cpp b/tests/libtransport/user.cpp index e049a355..99083518 100644 --- a/tests/libtransport/user.cpp +++ b/tests/libtransport/user.cpp @@ -74,7 +74,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { tearMeDown(); } - void handleVCardUpdated(User *user, boost::shared_ptr v) { + void handleVCardUpdated(User *user, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr v) { photo = Swift::byteArrayToString(v->getPhoto()); } @@ -138,7 +138,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -186,7 +186,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -213,7 +213,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -236,7 +236,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -255,7 +255,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -329,7 +329,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -354,7 +354,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -374,7 +374,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -486,7 +486,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::MUCPayload *payload = new Swift::MUCPayload(); payload->setPassword("password"); - response->addPayload(boost::shared_ptr(payload)); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(payload)); injectPresence(response); loop->processEvents(); @@ -542,7 +542,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::Presence::ref response = Swift::Presence::create(); response->setTo("localhost"); response->setFrom("user@localhost/resource"); - response->addPayload(boost::shared_ptr(new Swift::VCardUpdate("hash"))); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::VCardUpdate("hash"))); injectPresence(response); loop->processEvents(); @@ -551,7 +551,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { Swift::VCard::ref payload1 = getStanza(received[1])->getPayload(); CPPUNIT_ASSERT(payload1); - boost::shared_ptr vcard(new Swift::VCard()); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr vcard(new Swift::VCard()); vcard->setPhoto(Swift::createByteArray("photo")); injectIQ(Swift::IQ::createResult(getStanza(received[1])->getFrom(), getStanza(received[1])->getTo(), getStanza(received[1])->getID(), vcard)); loop->processEvents(); diff --git a/tests/libtransport/usermanager.cpp b/tests/libtransport/usermanager.cpp index b6b793a0..3f9bdef8 100644 --- a/tests/libtransport/usermanager.cpp +++ b/tests/libtransport/usermanager.cpp @@ -142,7 +142,7 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { response->setTo("localhost"); response->setFrom("user@localhost"); response->setType(Swift::Presence::Error); - response->addPayload(boost::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::SubscriptionRequired))); + response->addPayload(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::ErrorPayload(Swift::ErrorPayload::SubscriptionRequired))); dynamic_cast(static_cast(component->getFrontend())->getStanzaChannel())->onPresenceReceived(response); loop->processEvents(); diff --git a/tests/libtransport/userregistration.cpp b/tests/libtransport/userregistration.cpp index d62cf6da..ac0bdf94 100644 --- a/tests/libtransport/userregistration.cpp +++ b/tests/libtransport/userregistration.cpp @@ -44,7 +44,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest } void getForm() { - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", boost::shared_ptr(new Swift::InBandRegistrationPayload())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::InBandRegistrationPayload())); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -67,7 +67,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest user.password = "password"; storage->setUser(user); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", boost::shared_ptr(new Swift::InBandRegistrationPayload())); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Get, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::InBandRegistrationPayload())); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -86,7 +86,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setUsername("legacyname"); reg->setPassword("password"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -98,7 +98,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest CPPUNIT_ASSERT(dynamic_cast(getStanza(received[1]))); CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast(getStanza(received[1]))->getType()); - iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), boost::shared_ptr(new Swift::RosterPayload())); + iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::RosterPayload())); received.clear(); injectIQ(iq); loop->processEvents(); @@ -121,7 +121,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setUsername("legacyname"); reg->setPassword("password"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -147,7 +147,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setRemove(true); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -159,7 +159,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest CPPUNIT_ASSERT(dynamic_cast(getStanza(received[1]))); CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast(getStanza(received[1]))->getType()); - iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), boost::shared_ptr(new Swift::RosterPayload())); + iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::RosterPayload())); received.clear(); injectIQ(iq); loop->processEvents(); @@ -180,7 +180,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setUsername("legacyname"); reg->setPassword("password"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -191,7 +191,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest CPPUNIT_ASSERT(dynamic_cast(getStanza(received[1]))); CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast(getStanza(received[1]))->getType()); - iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), boost::shared_ptr(new Swift::RosterPayload())); + iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::RosterPayload())); received.clear(); injectIQ(iq); loop->processEvents(); @@ -219,7 +219,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setRemove(true); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -231,7 +231,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest CPPUNIT_ASSERT(dynamic_cast(getStanza(received[1]))); CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast(getStanza(received[1]))->getType()); - iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), boost::shared_ptr(new Swift::RosterPayload())); + iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::RosterPayload())); received.clear(); injectIQ(iq); loop->processEvents(); @@ -256,7 +256,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setUsername("legacyname"); reg->setPassword("another"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -277,7 +277,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setUsername(""); reg->setPassword("password"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -297,7 +297,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setRemove(true); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -328,7 +328,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest cfg->updateBackendConfig("[registration]\nneedPassword=0\n"); Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setUsername("legacyname"); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); @@ -339,7 +339,7 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest CPPUNIT_ASSERT(dynamic_cast(getStanza(received[1]))); CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast(getStanza(received[1]))->getType()); - iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), boost::shared_ptr(new Swift::RosterPayload())); + iq = Swift::IQ::createResult(Swift::JID("localhost"), getStanza(received[0])->getTo(), getStanza(received[0])->getID(), SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(new Swift::RosterPayload())); received.clear(); injectIQ(iq); loop->processEvents(); @@ -362,26 +362,26 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest #if HAVE_SWIFTEN_3 Swift::Form::ref form(new Swift::Form(Swift::Form::FormType)); - Swift::FormField::ref type = boost::make_shared(Swift::FormField::UnknownType, "jabber:iq:register"); + Swift::FormField::ref type = SWIFTEN_SHRPTR_NAMESPACE::make_shared(Swift::FormField::UnknownType, "jabber:iq:register"); type->setName("FORM_TYPE"); form->addField(type); - Swift::FormField::ref username = boost::make_shared(Swift::FormField::UnknownType, "legacyname"); + Swift::FormField::ref username = SWIFTEN_SHRPTR_NAMESPACE::make_shared(Swift::FormField::UnknownType, "legacyname"); username->setName("username"); form->addField(username); - Swift::FormField::ref password = boost::make_shared(Swift::FormField::UnknownType, "password"); + Swift::FormField::ref password = SWIFTEN_SHRPTR_NAMESPACE::make_shared(Swift::FormField::UnknownType, "password"); password->setName("password"); form->addField(password); - Swift::FormField::ref language = boost::make_shared(Swift::FormField::UnknownType, "language"); + Swift::FormField::ref language = SWIFTEN_SHRPTR_NAMESPACE::make_shared(Swift::FormField::UnknownType, "language"); language->setName("en"); form->addField(language); Swift::InBandRegistrationPayload *reg = new Swift::InBandRegistrationPayload(); reg->setForm(form); - boost::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", boost::shared_ptr(reg)); + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", SWIFTEN_SHRPTR_NAMESPACE::shared_ptr(reg)); iq->setFrom("user@localhost"); injectIQ(iq); loop->processEvents(); diff --git a/tests/libtransport/userregistry.cpp b/tests/libtransport/userregistry.cpp index fdbdb763..2cbbc3af 100644 --- a/tests/libtransport/userregistry.cpp +++ b/tests/libtransport/userregistry.cpp @@ -67,12 +67,12 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { received2.clear(); } - void send(boost::shared_ptr conn, const std::string &data) { + void send(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr conn, const std::string &data) { dynamic_cast(conn.get())->receive(Swift::createSafeByteArray(data)); loop->processEvents(); } - void sendCredentials(boost::shared_ptr conn, const std::string &username, const std::string &password, const std::string &b64) { + void sendCredentials(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr conn, const std::string &username, const std::string &password, const std::string &b64) { std::vector &received = conn == client1 ? received1 : received2; send(conn, ""); CPPUNIT_ASSERT_EQUAL(2, (int) received.size()); @@ -90,7 +90,7 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { CPPUNIT_ASSERT_EQUAL(std::string(""), userRegistry->getUserPassword("unknown@localhost")); } - void bindSession(boost::shared_ptr conn) { + void bindSession(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr conn) { std::vector &received = conn == client1 ? received1 : received2; send(conn, ""); @@ -101,7 +101,7 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { } - void handleDataReceived(const Swift::SafeByteArray &data, boost::shared_ptr conn) { + void handleDataReceived(const Swift::SafeByteArray &data, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr conn) { if (conn == client1) { received1.push_back(safeByteArrayToString(data)); // std::cout << received1.back() << "\n"; @@ -212,9 +212,9 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture { Swift::Server *server; Swift::DummyNetworkFactories *factories; Swift::DummyEventLoop *loop; - boost::shared_ptr connectionServer; - boost::shared_ptr client1; - boost::shared_ptr client2; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr connectionServer; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client1; + SWIFTEN_SHRPTR_NAMESPACE::shared_ptr client2; std::vector received1; std::vector received2; State state1;