Demodularize Parser and Serialiser.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5606 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 18 insertions, 36 deletions

diff --git a/ingen/serialisation/Parser.hpp b/ingen/Parser.hpp
index 446b3988..b4977c90 100644
--- a/ingen/serialisation/Parser.hpp
+++ b/ingen/Parser.hpp
@@ -14,12 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/**
-   @defgroup IngenSerialisation Turtle Serialisation
-*/
-
-#ifndef INGEN_SERIALISATION_PARSER_HPP
-#define INGEN_SERIALISATION_PARSER_HPP
+#ifndef INGEN_PARSER_HPP
+#define INGEN_PARSER_HPP
 
 #include <string>
 #include <list>
@@ -35,12 +31,10 @@ namespace Ingen {
 class Interface;
 class World;
 
-namespace Serialisation {
-
 /**
    Read Ingen objects from Turtle files or strings.
 
-   @ingroup IngenSerialisation
+   @ingroup Ingen
 */
 class Parser {
 public:
@@ -68,7 +62,6 @@ public:
 		boost::optional<Properties>   data   = boost::optional<Properties>());
 };
 
-} // namespace Serialisation
 } // namespace Ingen
 
-#endif // INGEN_SERIALISATION_PARSER_HPP
+#endif // INGEN_PARSER_HPP
diff --git a/ingen/serialisation/Serialiser.hpp b/ingen/Serialiser.hpp
index 80a01b89..8c82634a 100644
--- a/ingen/serialisation/Serialiser.hpp
+++ b/ingen/Serialiser.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_SERIALISATION_SERIALISER_HPP
-#define INGEN_SERIALISATION_SERIALISER_HPP
+#ifndef INGEN_SERIALISER_HPP
+#define INGEN_SERIALISER_HPP
 
 #include <stdexcept>
 #include <string>
@@ -33,12 +33,10 @@ class Node;
 class Store;
 class World;
 
-namespace Serialisation {
-
 /**
    Write Ingen objects to Turtle files or strings.
 
-   @ingroup IngenSerialisation
+   @ingroup Ingen
 */
 class Serialiser
 {
@@ -96,7 +94,6 @@ private:
 	Impl* me;
 };
 
-} // namespace Serialisation
 } // namespace Ingen
 
-#endif // INGEN_SERIALISATION_SERIALISER_HPP
+#endif // INGEN_SERIALISER_HPP
diff --git a/ingen/World.hpp b/ingen/World.hpp
index a7c224ac..d803a4a9 100644
--- a/ingen/World.hpp
+++ b/ingen/World.hpp
@@ -31,18 +31,14 @@ namespace Sord { class World; }
 
 namespace Ingen {
 
+class Configuration;
 class EngineBase;
+class Forge;
 class Interface;
+class LV2Features;
 class Log;
-
-namespace Serialisation {
 class Parser;
 class Serialiser;
-}
-
-class Configuration;
-class Forge;
-class LV2Features;
 class Store;
 class URIMap;
 class URIs;
@@ -53,11 +49,9 @@ class URIs;
  * contains all necessary shared data (including the world for libraries like
  * Sord and Lilv) and holds references to components.
  *
- * Most functionality in Ingen is implemented in dynamically loaded modules,
+ * Some functionality in Ingen is implemented in dynamically loaded modules,
  * which are loaded using this interface.  When loaded, those modules add
- * facilities to the World which can then be used throughout the code.  For
- * example loading the "ingen_serialisation" module will set World::serialiser
- * and World::parser to valid objects.
+ * facilities to the World which can then be used throughout the code.
  *
  * The world is used in any process which uses the Ingen as a library, both
  * client and server (e.g. the world may not actually contain an Engine, since
@@ -116,15 +110,13 @@ public:
 
 	virtual void set_engine(SPtr<EngineBase> e);
 	virtual void set_interface(SPtr<Interface> e);
-	virtual void set_parser(SPtr<Serialisation::Parser> p);
-	virtual void set_serialiser(SPtr<Serialisation::Serialiser> s);
 	virtual void set_store(SPtr<Store> s);
 
-	virtual SPtr<EngineBase>                engine();
-	virtual SPtr<Interface>                 interface();
-	virtual SPtr<Serialisation::Parser>     parser();
-	virtual SPtr<Serialisation::Serialiser> serialiser();
-	virtual SPtr<Store>                     store();
+	virtual SPtr<EngineBase> engine();
+	virtual SPtr<Interface>  interface();
+	virtual SPtr<Parser>     parser();
+	virtual SPtr<Serialiser> serialiser();
+	virtual SPtr<Store>      store();
 
 	virtual int&           argc();
 	virtual char**&        argv();