1 files changed, 9 insertions, 9 deletions

diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp
index b443292..a8b817f 100644
--- a/src/Common/RequestManager.cpp
+++ b/src/Common/RequestManager.cpp
@@ -19,7 +19,7 @@
 
 #include "RequestManager.h"
 #include "RequestHandlers/DisconnectRequestHandler.h"
-#include "Logger.h"
+#include <Core/Logger.h>
 
 #include <boost/bind.hpp>
 
@@ -96,14 +96,14 @@ void RequestManager::receiveHandler(Connection *connection, boost::shared_ptr<co
   boost::shared_ptr<RequestHandler> request = requestMap.findRequest(connection, requestId);
   if(request) {
     lock.unlock();
-    Net::ThreadManager::get()->pushWork(boost::bind(&RequestHandler::handlePacket, request, packet));
+    Core::ThreadManager::get()->pushWork(boost::bind(&RequestHandler::handlePacket, request, packet));
 
     return;
   }
 
   if(!requestMap.isConnectionRegistered(connection)) {
     // TODO: Error
-    Logger::log(Logger::ERROR, "Received a packet from an unregistered connection.");
+    Core::Logger::log(Core::Logger::ERROR, "Received a packet from an unregistered connection.");
 
     return;
   }
@@ -122,7 +122,7 @@ void RequestManager::receiveHandler(Connection *connection, boost::shared_ptr<co
       }
 
       lock.unlock();
-      Net::ThreadManager::get()->pushWork(boost::bind(&RequestHandler::handlePacket, request, packet));
+      Core::ThreadManager::get()->pushWork(boost::bind(&RequestHandler::handlePacket, request, packet));
 
       return;
     }
@@ -130,11 +130,11 @@ void RequestManager::receiveHandler(Connection *connection, boost::shared_ptr<co
 
   lock.unlock();
 
-  Logger::logf(Logger::ERROR, "Received an unexpected packet with type '%s'.", packet->getType().c_str());
+  Core::Logger::logf(Core::Logger::ERROR, "Received an unexpected packet with type '%s'.", packet->getType().c_str());
 
   XmlPacket ret;
   ret.setType("Error");
-  ret.add("ErrorCode", Net::Exception::UNEXPECTED_PACKET);
+  ret.add("ErrorCode", Core::Exception::UNEXPECTED_PACKET);
 
   connection->sendPacket(ret, requestId);
 }
@@ -143,20 +143,20 @@ bool RequestManager::sendRequest(Connection *connection, boost::shared_ptr<Reque
   boost::unique_lock<boost::shared_mutex> lock(mutex);
 
   if(!requestMap.isConnectionRegistered(connection)) {
-    Logger::log(Logger::CRITICAL, "Trying to send a request over an unregistered connecion.");
+    Core::Logger::log(Core::Logger::CRITICAL, "Trying to send a request over an unregistered connecion.");
     return false;
   }
 
   uint16_t requestId = _getUnusedRequestId(connection);
 
   if(request->isFinished || !requestMap.addRequest(connection, requestId, request)) {
-    Logger::log(Logger::CRITICAL, "Trying resend a request.");
+    Core::Logger::log(Core::Logger::CRITICAL, "Trying resend a request.");
     return false;
   }
   request->connectSignalFinished(boost::bind(&RequestManager::handleRequestFinished, this, connection, requestId));
   lock.unlock();
 
-  Net::ThreadManager::get()->pushWork(boost::bind(&Request::sendRequest, request));
+  Core::ThreadManager::get()->pushWork(boost::bind(&Request::sendRequest, request));
 
   return true;
 }