XmlRequest{,Handler} in Request{,Handler} umbenannt

4 files changed, 9 insertions, 9 deletions

diff --git a/src/Daemon/Backends/NetworkLogger.h b/src/Daemon/Backends/NetworkLogger.h
index a07fd59..857d27c 100644
--- a/src/Daemon/Backends/NetworkLogger.h
+++ b/src/Daemon/Backends/NetworkLogger.h
@@ -37,7 +37,7 @@ class NetworkLogger : public Common::Logger {
   protected:
     virtual void logMessage(Common::Logger::MessageCategory category, Common::Logger::MessageLevel level, time_t messageTimestamp, const std::string &message) {
       Common::RequestManager::get()->sendRequest(connection,
-          std::auto_ptr<Common::XmlRequest>(new Requests::LogRequest(category, level, messageTimestamp, message, Requests::LogRequest::slot_type()))
+          std::auto_ptr<Common::Request>(new Requests::LogRequest(category, level, messageTimestamp, message, Requests::LogRequest::slot_type()))
       );
     }
 
diff --git a/src/Daemon/RequestHandlers/CommandRequestHandler.h b/src/Daemon/RequestHandlers/CommandRequestHandler.h
index 86391f2..408dbcf 100644
--- a/src/Daemon/RequestHandlers/CommandRequestHandler.h
+++ b/src/Daemon/RequestHandlers/CommandRequestHandler.h
@@ -20,14 +20,14 @@
 #ifndef MAD_DAEMON_REQUESTHANDLERS_COMMANDREQUESTHANDLER_H_
 #define MAD_DAEMON_REQUESTHANDLERS_COMMANDREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
+#include <Common/RequestHandler.h>
 #include <stdint.h>
 
 namespace Mad {
 namespace Daemon {
 namespace RequestHandlers {
 
-class CommandRequestHandler : public Common::XmlRequestHandler {
+class CommandRequestHandler : public Common::RequestHandler {
   private:
     void sendReply(Net::Connection *connection, uint16_t requestId);
 
diff --git a/src/Daemon/Requests/IdentifyRequest.h b/src/Daemon/Requests/IdentifyRequest.h
index c3ab821..5009374 100644
--- a/src/Daemon/Requests/IdentifyRequest.h
+++ b/src/Daemon/Requests/IdentifyRequest.h
@@ -20,14 +20,14 @@
 #ifndef MAD_DAEMON_REQUESTS_IDENTIFYREQUEST_H_
 #define MAD_DAEMON_REQUESTS_IDENTIFYREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 #include <string>
 
 namespace Mad {
 namespace Daemon {
 namespace Requests {
 
-class IdentifyRequest : public Common::XmlRequest {
+class IdentifyRequest : public Common::Request {
   private:
     std::string hostname;
 
@@ -36,7 +36,7 @@ class IdentifyRequest : public Common::XmlRequest {
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    IdentifyRequest(const std::string &hostname0, slot_type slot) : Common::XmlRequest(slot), hostname(hostname0) {}
+    IdentifyRequest(const std::string &hostname0, slot_type slot) : Common::Request(slot), hostname(hostname0) {}
 };
 
 }
diff --git a/src/Daemon/Requests/LogRequest.h b/src/Daemon/Requests/LogRequest.h
index 2a03ce3..1045a2f 100644
--- a/src/Daemon/Requests/LogRequest.h
+++ b/src/Daemon/Requests/LogRequest.h
@@ -20,7 +20,7 @@
 #ifndef MAD_DAEMON_REQUESTS_LOGREQUEST_H_
 #define MAD_DAEMON_REQUESTS_LOGREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 #include <Common/Logger.h>
 #include <ctime>
 
@@ -28,7 +28,7 @@ namespace Mad {
 namespace Daemon {
 namespace Requests {
 
-class LogRequest : public Common::XmlRequest {
+class LogRequest : public Common::Request {
   private:
     Common::Logger::MessageCategory category;
     Common::Logger::MessageLevel level;
@@ -41,7 +41,7 @@ class LogRequest : public Common::XmlRequest {
 
   public:
     LogRequest(Common::Logger::MessageCategory category0, Common::Logger::MessageLevel level0, time_t messageTimestamp0, const std::string &message0, slot_type slot)
-    : Common::XmlRequest(slot), category(category0), level(level0), messageTimestamp(messageTimestamp0), message(message0) {}
+    : Common::Request(slot), category(category0), level(level0), messageTimestamp(messageTimestamp0), message(message0) {}
 };
 
 }