Und wieder eine Umbenennungsorgie...

1 files changed, 7 insertions, 9 deletions

diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h
index e7a8e7b..2ca10e7 100644
--- a/src/Common/RequestManager.h
+++ b/src/Common/RequestManager.h
@@ -20,20 +20,18 @@
 #ifndef MAD_COMMON_REQUESTMANAGER_H_
 #define MAD_COMMON_REQUESTMANAGER_H_
 
-#include "RequestHandler/RequestHandler.h"
+#include "RequestHandler.h"
 #include <Net/Connection.h>
 #include <map>
 
 namespace Mad {
 namespace Common {
 
-namespace Request {
 class Request;
-}
 
 class RequestManager {
   private:
-    class RequestMap : private std::map<uint16_t,RequestHandler::RequestHandler*> {
+    class RequestMap : private std::map<uint16_t,RequestHandler*> {
       private:
         // Prevent shallow copy
         RequestMap(const RequestMap &o);
@@ -46,11 +44,11 @@ class RequestManager {
             delete it->second;
         }
 
-        bool addRequest(uint16_t id, RequestHandler::RequestHandler *info) {
+        bool addRequest(uint16_t id, RequestHandler *info) {
           return insert(std::make_pair(id, info)).second;
         }
 
-        RequestHandler::RequestHandler* findRequest(uint16_t id);
+        RequestHandler* findRequest(uint16_t id);
         bool deleteRequest(uint16_t id);
     };
 
@@ -59,13 +57,13 @@ class RequestManager {
         RequestHandlerFactory() {}
 
       public:
-        virtual RequestHandler::RequestHandler* createRequestHandler() = 0;
+        virtual RequestHandler* createRequestHandler() = 0;
         virtual ~RequestHandlerFactory() {}
     };
 
     template<class T> class SpecificRequestHandlerFactory : public RequestHandlerFactory {
       public:
-        virtual RequestHandler::RequestHandler* createRequestHandler() {
+        virtual RequestHandler* createRequestHandler() {
           return new T();
         }
     };
@@ -95,7 +93,7 @@ class RequestManager {
 
     void unregisterPacketType(Net::Packet::Type type);
 
-    bool sendRequest(Net::Connection *connection, Request::Request *request);
+    bool sendRequest(Net::Connection *connection, Request *request);
 
     RequestManager(bool core);
     virtual ~RequestManager();