From d710e7dc5e8f3895f5d1aa6bd1db0ef3151af8ca Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Sat, 13 Sep 2008 04:39:42 +0200
Subject: Und wieder eine Umbenennungsorgie...

---
 src/Common/RequestManager.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/Common/RequestManager.cpp')

diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp
index 0dc7a48..7075229 100644
--- a/src/Common/RequestManager.cpp
+++ b/src/Common/RequestManager.cpp
@@ -18,16 +18,16 @@
  */
 
 #include "RequestManager.h"
-#include "Request/Request.h"
-#include "RequestHandler/DisconnectRequestHandler.h"
-#include "RequestHandler/IdentifyRequestHandler.h"
+#include "Request.h"
+#include "RequestHandlers/DisconnectRequestHandler.h"
+#include "RequestHandlers/IdentifyRequestHandler.h"
 
 #include <iostream>
 
 namespace Mad {
 namespace Common {
 
-RequestHandler::RequestHandler* RequestManager::RequestMap::findRequest(uint16_t id) {
+RequestHandler* RequestManager::RequestMap::findRequest(uint16_t id) {
   iterator it = find(id);
   if(it == end())
     return 0;
@@ -58,7 +58,7 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
   }
 
   RequestMap *requestMap = it->second;
-  RequestHandler::RequestHandler *request = requestMap->findRequest(packet.getRequestId());
+  RequestHandler *request = requestMap->findRequest(packet.getRequestId());
 
   if(request) {
     request->handlePacket(connection, packet);
@@ -86,7 +86,7 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
   std::cerr << "Received an unexpected packet." << std::endl;
 }
 
-bool RequestManager::sendRequest(Net::Connection *connection, Request::Request *request) {
+bool RequestManager::sendRequest(Net::Connection *connection, Request *request) {
   std::map<Net::Connection*,RequestMap*>::iterator it = requestMaps.find(connection);
 
   if(it == requestMaps.end())
@@ -136,8 +136,8 @@ void RequestManager::unregisterPacketType(Net::Packet::Type type) {
 }
 
 RequestManager::RequestManager(bool core) : requestId(core ? -2 : -1) {
-  registerPacketType<RequestHandler::DisconnectRequestHandler>(Net::Packet::DISCONNECT);
-  registerPacketType<RequestHandler::IdentifyRequestHandler>(Net::Packet::IDENTIFY);
+  registerPacketType<RequestHandlers::DisconnectRequestHandler>(Net::Packet::DISCONNECT);
+  registerPacketType<RequestHandlers::IdentifyRequestHandler>(Net::Packet::IDENTIFY);
 }
 
 RequestManager::~RequestManager() {
-- 
cgit v1.2.3