Globale Variablen durch Application-Klasse ersetzt

10 files changed, 12 insertions, 10 deletions

diff --git a/src/Common/Requests/DisconnectRequest.h b/src/Common/Requests/DisconnectRequest.h
index 6da0ac9..f8150bd 100644
--- a/src/Common/Requests/DisconnectRequest.h
+++ b/src/Common/Requests/DisconnectRequest.h
@@ -30,6 +30,9 @@ class DisconnectRequest : public Request {
   protected:
     virtual void sendRequest();
     virtual void handlePacket(boost::shared_ptr<const XmlPacket> packet);
+
+  public:
+    DisconnectRequest(Application *application) : Request(application) {}
 };
 
 }
diff --git a/src/Common/Requests/FSInfoRequest.h b/src/Common/Requests/FSInfoRequest.h
index 250889a..2bd9eeb 100644
--- a/src/Common/Requests/FSInfoRequest.h
+++ b/src/Common/Requests/FSInfoRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class FSInfoRequest : public SimpleRequest {
   public:
-    FSInfoRequest() : SimpleRequest("FSInfo") {}
+    FSInfoRequest(Application *application) : SimpleRequest(application, "FSInfo") {}
 };
 
 }
diff --git a/src/Common/Requests/GroupListRequest.h b/src/Common/Requests/GroupListRequest.h
index b1e4115..f8760ca 100644
--- a/src/Common/Requests/GroupListRequest.h
+++ b/src/Common/Requests/GroupListRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class GroupListRequest : public SimpleRequest {
   public:
-    GroupListRequest() : SimpleRequest("ListGroups") {}
+    GroupListRequest(Application *application) : SimpleRequest(application, "ListGroups") {}
 };
 
 }
diff --git a/src/Common/Requests/GroupUserListRequest.h b/src/Common/Requests/GroupUserListRequest.h
index bb735f1..f95cd3b 100644
--- a/src/Common/Requests/GroupUserListRequest.h
+++ b/src/Common/Requests/GroupUserListRequest.h
@@ -34,7 +34,7 @@ class GroupUserListRequest : public Request {
     virtual void sendRequest();
 
   public:
-    GroupUserListRequest(unsigned long gid0) : gid(gid0) {}
+    GroupUserListRequest(Application *application, unsigned long gid0) : Request(application), gid(gid0) {}
 };
 
 }
diff --git a/src/Common/Requests/IdentifyRequest.h b/src/Common/Requests/IdentifyRequest.h
index 3084ce6..2ca9d8e 100644
--- a/src/Common/Requests/IdentifyRequest.h
+++ b/src/Common/Requests/IdentifyRequest.h
@@ -36,7 +36,7 @@ class IdentifyRequest : public Common::Request {
     virtual void sendRequest();
 
   public:
-    IdentifyRequest(const std::string &hostname0 = std::string()) : hostname(hostname0) {}
+    IdentifyRequest(Application *application, const std::string &hostname0 = std::string()) : Request(application), hostname(hostname0) {}
 };
 
 }
diff --git a/src/Common/Requests/SimpleRequest.h b/src/Common/Requests/SimpleRequest.h
index d381ecf..649f34c 100644
--- a/src/Common/Requests/SimpleRequest.h
+++ b/src/Common/Requests/SimpleRequest.h
@@ -34,7 +34,7 @@ class SimpleRequest : public Request {
 
     virtual void sendRequest();
 
-    SimpleRequest(const std::string &type0) : type(type0) {}
+    SimpleRequest(Application *application, const std::string &type0) : Request(application), type(type0) {}
 };
 
 }
diff --git a/src/Common/Requests/StatusRequest.h b/src/Common/Requests/StatusRequest.h
index b9b9f02..c30e0d5 100644
--- a/src/Common/Requests/StatusRequest.h
+++ b/src/Common/Requests/StatusRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class StatusRequest : public SimpleRequest {
   public:
-    StatusRequest() : SimpleRequest("GetStatus") {}
+    StatusRequest(Application *application) : SimpleRequest(application, "GetStatus") {}
 };
 
 }
diff --git a/src/Common/Requests/UserGroupListRequest.h b/src/Common/Requests/UserGroupListRequest.h
index 82db411..4cd27b6 100644
--- a/src/Common/Requests/UserGroupListRequest.h
+++ b/src/Common/Requests/UserGroupListRequest.h
@@ -34,7 +34,7 @@ class UserGroupListRequest : public Request {
     virtual void sendRequest();
 
   public:
-    UserGroupListRequest(unsigned long uid0) : uid(uid0) {}
+    UserGroupListRequest(Application *application, unsigned long uid0) : Request(application), uid(uid0) {}
 };
 
 }
diff --git a/src/Common/Requests/UserInfoRequest.h b/src/Common/Requests/UserInfoRequest.h
index c9ac89b..7b4b2fc 100644
--- a/src/Common/Requests/UserInfoRequest.h
+++ b/src/Common/Requests/UserInfoRequest.h
@@ -34,8 +34,7 @@ class UserInfoRequest : public Request {
     virtual void sendRequest();
 
   public:
-    UserInfoRequest(unsigned long uid0)
-    : uid(uid0) {}
+    UserInfoRequest(Application *application, unsigned long uid0) : Request(application), uid(uid0) {}
 };
 
 }
diff --git a/src/Common/Requests/UserListRequest.h b/src/Common/Requests/UserListRequest.h
index 9b69564..9196166 100644
--- a/src/Common/Requests/UserListRequest.h
+++ b/src/Common/Requests/UserListRequest.h
@@ -28,7 +28,7 @@ namespace Requests {
 
 class UserListRequest : public SimpleRequest {
   public:
-    UserListRequest() : SimpleRequest("ListUsers") {}
+    UserListRequest(Application *application) : SimpleRequest(application, "ListUsers") {}
 };
 
 }