XmlRequest{,Handler} in Request{,Handler} umbenannt

1 files changed, 30 insertions, 30 deletions

diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp
index de4f2ca..ac1909b 100644
--- a/src/Common/RequestManager.cpp
+++ b/src/Common/RequestManager.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "RequestManager.h"
-#include "XmlRequest.h"
+#include "Request.h"
 #include "XmlPacket.h"
 #include "RequestHandlers/DisconnectRequestHandler.h"
 #include "Logger.h"
@@ -32,21 +32,21 @@ namespace Common {
 RequestManager RequestManager::requestManager;
 
 
-RequestManager::XmlRequestMap::~XmlRequestMap() {
+RequestManager::RequestMap::~RequestMap() {
   for(iterator it = begin(); it != end(); ++it)
     delete it->second;
 }
 
-bool RequestManager::XmlRequestMap::addRequest(uint16_t id, XmlRequestHandler *info) {
+bool RequestManager::RequestMap::addRequest(uint16_t id, RequestHandler *info) {
   if(!insert(std::make_pair(id, info)).second)
     return false;
 
-  info->signalFinished().connect(sigc::hide_return(sigc::bind(sigc::mem_fun(this, &RequestManager::XmlRequestMap::deleteRequest), id)));
+  info->signalFinished().connect(sigc::hide_return(sigc::bind(sigc::mem_fun(this, &RequestManager::RequestMap::deleteRequest), id)));
 
   return true;
 }
 
-XmlRequestHandler* RequestManager::XmlRequestMap::findRequest(uint16_t id) {
+RequestHandler* RequestManager::RequestMap::findRequest(uint16_t id) {
   iterator it = find(id);
   if(it == end())
     return 0;
@@ -54,7 +54,7 @@ XmlRequestHandler* RequestManager::XmlRequestMap::findRequest(uint16_t id) {
   return it->second;
 }
 
-bool RequestManager::XmlRequestMap::deleteRequest(uint16_t id) {
+bool RequestManager::RequestMap::deleteRequest(uint16_t id) {
   iterator it = find(id);
   if(it == end())
     return false;
@@ -69,27 +69,27 @@ bool RequestManager::XmlRequestMap::deleteRequest(uint16_t id) {
 void RequestManager::receiveHandler(Net::Connection *connection, const Net::Packet &packet) {
   XmlPacket xmlPacket(packet);
 
-  std::map<Net::Connection*,XmlRequestMap*>::iterator it = xmlRequestMaps.find(connection);
-  if(it == xmlRequestMaps.end()) {
+  std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.find(connection);
+  if(it == requestMaps.end()) {
     // TODO: Error
     Logger::log(Logger::ERROR, "Received a packet from an unregistered connection.");
 
     return;
   }
 
-  XmlRequestMap *xmlRequestMap = it->second;
-  XmlRequestHandler *xmlRequest = xmlRequestMap->findRequest(packet.getRequestId());
+  RequestMap *requestMap = it->second;
+  RequestHandler *request = requestMap->findRequest(packet.getRequestId());
 
-  if(xmlRequest) {
-    xmlRequest->handlePacket(connection, packet.getRequestId(), xmlPacket);
+  if(request) {
+    request->handlePacket(connection, packet.getRequestId(), xmlPacket);
     return;
   }
 
-  std::map<std::string,XmlRequestHandlerFactory*>::iterator factoryIt = xmlRequestHandlerFactories.find(xmlPacket.getType());
-  if(factoryIt != xmlRequestHandlerFactories.end()) {
-    xmlRequest = factoryIt->second->createRequestHandler();
-    xmlRequestMap->addRequest(packet.getRequestId(), xmlRequest);
-    xmlRequest->handlePacket(connection, packet.getRequestId(), xmlPacket);
+  std::map<std::string,RequestHandlerFactory*>::iterator factoryIt = requestHandlerFactories.find(xmlPacket.getType());
+  if(factoryIt != requestHandlerFactories.end()) {
+    request = factoryIt->second->createRequestHandler();
+    requestMap->addRequest(packet.getRequestId(), request);
+    request->handlePacket(connection, packet.getRequestId(), xmlPacket);
 
     return;
   }
@@ -103,15 +103,15 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
   connection->send(ret.encode(requestId));
 }
 
-bool RequestManager::sendRequest(Net::Connection *connection, std::auto_ptr<XmlRequest> request) {
-  std::map<Net::Connection*,XmlRequestMap*>::iterator it = xmlRequestMaps.find(connection);
+bool RequestManager::sendRequest(Net::Connection *connection, std::auto_ptr<Request> request) {
+  std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.find(connection);
 
-  if(it == xmlRequestMaps.end()) {
+  if(it == requestMaps.end()) {
     Logger::log(Logger::CRITICAL, "Trying to send a request over an unregistered connecion.");
     return false;
   }
 
-  XmlRequestMap *requestMap = it->second;
+  RequestMap *requestMap = it->second;
 
   uint16_t id;
   do {
@@ -126,29 +126,29 @@ bool RequestManager::sendRequest(Net::Connection *connection, std::auto_ptr<XmlR
 }
 
 void RequestManager::registerConnection(Net::Connection *connection) {
-  xmlRequestMaps.insert(std::make_pair(connection, new XmlRequestMap()));
+  requestMaps.insert(std::make_pair(connection, new RequestMap()));
 
   connection->signalReceive().connect(sigc::mem_fun(this, &RequestManager::receiveHandler));
 }
 
 void RequestManager::unregisterConnection(Net::Connection *connection) {
-  std::map<Net::Connection*,XmlRequestMap*>::iterator it = xmlRequestMaps.find(connection);
+  std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.find(connection);
 
-  if(it != xmlRequestMaps.end()) {
+  if(it != requestMaps.end()) {
     delete it->second;
-    xmlRequestMaps.erase(it);
+    requestMaps.erase(it);
   }
 }
 
 void RequestManager::unregisterPacketType(const std::string &type) {
-  std::map<std::string,XmlRequestHandlerFactory*>::iterator it = xmlRequestHandlerFactories.find(type);
+  std::map<std::string,RequestHandlerFactory*>::iterator it = requestHandlerFactories.find(type);
 
-  if(it == xmlRequestHandlerFactories.end())
+  if(it == requestHandlerFactories.end())
     return;
 
   delete it->second;
 
-  xmlRequestHandlerFactories.erase(it);
+  requestHandlerFactories.erase(it);
 }
 
 RequestManager::RequestManager() : core(false), requestId(-1) {
@@ -158,10 +158,10 @@ RequestManager::RequestManager() : core(false), requestId(-1) {
 RequestManager::~RequestManager() {
   unregisterPacketType("Disconnect");
 
-  for(std::map<Net::Connection*,XmlRequestMap*>::iterator it = xmlRequestMaps.begin(); it != xmlRequestMaps.end(); ++it)
+  for(std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.begin(); it != requestMaps.end(); ++it)
     delete it->second;
 
-  for(std::map<std::string,XmlRequestHandlerFactory*>::iterator it = xmlRequestHandlerFactories.begin(); it != xmlRequestHandlerFactories.end(); ++it)
+  for(std::map<std::string,RequestHandlerFactory*>::iterator it = requestHandlerFactories.begin(); it != requestHandlerFactories.end(); ++it)
     delete it->second;
 }