Interface der Request-Klassen verbessert; muss noch vereinfacht werden

1 files changed, 6 insertions, 12 deletions

diff --git a/src/Client/Requests/DaemonListRequest.h b/src/Client/Requests/DaemonListRequest.h
index 9a11d19..5c57502 100644
--- a/src/Client/Requests/DaemonListRequest.h
+++ b/src/Client/Requests/DaemonListRequest.h
@@ -22,8 +22,6 @@
 
 #include <Common/Request.h>
 
-#include <sigc++/signal.h>
-
 namespace Mad {
 
 namespace Net {
@@ -35,17 +33,13 @@ class NameListPacket;
 namespace Client {
 namespace Requests {
 
-class DaemonListRequest : public Common::Request {
-  private:
-    sigc::signal<void,const Net::Packets::NameListPacket&> finished;
-
-    DaemonListRequest() {}
-
-  public:
-    static bool send(Net::Connection *connection, const sigc::slot<void,const Net::Packets::NameListPacket&> &callback);
+class DaemonListRequest : public Common::Request<Net::Packets::NameListPacket> {
+  protected:
+      virtual void sendRequest(Net::Connection *connection, uint16_t requestId);
+      virtual void handlePacket(Net::Connection *connection, const Net::Packet &packet);
 
-    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId);
-    virtual void handlePacket(Net::Connection*, const Net::Packet &packet);
+    public:
+      DaemonListRequest(slot_type slot) : Common::Request<Net::Packets::NameListPacket>(slot) {}
 };
 
 }