Reorganize modules module (heh) to make a bit more sense. But not much.

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

6 files changed, 20 insertions, 14 deletions

diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index ef81b0cc..fb185384 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -16,7 +16,6 @@
  */
 
 #include CONFIG_H_PATH
-#include "module/module.h"
 #include "App.hpp"
 #include <cassert>
 #include <string>
@@ -25,6 +24,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <raul/Path.hpp>
+#include "module/global.hpp"
+#include "module/Module.hpp"
+#include "module/World.hpp"
 #include "interface/EngineInterface.hpp"
 #include "client/ObjectModel.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/libs/gui/LoadRemotePatchWindow.cpp b/src/libs/gui/LoadRemotePatchWindow.cpp
index 20c1533c..c6020ead 100644
--- a/src/libs/gui/LoadRemotePatchWindow.cpp
+++ b/src/libs/gui/LoadRemotePatchWindow.cpp
@@ -15,16 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "module/module.h"
-#include "LoadRemotePatchWindow.hpp"
 #include <sys/types.h>
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include <raul/RDFQuery.hpp>
-#include "interface/EngineInterface.hpp"
 #include "client/PatchModel.hpp"
+#include "interface/EngineInterface.hpp"
+#include "module/World.hpp"
+#include "module/global.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
+#include "LoadRemotePatchWindow.hpp"
 #include "ThreadedLoader.hpp"
 
 using boost::optional;
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index a02235bf..07301aa4 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -16,7 +16,8 @@
  */
 
 #include CONFIG_H_PATH
-#include "module/module.h"
+#include "module/global.hpp"
+#include "module/World.hpp"
 
 #include <cassert>
 #include <flowcanvas/Canvas.hpp>
@@ -458,17 +459,17 @@ PatchCanvas::destroy_selection()
 void
 PatchCanvas::copy_selection()
 {
-	Serialiser serializer(*App::instance().world()->rdf_world);
-	serializer.start_to_string();
+	Serialiser serialiser(*App::instance().world()->rdf_world);
+	serialiser.start_to_string();
 
 	for (list<boost::shared_ptr<Item> >::iterator m = _selected_items.begin(); m != _selected_items.end(); ++m) {
 		boost::shared_ptr<NodeModule> module = boost::dynamic_pointer_cast<NodeModule>(*m);
 		if (module) {
-			serializer.serialize(module->node());
+			serialiser.serialize(module->node());
 		} else {
 			boost::shared_ptr<PatchPortModule> port_module = boost::dynamic_pointer_cast<PatchPortModule>(*m);
 			if (port_module)
-				serializer.serialize(port_module->port());
+				serialiser.serialize(port_module->port());
 		}
 	}
 	
@@ -476,10 +477,10 @@ PatchCanvas::copy_selection()
 			c != _selected_connections.end(); ++c) {
 		boost::shared_ptr<Connection> connection = boost::dynamic_pointer_cast<Connection>(*c);
 		if (connection)
-			serializer.serialize_connection(connection->model());
+			serialiser.serialize_connection(connection->model());
 	}
 	
-	string result = serializer.finish();
+	string result = serialiser.finish();
 	
 	Glib::RefPtr<Gtk::Clipboard> clipboard = Gtk::Clipboard::get();
 	clipboard->set_text(result);
diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp
index 11a2bcd7..3cac84f6 100644
--- a/src/libs/gui/ThreadedLoader.cpp
+++ b/src/libs/gui/ThreadedLoader.cpp
@@ -18,8 +18,9 @@
 #include <fstream>
 #include <cassert>
 #include <string>
+#include "module/global.hpp"
+#include "module/World.hpp"
 #include "client/PatchModel.hpp"
-#include "module/module.h"
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
 using std::cout; using std::endl;
diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp
index a31f0cf0..b5e414a1 100644
--- a/src/libs/gui/UploadPatchWindow.cpp
+++ b/src/libs/gui/UploadPatchWindow.cpp
@@ -22,7 +22,8 @@
 #include <boost/optional/optional.hpp>
 #include <curl/curl.h>
 #include <raul/RDFQuery.hpp>
-#include "module/module.h"
+#include "module/global.hpp"
+#include "module/World.hpp"
 #include "interface/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/libs/gui/gui.hpp b/src/libs/gui/gui.hpp
index cc290851..fa31fe8d 100644
--- a/src/libs/gui/gui.hpp
+++ b/src/libs/gui/gui.hpp
@@ -19,7 +19,7 @@
 #define INGEN_GUI_H
 
 #include CONFIG_H_PATH
-#include "module/module.h"
+#include "module/global.hpp"
 #include <raul/SharedPtr.hpp>
 
 namespace Ingen {