From 562af4e2b648852b754a758e609c6202bb975c0f Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 20 Aug 2016 12:31:42 +0100
Subject: Change visibility and protection levels to allow inheritence from
 other libraries

---
 slicer/json/serializer.h | 36 ++++++++++++++++++------------------
 slicer/xml/serializer.h  | 42 +++++++++++++++++++++---------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/slicer/json/serializer.h b/slicer/json/serializer.h
index 64f591b..c7e0fc3 100644
--- a/slicer/json/serializer.h
+++ b/slicer/json/serializer.h
@@ -13,63 +13,63 @@ namespace Slicer {
 			static void ModelTreeIterateRoot(json::Value *, ModelPartPtr mp);
 	};
 
-	class JsonStreamSerializer : public JsonSerializer {
+	class DLL_PUBLIC JsonStreamSerializer : public JsonSerializer {
 		public:
-			DLL_PUBLIC JsonStreamSerializer(std::ostream &);
+			JsonStreamSerializer(std::ostream &);
 
 			virtual void Serialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			std::ostream & strm;
 	};
 
-	class JsonFileSerializer : public JsonSerializer {
+	class DLL_PUBLIC JsonFileSerializer : public JsonSerializer {
 		public:
-			DLL_PUBLIC JsonFileSerializer(const boost::filesystem::path &);
+			JsonFileSerializer(const boost::filesystem::path &);
 
 			virtual void Serialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			const boost::filesystem::path path;
 	};
 
-	class JsonValueSerializer : public JsonSerializer {
+	class DLL_PUBLIC JsonValueSerializer : public JsonSerializer {
 		public:
-			DLL_PUBLIC JsonValueSerializer(json::Value &);
+			JsonValueSerializer(json::Value &);
 
 			virtual void Serialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			json::Value & value;
 	};
 
-	class JsonStreamDeserializer : public Deserializer {
+	class DLL_PUBLIC JsonStreamDeserializer : public Deserializer {
 		public:
-			DLL_PUBLIC JsonStreamDeserializer(std::istream &);
+			JsonStreamDeserializer(std::istream &);
 
 			virtual void Deserialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			std::istream & strm;
 	};
 
-	class JsonFileDeserializer : public Deserializer {
+	class DLL_PUBLIC JsonFileDeserializer : public Deserializer {
 		public:
-			DLL_PUBLIC JsonFileDeserializer(const boost::filesystem::path &);
+			JsonFileDeserializer(const boost::filesystem::path &);
 
 			virtual void Deserialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			const boost::filesystem::path path;
 	};
 
-	class JsonValueDeserializer : public Deserializer {
+	class DLL_PUBLIC JsonValueDeserializer : public Deserializer {
 		public:
-			DLL_PUBLIC JsonValueDeserializer(const json::Value &);
+			JsonValueDeserializer(const json::Value &);
 
 			virtual void Deserialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			const json::Value & value;
 	};
 }
diff --git a/slicer/xml/serializer.h b/slicer/xml/serializer.h
index c580cde..054b308 100644
--- a/slicer/xml/serializer.h
+++ b/slicer/xml/serializer.h
@@ -11,79 +11,79 @@ namespace Slicer {
 			BadBooleanValue(const Glib::ustring &);
 	};
 
-	class XmlSerializer : public Serializer {
+	class DLL_PUBLIC XmlSerializer : public Serializer {
 		protected:
 			typedef boost::function<xmlpp::Element *(xmlpp::Element *, const Glib::ustring &)> ElementCreator;
 			static void ModelTreeIterate(xmlpp::Element *, const std::string &, ModelPartPtr mp, HookCommonPtr hp, const ElementCreator &);
 			static void ModelTreeIterateRoot(xmlpp::Document *, const std::string &, ModelPartPtr mp);
 
-		private:
+		protected:
 			static void ModelTreeProcessElement(xmlpp::Element * n, ModelPartPtr mp, const ElementCreator &);
 	};
 
-	class XmlStreamSerializer : public XmlSerializer {
+	class DLL_PUBLIC XmlStreamSerializer : public XmlSerializer {
 		public:
-			DLL_PUBLIC XmlStreamSerializer(std::ostream &);
+			XmlStreamSerializer(std::ostream &);
 
 			virtual void Serialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			std::ostream & strm;
 	};
 
-	class XmlFileSerializer : public XmlSerializer {
+	class DLL_PUBLIC XmlFileSerializer : public XmlSerializer {
 		public:
-			DLL_PUBLIC XmlFileSerializer(const boost::filesystem::path &);
+			XmlFileSerializer(const boost::filesystem::path &);
 
 			virtual void Serialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			const boost::filesystem::path path;
 	};
 
-	class XmlDocumentSerializer : public XmlSerializer {
+	class DLL_PUBLIC XmlDocumentSerializer : public XmlSerializer {
 		public:
-			DLL_PUBLIC XmlDocumentSerializer(xmlpp::Document * &);
+			XmlDocumentSerializer(xmlpp::Document * &);
 
 			virtual void Serialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			xmlpp::Document * & doc;
 	};
 
-	class XmlDeserializer : public Deserializer {
+	class DLL_PUBLIC XmlDeserializer : public Deserializer {
 		protected:
 			static void DocumentTreeIterate(const xmlpp::Node * node, ModelPartPtr mp);
 			static void DocumentTreeIterate(const xmlpp::Document * doc, ModelPartPtr mp);
 	};
 
-	class XmlStreamDeserializer : public XmlDeserializer {
+	class DLL_PUBLIC XmlStreamDeserializer : public XmlDeserializer {
 		public:
-			DLL_PUBLIC XmlStreamDeserializer(std::istream &);
+			XmlStreamDeserializer(std::istream &);
 
 			virtual void Deserialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			std::istream & strm;
 	};
 
-	class XmlFileDeserializer : public XmlDeserializer {
+	class DLL_PUBLIC XmlFileDeserializer : public XmlDeserializer {
 		public:
-			DLL_PUBLIC XmlFileDeserializer(const boost::filesystem::path &);
+			XmlFileDeserializer(const boost::filesystem::path &);
 
 			virtual void Deserialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			const boost::filesystem::path path;
 	};
 
-	class XmlDocumentDeserializer : public XmlDeserializer {
+	class DLL_PUBLIC XmlDocumentDeserializer : public XmlDeserializer {
 		public:
-			DLL_PUBLIC XmlDocumentDeserializer(const xmlpp::Document *);
+			XmlDocumentDeserializer(const xmlpp::Document *);
 
 			virtual void Deserialize(ModelPartPtr) override;
 
-		private:
+		protected:
 			const xmlpp::Document * doc;
 	};
 }
-- 
cgit v1.2.3