summaryrefslogtreecommitdiffstats
path: root/src/Common/Request.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/Request.h')
-rw-r--r--src/Common/Request.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Common/Request.h b/src/Common/Request.h
index 7048a4e..7ab2816 100644
--- a/src/Common/Request.h
+++ b/src/Common/Request.h
@@ -21,7 +21,7 @@
#define MAD_COMMON_XMLREQUEST_H_
#include "RequestHandler.h"
-#include "Exception.h"
+#include <Net/Exception.h>
#include <memory>
#include <sigc++/adaptors/hide.h>
@@ -36,27 +36,27 @@ class Request : public RequestHandler {
sigc::signal<void,const Request&> finished;
std::auto_ptr<XmlPacket> res;
- Exception exp;
+ Net::Exception exp;
public:
typedef sigc::slot<void,const Request&> slot_type;
protected:
Request(Connection *connection, uint16_t requestId, slot_type slot)
- : RequestHandler(connection, requestId), exp(Exception::NOT_FINISHED) {
+ : RequestHandler(connection, requestId), exp(Net::Exception::NOT_FINISHED) {
finished.connect(slot);
finished.connect(sigc::hide(signalFinished().make_slot()));
}
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 Exception &e) {exp = e; finished(*this);}
+ void finishWithError(const Net::Exception &e) {exp = e; finished(*this);}
virtual void sendRequest() = 0;
virtual void handlePacket(const XmlPacket &packet);
public:
- const XmlPacket& getResult() const throw(Exception) {
+ const XmlPacket& getResult() const throw(Net::Exception) {
if(res.get())
return *res;