libtransport.git Changeset - 7a0e5e31e6e2

Changeset - 7a0e5e31e6e2

Parent rev.

Child rev.

[Not reviewed]

1 5 1

HanzZ - 14 years ago 2011-06-05 14:01:26
hanzz.k@gmail.com

Moved RosterResponder out of UserManager

6 files changed with 10 insertions and 12 deletions:

include/transport/networkpluginserver.h

include/transport/rosterresponder.h

include/transport/usermanager.h

src/networkpluginserver.cpp

src/rosterresponder.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -38,6 +38,7 @@ class LocalBuddy; @@
 class Config;
 class NetworkConversation;
 class VCardResponder;
 class RosterResponder;
 class NetworkPluginServer {
 	public:
@@ @@ -83,6 +84,7 @@ class NetworkPluginServer { @@
 		UserManager *m_userManager;
 		VCardResponder *m_vcardResponder;
 		RosterResponder *m_rosterResponder;
 		Config *m_config;
 		boost::shared_ptr<Swift::ConnectionServer> m_server;
 		std::list<Client *>  m_clients;

include/transport/rosterresponder.h

➞

Show inline comments

@@ file renamed from src/rosterresponder.h to include/transport/rosterresponder.h @@
@@ @@ -27,18 +27,16 @@ @@
 namespace Transport {
 class StorageBackend;
 class UserManager;
 class RosterResponder : public Swift::Responder<Swift::RosterPayload> {
 	public:
-		RosterResponder(Swift::IQRouter *router, StorageBackend *storageBackend, UserManager *userManager);
 		RosterResponder(Swift::IQRouter *router, UserManager *userManager);
 		~RosterResponder();
 	private:
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::RosterPayload> payload);
 		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::RosterPayload> payload);
 		StorageBackend *m_storageBackend;
 		UserManager *m_userManager;
 };

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -83,7 +83,6 @@ class UserManager { @@
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		StorageResponder *m_storageResponder;
 		RosterResponder *m_rosterResponder;
 		friend class RosterResponder;
 };

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -29,6 +29,7 @@ @@
 #include "transport/config.h"
 #include "transport/conversation.h"
 #include "transport/vcardresponder.h"
 #include "transport/rosterresponder.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 	m_vcardResponder->onVCardRequired.connect(boost::bind(&NetworkPluginServer::handleVCardRequired, this, _1, _2, _3));
 	m_vcardResponder->start();
 	m_rosterResponder = new RosterResponder(component->getIQRouter(), userManager);
 	m_rosterResponder->start();
 	m_server = component->getFactories()->getConnectionFactory()->createConnectionServer(10000);
 	m_server->onNewConnection.connect(boost::bind(&NetworkPluginServer::handleNewClientConnection, this, _1));
 	m_server->start();
 NetworkPluginServer::~NetworkPluginServer() {
 	m_pingTimer->stop();
 	delete m_vcardResponder;
 	delete m_rosterResponder;
+}
 void NetworkPluginServer::handleNewClientConnection(boost::shared_ptr<Swift::Connection> c) {

src/rosterresponder.cpp

➞

Show inline comments

@@ @@ -18,7 +18,7 @@ @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "rosterresponder.h"
+#include "transport/rosterresponder.h"
 #include <iostream>
 #include <boost/bind.hpp>
@@ @@ -33,8 +33,7 @@ using namespace boost; @@
 namespace Transport {
 RosterResponder::RosterResponder(Swift::IQRouter *router, StorageBackend *storageBackend, UserManager *userManager) : Swift::Responder<RosterPayload>(router) {
 	m_storageBackend = storageBackend;
 RosterResponder::RosterResponder(Swift::IQRouter *router, UserManager *userManager) : Swift::Responder<RosterPayload>(router) {
 	m_userManager = userManager;
+}

src/usermanager.cpp

➞

Show inline comments

@@ @@ -25,7 +25,6 @@ @@
 #include "transport/conversationmanager.h"
 #include "transport/rostermanager.h"
 #include "storageresponder.h"
 #include "rosterresponder.h"
 namespace Transport {
 	m_storageResponder = new StorageResponder(component->getIQRouter(), m_storageBackend, this);
 	m_storageResponder->start();
 	m_rosterResponder = new RosterResponder(component->getIQRouter(), m_storageBackend, this);
 	m_rosterResponder->start();
 	component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
 	m_component->getStanzaChannel()->onMessageReceived.connect(bind(&UserManager::handleMessageReceived, this, _1));
 	m_component->getStanzaChannel()->onPresenceReceived.connect(bind(&UserManager::handleGeneralPresenceReceived, this, _1));
 UserManager::~UserManager(){
 	m_storageResponder->stop();
 	delete m_storageResponder;
 	delete m_rosterResponder;
+}
 void UserManager::addUser(User *user) {

0 comments (0 inline, 0 general)