diff options
Diffstat (limited to 'src/Common/Request.h')
-rw-r--r-- | src/Common/Request.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Common/Request.h b/src/Common/Request.h index 4698ae5..ac59e45 100644 --- a/src/Common/Request.h +++ b/src/Common/Request.h @@ -21,7 +21,7 @@ #define MAD_COMMON_REQUEST_H_ #include "RequestHandler.h" -#include <Net/Exception.h> +#include <Core/Exception.h> #include <memory> @@ -42,14 +42,14 @@ class Request : public RequestHandler { bool isFinished; boost::shared_ptr<const XmlPacket> packet; - Net::Exception exception; + Core::Exception exception; - Net::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Net::Exception> finished; + Core::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Core::Exception> finished; protected: Request() : isFinished(false) {} - void signalFinished(boost::shared_ptr<const XmlPacket> pkt, Net::Exception exp) { + void signalFinished(boost::shared_ptr<const XmlPacket> pkt, Core::Exception exp) { { boost::lock_guard<boost::mutex> lock(mutex); @@ -65,25 +65,25 @@ class Request : public RequestHandler { } void signalFinished(boost::shared_ptr<const XmlPacket> packet) { - signalFinished(packet, Net::Exception()); + signalFinished(packet, Core::Exception()); } - void signalFinished(Net::Exception exp) { + void signalFinished(Core::Exception exp) { signalFinished(boost::shared_ptr<const XmlPacket>(), exp); } void signalFinished() { - signalFinished(boost::shared_ptr<const XmlPacket>(), Net::Exception()); + signalFinished(boost::shared_ptr<const XmlPacket>(), Core::Exception()); } virtual void sendRequest() = 0; virtual void handlePacket(boost::shared_ptr<const XmlPacket> packet); public: - Net::Signals::Connection connectSignalFinished(const Net::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Net::Exception>::slot_type &slot) { + Core::Signals::Connection connectSignalFinished(const Core::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Core::Exception>::slot_type &slot) { return finished.connect(slot); } - void disconnectSignalFinished(const Net::Signals::Connection &con) { + void disconnectSignalFinished(const Core::Signals::Connection &con) { finished.disconnect(con); } @@ -94,11 +94,11 @@ class Request : public RequestHandler { finishCond.wait(lock); } - std::pair<boost::shared_ptr<const XmlPacket>, Net::Exception> getResult() { + std::pair<boost::shared_ptr<const XmlPacket>, Core::Exception> getResult() { boost::lock_guard<boost::mutex> lock(mutex); if(!isFinished) - return std::make_pair(boost::shared_ptr<const XmlPacket>(), Net::Exception(Net::Exception::NOT_FINISHED)); + return std::make_pair(boost::shared_ptr<const XmlPacket>(), Core::Exception(Core::Exception::NOT_FINISHED)); else return std::make_pair(packet, exception); } |