From 039c218a7b1f2eae4f8e8305bc8e8bf70a67beab Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Wed, 17 Sep 2008 05:33:01 +0200
Subject: Interface der Request-Klassen verbessert; muss noch vereinfacht
 werden

---
 src/Client/Requests/DaemonStatusRequest.h | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/Client/Requests/DaemonStatusRequest.h')

diff --git a/src/Client/Requests/DaemonStatusRequest.h b/src/Client/Requests/DaemonStatusRequest.h
index f5c130d..8f74ca4 100644
--- a/src/Client/Requests/DaemonStatusRequest.h
+++ b/src/Client/Requests/DaemonStatusRequest.h
@@ -23,7 +23,6 @@
 #include <Common/Request.h>
 
 #include <string>
-#include <sigc++/signal.h>
 
 namespace Mad {
 
@@ -40,21 +39,16 @@ class HostStatusPacket;
 namespace Client {
 namespace Requests {
 
-class DaemonStatusRequest : public Common::Request {
+class DaemonStatusRequest : public Common::Request<Net::Packets::HostStatusPacket> {
   private:
-    sigc::signal<void,const Net::Packets::HostStatusPacket&> finished;
-    sigc::signal<void,const Common::Exception&> error;
-
     std::string daemon;
 
-    DaemonStatusRequest(const std::string &daemon0) : daemon(daemon0) {}
+  protected:
+    virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
+    virtual void handlePacket(Net::Connection *connection, const Net::Packet &packet);
 
   public:
-    static bool send(Net::Connection *connection, const sigc::slot<void,const Net::Packets::HostStatusPacket&> &callback,
-        const sigc::slot<void,const Common::Exception&> &errorCallback, const std::string &daemon0);
-
-    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId);
-    virtual void handlePacket(Net::Connection*, const Net::Packet &packet);
+    DaemonStatusRequest(const std::string &daemon0, slot_type slot) : Common::Request<Net::Packets::HostStatusPacket>(slot), daemon(daemon0) {}
 };
 
 }
-- 
cgit v1.2.3