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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/Client/Requests/DaemonCommandRequest.h b/src/Client/Requests/DaemonCommandRequest.h
index 8575123..13a6da6 100644
--- a/src/Client/Requests/DaemonCommandRequest.h
+++ b/src/Client/Requests/DaemonCommandRequest.h
@@ -20,14 +20,14 @@
 #ifndef MAD_CLIENT_REQUEST_DAEMONCOMMANDREQUEST_H_
 #define MAD_CLIENT_REQUEST_DAEMONCOMMANDREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 #include <string>
 
 namespace Mad {
 namespace Client {
 namespace Requests {
 
-class DaemonCommandRequest : public Common::XmlRequest {
+class DaemonCommandRequest : public Common::Request {
   private:
     std::string daemon;
     bool reboot;
@@ -37,7 +37,7 @@ class DaemonCommandRequest : public Common::XmlRequest {
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    DaemonCommandRequest(const std::string &daemon0, bool reboot0, slot_type slot) : Common::XmlRequest(slot), daemon(daemon0), reboot(reboot0) {}
+    DaemonCommandRequest(const std::string &daemon0, bool reboot0, slot_type slot) : Common::Request(slot), daemon(daemon0), reboot(reboot0) {}
 };
 
 }
diff --git a/src/Client/Requests/DaemonFSInfoRequest.h b/src/Client/Requests/DaemonFSInfoRequest.h
index 48a201f..a42d85a 100644
--- a/src/Client/Requests/DaemonFSInfoRequest.h
+++ b/src/Client/Requests/DaemonFSInfoRequest.h
@@ -20,7 +20,7 @@
 #ifndef MAD_CLIENT_REQUESTS_DAEMONFSINFOREQUEST_H_
 #define MAD_CLIENT_REQUESTS_DAEMONFSINFOREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 
 #include <string>
 
@@ -28,7 +28,7 @@ namespace Mad {
 namespace Client {
 namespace Requests {
 
-class DaemonFSInfoRequest : public Common::XmlRequest {
+class DaemonFSInfoRequest : public Common::Request {
   private:
     std::string daemon;
 
@@ -37,7 +37,7 @@ class DaemonFSInfoRequest : public Common::XmlRequest {
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    DaemonFSInfoRequest(const std::string &daemon0, slot_type slot) : Common::XmlRequest(slot), daemon(daemon0) {}
+    DaemonFSInfoRequest(const std::string &daemon0, slot_type slot) : Common::Request(slot), daemon(daemon0) {}
 };
 
 }
diff --git a/src/Client/Requests/DaemonListRequest.h b/src/Client/Requests/DaemonListRequest.h
index ca37dbd..3b561d2 100644
--- a/src/Client/Requests/DaemonListRequest.h
+++ b/src/Client/Requests/DaemonListRequest.h
@@ -20,19 +20,19 @@
 #ifndef MAD_CLIENT_REQUEST_DAEMONLISTREQUEST_H_
 #define MAD_CLIENT_REQUEST_DAEMONLISTREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 
 namespace Mad {
 namespace Client {
 namespace Requests {
 
-class DaemonListRequest : public Common::XmlRequest {
+class DaemonListRequest : public Common::Request {
   protected:
       virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
       virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
     public:
-      DaemonListRequest(slot_type slot) : Common::XmlRequest(slot) {}
+      DaemonListRequest(slot_type slot) : Common::Request(slot) {}
 };
 
 }
diff --git a/src/Client/Requests/DaemonStatusRequest.h b/src/Client/Requests/DaemonStatusRequest.h
index b0982e6..2ccc9b2 100644
--- a/src/Client/Requests/DaemonStatusRequest.h
+++ b/src/Client/Requests/DaemonStatusRequest.h
@@ -20,7 +20,7 @@
 #ifndef MAD_CLIENT_REQUESTS_DAEMONSTATUSREQUEST_H_
 #define MAD_CLIENT_REQUESTS_DAEMONSTATUSREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 
 #include <string>
 
@@ -28,7 +28,7 @@ namespace Mad {
 namespace Client {
 namespace Requests {
 
-class DaemonStatusRequest : public Common::XmlRequest {
+class DaemonStatusRequest : public Common::Request {
   private:
     std::string daemon;
 
@@ -37,7 +37,7 @@ class DaemonStatusRequest : public Common::XmlRequest {
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    DaemonStatusRequest(const std::string &daemon0, slot_type slot) : Common::XmlRequest(slot), daemon(daemon0) {}
+    DaemonStatusRequest(const std::string &daemon0, slot_type slot) : Common::Request(slot), daemon(daemon0) {}
 };
 
 }