1 files changed, 5 insertions, 11 deletions
diff --git a/src/Client/Requests/CoreStatusRequest.h b/src/Client/Requests/CoreStatusRequest.h
index ff9bdc1..94aff9c 100644
--- a/src/Client/Requests/CoreStatusRequest.h
+++ b/src/Client/Requests/CoreStatusRequest.h
@@ -22,8 +22,6 @@
 
 #include <Common/Request.h>
 
-#include <sigc++/signal.h>
-
 namespace Mad {
 
 namespace Net {
@@ -35,17 +33,13 @@ class HostStatusPacket;
 namespace Client {
 namespace Requests {
 
-class CoreStatusRequest : public Common::Request {
-  private:
-    sigc::signal<void,const Net::Packets::HostStatusPacket&> finished;
-
-    CoreStatusRequest() {}
+class CoreStatusRequest : public Common::Request<Net::Packets::HostStatusPacket> {
+  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);
-
-    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId);
-    virtual void handlePacket(Net::Connection*, const Net::Packet &packet);
+    CoreStatusRequest(slot_type slot) : Common::Request<Net::Packets::HostStatusPacket>(slot) {}
 };
 
 }