Einige Umstrukturierungen an den RequestHandler-Klassen

1 files changed, 7 insertions, 7 deletions

diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h
index a783fe2..68510f9 100644
--- a/src/Common/RequestManager.h
+++ b/src/Common/RequestManager.h
@@ -20,7 +20,7 @@
 #ifndef MAD_COMMON_REQUESTMANAGER_H_
 #define MAD_COMMON_REQUESTMANAGER_H_
 
-#include "RequestHandler.h"
+#include "RequestHandler/RequestHandler.h"
 #include <Net/Connection.h>
 #include <map>
 
@@ -33,7 +33,7 @@ class Request;
 
 class RequestManager {
   private:
-    class RequestMap : private std::map<uint16_t,RequestHandler*> {
+    class RequestMap : private std::map<uint16_t,RequestHandler::RequestHandler*> {
       private:
         // Prevent shallow copy
         RequestMap(const RequestMap &o);
@@ -47,11 +47,11 @@ class RequestManager {
             delete it->second;
         }
 
-        bool addRequest(uint16_t id, RequestHandler *info) {
+        bool addRequest(uint16_t id, RequestHandler::RequestHandler *info) {
           return insert(std::make_pair(id, info)).second;
         }
 
-        RequestHandler* findRequest(uint16_t id) {
+        RequestHandler::RequestHandler* findRequest(uint16_t id) {
           iterator it = find(id);
           if(it == end())
             return 0;
@@ -76,13 +76,13 @@ class RequestManager {
         RequestHandlerFactory() {}
 
       public:
-        virtual RequestHandler* createRequestHandler() = 0;
+        virtual RequestHandler::RequestHandler* createRequestHandler() = 0;
         virtual ~RequestHandlerFactory() {}
     };
 
     template<class T> class SpecificRequestHandlerFactory : public RequestHandlerFactory {
       public:
-        virtual RequestHandler* createRequestHandler() {
+        virtual RequestHandler::RequestHandler* createRequestHandler() {
           return new T();
         }
     };
@@ -137,7 +137,7 @@ class RequestManager {
 
     bool sendRequest(Net::Connection *connection, Request::Request *request);
 
-    RequestManager(bool core) : requestId(core ? -2 : -1) {}
+    RequestManager(bool core);
 
     virtual ~RequestManager() {
       for(std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.begin(); it != requestMaps.end(); ++it)