diff options
Diffstat (limited to 'src/Common/Request.h')
| -rw-r--r-- | src/Common/Request.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Common/Request.h b/src/Common/Request.h index 3979e0c..6f72667 100644 --- a/src/Common/Request.h +++ b/src/Common/Request.h @@ -34,24 +34,24 @@ class Request : public RequestHandler { private: friend class RequestManager; - boost::signal1<void, const Request&> finished; + Net::Signals::Signal1<void, const Request&> finished; std::auto_ptr<XmlPacket> res; Net::Exception exp; public: - typedef boost::function1<void, const Request&> slot_type; + typedef Net::Signals::Signal1<void, const Request&>::slot_type slot_type; protected: Request(Connection *connection, uint16_t requestId, slot_type slot) : RequestHandler(connection, requestId), exp(Net::Exception::NOT_FINISHED) { finished.connect(slot); - finished.connect(boost::bind((void(boost::signal0<void>::*)())&boost::signal0<void>::operator(), &signalFinished())); + finished.connect(boost::bind(&Request::signalFinished, this)); } - void finish(std::auto_ptr<XmlPacket> result) {res = result; finished(*this);} - void finish(const XmlPacket& result) {res.reset(new XmlPacket(result)); finished(*this);} - void finishWithError(const Net::Exception &e) {exp = e; finished(*this);} + void finish(std::auto_ptr<XmlPacket> result) {res = result; finished.emit(*this);} + void finish(const XmlPacket& result) {res.reset(new XmlPacket(result)); finished.emit(*this);} + void finishWithError(const Net::Exception &e) {exp = e; finished.emit(*this);} virtual void sendRequest() = 0; virtual void handlePacket(const XmlPacket &packet); |