diff options
Diffstat (limited to 'src/Common/Request.h')
-rw-r--r-- | src/Common/Request.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Common/Request.h b/src/Common/Request.h index 268a196..d46e1b7 100644 --- a/src/Common/Request.h +++ b/src/Common/Request.h @@ -43,15 +43,15 @@ class MAD_COMMON_EXPORT Request : public RequestHandler { boost::condition_variable finishCond; bool isFinished; - boost::shared_ptr<const XmlPacket> packet; + boost::shared_ptr<const XmlData> packet; Core::Exception exception; - Core::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Core::Exception> finished; + Core::Signals::Signal2<boost::shared_ptr<const XmlData>, Core::Exception> finished; protected: Request(Application *application) : RequestHandler(application), isFinished(false), finished(application) {} - void signalFinished(boost::shared_ptr<const XmlPacket> pkt, Core::Exception exp) { + void signalFinished(boost::shared_ptr<const XmlData> pkt, Core::Exception exp) { { boost::lock_guard<boost::mutex> lock(mutex); @@ -66,23 +66,23 @@ class MAD_COMMON_EXPORT Request : public RequestHandler { RequestHandler::signalFinished(); } - void signalFinished(boost::shared_ptr<const XmlPacket> packet) { + void signalFinished(boost::shared_ptr<const XmlData> packet) { signalFinished(packet, Core::Exception()); } void signalFinished(Core::Exception exp) { - signalFinished(boost::shared_ptr<const XmlPacket>(), exp); + signalFinished(boost::shared_ptr<const XmlData>(), exp); } void signalFinished() { - signalFinished(boost::shared_ptr<const XmlPacket>(), Core::Exception()); + signalFinished(boost::shared_ptr<const XmlData>(), Core::Exception()); } virtual void sendRequest() = 0; - virtual void handlePacket(boost::shared_ptr<const XmlPacket> packet); + virtual void handlePacket(boost::shared_ptr<const XmlData> packet); public: - Core::Signals::Connection connectSignalFinished(const Core::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Core::Exception>::slot_type &slot) { + Core::Signals::Connection connectSignalFinished(const Core::Signals::Signal2<boost::shared_ptr<const XmlData>, Core::Exception>::slot_type &slot) { return finished.connect(slot); } void disconnectSignalFinished(const Core::Signals::Connection &con) { @@ -96,11 +96,11 @@ class MAD_COMMON_EXPORT Request : public RequestHandler { finishCond.wait(lock); } - std::pair<boost::shared_ptr<const XmlPacket>, Core::Exception> getResult() { + std::pair<boost::shared_ptr<const XmlData>, Core::Exception> getResult() { boost::lock_guard<boost::mutex> lock(mutex); if(!isFinished) - return std::make_pair(boost::shared_ptr<const XmlPacket>(), Core::Exception(Core::Exception::NOT_FINISHED)); + return std::make_pair(boost::shared_ptr<const XmlData>(), Core::Exception(Core::Exception::NOT_FINISHED)); else return std::make_pair(packet, exception); } |