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

5 files changed, 15 insertions, 15 deletions

diff --git a/src/Common/Requests/DisconnectRequest.h b/src/Common/Requests/DisconnectRequest.h
index 4f2cdf5..af7cca5 100644
--- a/src/Common/Requests/DisconnectRequest.h
+++ b/src/Common/Requests/DisconnectRequest.h
@@ -20,19 +20,19 @@
 #ifndef MAD_COMMON_REQUESTS_DISCONNECTREQUEST_H_
 #define MAD_COMMON_REQUESTS_DISCONNECTREQUEST_H_
 
-#include "../XmlRequest.h"
+#include "../Request.h"
 
 namespace Mad {
 namespace Common {
 namespace Requests {
 
-class DisconnectRequest : public XmlRequest {
+class DisconnectRequest : public Request {
   protected:
     virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
     virtual void handlePacket(Net::Connection *connection, uint16_t, const XmlPacket &packet);
 
   public:
-    DisconnectRequest(slot_type slot) : XmlRequest(slot) {}
+    DisconnectRequest(slot_type slot) : Request(slot) {}
 };
 
 }
diff --git a/src/Common/Requests/FSInfoRequest.h b/src/Common/Requests/FSInfoRequest.h
index 9a6ba14..39759ab 100644
--- a/src/Common/Requests/FSInfoRequest.h
+++ b/src/Common/Requests/FSInfoRequest.h
@@ -20,19 +20,19 @@
 #ifndef MAD_COMMON_REQUESTS_FSINFOREQUEST_H_
 #define MAD_COMMON_REQUESTS_FSINFOREQUEST_H_
 
-#include "../XmlRequest.h"
+#include "../Request.h"
 
 namespace Mad {
 namespace Common {
 namespace Requests {
 
-class FSInfoRequest : public XmlRequest {
+class FSInfoRequest : public Request {
   protected:
     virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    FSInfoRequest(slot_type slot) : XmlRequest(slot) {}
+    FSInfoRequest(slot_type slot) : Request(slot) {}
 };
 
 }
diff --git a/src/Common/Requests/GSSAPIAuthRequest.h b/src/Common/Requests/GSSAPIAuthRequest.h
index d9f5c9c..ca6195b 100644
--- a/src/Common/Requests/GSSAPIAuthRequest.h
+++ b/src/Common/Requests/GSSAPIAuthRequest.h
@@ -20,7 +20,7 @@
 #ifndef MAD_COMMON_REQUESTS_GSSAPIAUTHREQUEST_H_
 #define MAD_COMMON_REQUESTS_GSSAPIAUTHREQUEST_H_
 
-#include "../XmlRequest.h"
+#include "../Request.h"
 #include <string>
 #include <gssapi/gssapi.h>
 
@@ -30,7 +30,7 @@ namespace Requests {
 
 // TODO Logging & error handling!
 
-class GSSAPIAuthRequest : public XmlRequest {
+class GSSAPIAuthRequest : public Request {
   private:
     std::string serviceName;
     gss_name_t gssServiceName;
@@ -43,7 +43,7 @@ class GSSAPIAuthRequest : public XmlRequest {
 
   public:
     GSSAPIAuthRequest(const std::string &serviceName0, slot_type slot)
-        : XmlRequest(slot), serviceName(serviceName0), gssServiceName(GSS_C_NO_NAME), gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
+        : Request(slot), serviceName(serviceName0), gssServiceName(GSS_C_NO_NAME), gssContext(GSS_C_NO_CONTEXT), gssContinue(true) {}
     virtual ~GSSAPIAuthRequest();
 };
 
diff --git a/src/Common/Requests/StatusRequest.h b/src/Common/Requests/StatusRequest.h
index e9c8a4c..eb24305 100644
--- a/src/Common/Requests/StatusRequest.h
+++ b/src/Common/Requests/StatusRequest.h
@@ -20,19 +20,19 @@
 #ifndef MAD_COMMON_REQUESTS_STATUSREQUEST_H_
 #define MAD_COMMON_REQUESTS_STATUSREQUEST_H_
 
-#include "../XmlRequest.h"
+#include "../Request.h"
 
 namespace Mad {
 namespace Common {
 namespace Requests {
 
-class StatusRequest : public XmlRequest {
+class StatusRequest : public Request {
   protected:
     virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
     virtual void handlePacket(Net::Connection *connection, uint16_t, const XmlPacket &packet);
 
   public:
-    StatusRequest(slot_type slot) : XmlRequest(slot) {}
+    StatusRequest(slot_type slot) : Request(slot) {}
 };
 
 }
diff --git a/src/Common/Requests/UserListRequest.h b/src/Common/Requests/UserListRequest.h
index 9702a42..bcd9578 100644
--- a/src/Common/Requests/UserListRequest.h
+++ b/src/Common/Requests/UserListRequest.h
@@ -20,19 +20,19 @@
 #ifndef MAD_COMMON_REQUESTS_USERLISTREQUEST_H_
 #define MAD_COMMON_REQUESTS_USERLISTREQUEST_H_
 
-#include "../XmlRequest.h"
+#include "../Request.h"
 
 namespace Mad {
 namespace Common {
 namespace Requests {
 
-class UserListRequest : public XmlRequest {
+class UserListRequest : public Request {
   protected:
     virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
     virtual void handlePacket(Net::Connection *connection, uint16_t, const XmlPacket &packet);
 
   public:
-    UserListRequest(slot_type slot) : XmlRequest(slot) {}
+    UserListRequest(slot_type slot) : Request(slot) {}
 };
 
 }