From db5ad2e09a6b38e841463dbe7eb076492b62c948 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Tue, 18 Aug 2009 15:58:17 +0200
Subject: Mad funktioniert jetzt unter Windows

---
 src/Common/Requests/CMakeLists.txt        | 10 ----------
 src/Common/Requests/DisconnectRequest.cpp |  2 +-
 src/Common/Requests/DisconnectRequest.h   |  4 +++-
 src/Common/Requests/FSInfoRequest.h       |  2 ++
 src/Common/Requests/IdentifyRequest.h     | 10 ++++++----
 src/Common/Requests/SimpleRequest.h       |  4 +++-
 src/Common/Requests/StatusRequest.h       |  2 ++
 7 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 src/Common/Requests/CMakeLists.txt

(limited to 'src/Common/Requests')

diff --git a/src/Common/Requests/CMakeLists.txt b/src/Common/Requests/CMakeLists.txt
deleted file mode 100644
index 972a47c..0000000
--- a/src/Common/Requests/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-include_directories(${INCLUDES})
-
-add_library(Requests STATIC
-  DisconnectRequest.cpp DisconnectRequest.h
-  FSInfoRequest.h
-  IdentifyRequest.cpp IdentifyRequest.h
-  SimpleRequest.cpp SimpleRequest.h
-  StatusRequest.h
-)
-#target_link_libraries(Requests ${KRB5_LIBRARIES})
diff --git a/src/Common/Requests/DisconnectRequest.cpp b/src/Common/Requests/DisconnectRequest.cpp
index 11786b6..523ef2a 100644
--- a/src/Common/Requests/DisconnectRequest.cpp
+++ b/src/Common/Requests/DisconnectRequest.cpp
@@ -32,7 +32,7 @@ void DisconnectRequest::sendRequest() {
 
 void DisconnectRequest::handlePacket(boost::shared_ptr<const XmlPacket> packet) {
   if(packet->getType() == "Error") {
-      signalFinished(Core::Exception(packet->get<const std::string&>("Where"), packet->get<Core::Exception::ErrorCode>("ErrorCode"),
+    signalFinished(Core::Exception(packet->get<const std::string&>("Where"), static_cast<Core::Exception::ErrorCode>(packet->get<long>("ErrorCode")),
           packet->get<long>("SubCode"), packet->get<long>("SubSubCode")));
       return;
     }
diff --git a/src/Common/Requests/DisconnectRequest.h b/src/Common/Requests/DisconnectRequest.h
index 9ba1005..a92c7e7 100644
--- a/src/Common/Requests/DisconnectRequest.h
+++ b/src/Common/Requests/DisconnectRequest.h
@@ -20,13 +20,15 @@
 #ifndef MAD_COMMON_REQUESTS_DISCONNECTREQUEST_H_
 #define MAD_COMMON_REQUESTS_DISCONNECTREQUEST_H_
 
+#include "../export.h"
+
 #include "../Request.h"
 
 namespace Mad {
 namespace Common {
 namespace Requests {
 
-class DisconnectRequest : public Request {
+class MAD_COMMON_EXPORT DisconnectRequest : public Request {
   protected:
     virtual void sendRequest();
     virtual void handlePacket(boost::shared_ptr<const XmlPacket> packet);
diff --git a/src/Common/Requests/FSInfoRequest.h b/src/Common/Requests/FSInfoRequest.h
index 223b7a4..14aff57 100644
--- a/src/Common/Requests/FSInfoRequest.h
+++ b/src/Common/Requests/FSInfoRequest.h
@@ -20,6 +20,8 @@
 #ifndef MAD_COMMON_REQUESTS_FSINFOREQUEST_H_
 #define MAD_COMMON_REQUESTS_FSINFOREQUEST_H_
 
+#include "../export.h"
+
 #include "SimpleRequest.h"
 
 namespace Mad {
diff --git a/src/Common/Requests/IdentifyRequest.h b/src/Common/Requests/IdentifyRequest.h
index 7c7aaaf..e2e1399 100644
--- a/src/Common/Requests/IdentifyRequest.h
+++ b/src/Common/Requests/IdentifyRequest.h
@@ -17,8 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAD_DAEMON_REQUESTS_IDENTIFYREQUEST_H_
-#define MAD_DAEMON_REQUESTS_IDENTIFYREQUEST_H_
+#ifndef MAD_COMMON_REQUESTS_IDENTIFYREQUEST_H_
+#define MAD_COMMON_REQUESTS_IDENTIFYREQUEST_H_
+
+#include "../export.h"
 
 #include "../Request.h"
 
@@ -28,7 +30,7 @@ namespace Mad {
 namespace Common {
 namespace Requests {
 
-class IdentifyRequest : public Common::Request {
+class MAD_COMMON_EXPORT IdentifyRequest : public Common::Request {
   private:
     std::string hostname;
 
@@ -43,4 +45,4 @@ class IdentifyRequest : public Common::Request {
 }
 }
 
-#endif /* MAD_DAEMON_REQUESTS_IDENTIFYREQUEST_H_ */
+#endif /* MAD_COMMON_REQUESTS_IDENTIFYREQUEST_H_ */
diff --git a/src/Common/Requests/SimpleRequest.h b/src/Common/Requests/SimpleRequest.h
index 5cae38c..4bff997 100644
--- a/src/Common/Requests/SimpleRequest.h
+++ b/src/Common/Requests/SimpleRequest.h
@@ -20,6 +20,8 @@
 #ifndef MAD_COMMON_REQUESTS_SIMPLEREQUEST_H_
 #define MAD_COMMON_REQUESTS_SIMPLEREQUEST_H_
 
+#include "../export.h"
+
 #include "../Request.h"
 
 #include <string>
@@ -28,7 +30,7 @@ namespace Mad {
 namespace Common {
 namespace Requests {
 
-class SimpleRequest : public Request {
+class MAD_COMMON_EXPORT SimpleRequest : public Request {
   protected:
     const std::string type;
 
diff --git a/src/Common/Requests/StatusRequest.h b/src/Common/Requests/StatusRequest.h
index 09f4d90..0569a72 100644
--- a/src/Common/Requests/StatusRequest.h
+++ b/src/Common/Requests/StatusRequest.h
@@ -20,6 +20,8 @@
 #ifndef MAD_COMMON_REQUESTS_STATUSREQUEST_H_
 #define MAD_COMMON_REQUESTS_STATUSREQUEST_H_
 
+#include "../export.h"
+
 #include "SimpleRequest.h"
 
 namespace Mad {
-- 
cgit v1.2.3