Refactored for public headers and started documentation

2 files changed, 11 insertions, 6 deletions

diff --git a/src/uscxml/messages/Blob.h b/src/uscxml/messages/Blob.h
index 9bbf0f7..403485c 100644
--- a/src/uscxml/messages/Blob.h
+++ b/src/uscxml/messages/Blob.h
@@ -65,7 +65,7 @@ protected:
 class USCXML_API Blob {
 public:
 
-	PIMPL_OPERATORS(Blob)
+	PIMPL_OPERATORS(Blob);
 
 	Blob(size_t size) : _impl(std::shared_ptr<BlobImpl>(new BlobImpl(size))) {}
 	Blob(const char* data,
diff --git a/src/uscxml/messages/Data.h b/src/uscxml/messages/Data.h
index 55b9f64..6ab3bec 100644
--- a/src/uscxml/messages/Data.h
+++ b/src/uscxml/messages/Data.h
@@ -24,11 +24,18 @@
 #include <map>
 #include <memory>
 
+#include "uscxml/config.h"
 #include "uscxml/Common.h"
 #include "uscxml/util/Convenience.h"
 #include "uscxml/messages/Blob.h"
 
-#include <xercesc/dom/DOMDocument.hpp>
+//#include <xercesc/dom/DOMDocument.hpp>
+
+// forward declare
+namespace XERCESC_NS {
+	class DOMDocument;
+	class DOMNode;
+}
 
 namespace uscxml {
 
@@ -54,8 +61,6 @@ public:
 		}
 	}
 
-	Data(xercesc::DOMNode* node) : node(node), type(VERBATIM) {}
-
 	//    template <typename T> Data(T value, Type type = INTERPRETED) : atom(toStr(value)), type(type) {}
 
 	// we will have to drop this constructor as it interferes with operator Data() and requires C++11
@@ -214,8 +219,8 @@ public:
 protected:
 #endif
 
-	xercesc::DOMNode* node;
-	std::shared_ptr<xercesc::DOMDocument*> adoptedDoc;
+	XERCESC_NS::DOMNode* node;
+	std::shared_ptr<XERCESC_NS::DOMDocument*> adoptedDoc;
 	std::map<std::string, Data> compound;
 	std::list<Data> array;
 	std::string atom;