1 files changed, 19 insertions, 19 deletions

diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h
index 8a3d151..ee4f4d1 100644
--- a/src/Common/RequestManager.h
+++ b/src/Common/RequestManager.h
@@ -28,49 +28,49 @@
 namespace Mad {
 namespace Common {
 
-class XmlRequest;
-class XmlRequestHandler;
+class Request;
+class RequestHandler;
 
 class RequestManager {
   private:
-    class XmlRequestMap : private std::map<uint16_t,XmlRequestHandler*> {
+    class RequestMap : private std::map<uint16_t,RequestHandler*> {
       private:
         // Prevent shallow copy
-        XmlRequestMap(const XmlRequestMap &o);
-        XmlRequestMap& operator=(const XmlRequestMap &o);
+        RequestMap(const RequestMap &o);
+        RequestMap& operator=(const RequestMap &o);
 
       public:
-        XmlRequestMap() {}
-        ~XmlRequestMap();
+        RequestMap() {}
+        ~RequestMap();
 
-        bool addRequest(uint16_t id, XmlRequestHandler *info);
-        XmlRequestHandler* findRequest(uint16_t id);
+        bool addRequest(uint16_t id, RequestHandler *info);
+        RequestHandler* findRequest(uint16_t id);
         bool deleteRequest(uint16_t id);
     };
 
-    class XmlRequestHandlerFactory {
+    class RequestHandlerFactory {
       protected:
-        XmlRequestHandlerFactory() {}
+        RequestHandlerFactory() {}
 
       public:
-        virtual XmlRequestHandler* createRequestHandler() = 0;
-        virtual ~XmlRequestHandlerFactory() {}
+        virtual RequestHandler* createRequestHandler() = 0;
+        virtual ~RequestHandlerFactory() {}
     };
 
-    template<class T> class SpecificXmlRequestHandlerFactory : public XmlRequestHandlerFactory {
+    template<class T> class SpecificRequestHandlerFactory : public RequestHandlerFactory {
       public:
-        virtual XmlRequestHandler* createRequestHandler() {
+        virtual RequestHandler* createRequestHandler() {
           return new T();
         }
     };
 
     static RequestManager requestManager;
 
-    std::map<Net::Connection*,XmlRequestMap*> xmlRequestMaps;
+    std::map<Net::Connection*,RequestMap*> requestMaps;
     bool core;
     uint16_t requestId;
 
-    std::map<std::string,XmlRequestHandlerFactory*> xmlRequestHandlerFactories;
+    std::map<std::string,RequestHandlerFactory*> requestHandlerFactories;
 
     uint16_t getRequestId() {
       return requestId+=2;
@@ -103,12 +103,12 @@ class RequestManager {
     void unregisterConnection(Net::Connection *connection);
 
     template <class T> void registerPacketType(const std::string &type) {
-      xmlRequestHandlerFactories.insert(std::make_pair(type, new SpecificXmlRequestHandlerFactory<T>()));
+      requestHandlerFactories.insert(std::make_pair(type, new SpecificRequestHandlerFactory<T>()));
     }
 
     void unregisterPacketType(const std::string &type);
 
-    bool sendRequest(Net::Connection *connection, std::auto_ptr<XmlRequest> request);
+    bool sendRequest(Net::Connection *connection, std::auto_ptr<Request> request);
 
     virtual ~RequestManager();
 };