Interface der Request-Klassen verbessert; muss noch vereinfacht werden

1 files changed, 6 insertions, 6 deletions

diff --git a/src/Client/CommandParser.h b/src/Client/CommandParser.h
index 08b21a1..4137cb3 100644
--- a/src/Client/CommandParser.h
+++ b/src/Client/CommandParser.h
@@ -20,7 +20,8 @@
 #ifndef MAD_CLIENT_COMMANDPARSER_H_
 #define MAD_CLIENT_COMMANDPARSER_H_
 
-#include <sigc++/signal.h>
+#include <Common/Request.h>
+
 #include <string>
 #include <vector>
 
@@ -74,11 +75,10 @@ class CommandParser {
     void statusCommand(const std::vector<std::string> &args);
     void exitCommand(const std::vector<std::string>&);
 
-    void coreStatusRequestFinished(const Net::Packets::HostStatusPacket &packet);
-    void daemonListRequestFinished(const Net::Packets::NameListPacket &packet);
-    void daemonStatusRequestFinished(const Net::Packets::HostStatusPacket &packet);
-
-    void errorCallback(const Common::Exception &exception);
+    void coreStatusRequestFinished(const Common::Request<Net::Packets::HostStatusPacket> &request);
+    void daemonListRequestFinished(const Common::Request<Net::Packets::NameListPacket> &request);
+    void daemonStatusRequestFinished(const Common::Request<Net::Packets::HostStatusPacket> &request);
+    void disconnectRequestFinished(const Common::Request<> &request);
 
     void requestFinished() {
       activeRequests--;