Begin moving shared headers to public include directory.

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

20 files changed, 51 insertions, 39 deletions

diff --git a/src/shared/Builder.hpp b/include/ingen/shared/Builder.hpp
index 8a21dee0..8a21dee0 100644
--- a/src/shared/Builder.hpp
+++ b/include/ingen/shared/Builder.hpp
diff --git a/src/shared/ClashAvoider.hpp b/include/ingen/shared/ClashAvoider.hpp
index 6c8e2018..6c8e2018 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/include/ingen/shared/ClashAvoider.hpp
diff --git a/src/shared/Configuration.hpp b/include/ingen/shared/Configuration.hpp
index e51bdc71..e51bdc71 100644
--- a/src/shared/Configuration.hpp
+++ b/include/ingen/shared/Configuration.hpp
diff --git a/src/shared/LV2Atom.hpp b/include/ingen/shared/LV2Atom.hpp
index df9ffde9..df9ffde9 100644
--- a/src/shared/LV2Atom.hpp
+++ b/include/ingen/shared/LV2Atom.hpp
diff --git a/src/shared/runtime_paths.hpp b/include/ingen/shared/runtime_paths.hpp
index 3ed48f00..3ed48f00 100644
--- a/src/shared/runtime_paths.hpp
+++ b/include/ingen/shared/runtime_paths.hpp
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index cfcad147..cf93b8bb 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -21,7 +21,7 @@
 #include "lv2/lv2plug.in/ns/ext/event/event.h"
 #include "lv2/lv2plug.in/ns/ext/event/event-helpers.h"
 
-#include "shared/LV2Atom.hpp"
+#include "ingen/shared/LV2Atom.hpp"
 #include "shared/LV2URIMap.hpp"
 
 #include "ingen/client/NodeModel.hpp"
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 8e234031..1063ec39 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -15,40 +15,44 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "App.hpp"
 #include <cassert>
 #include <string>
 #include <fstream>
-#include <libgnomecanvasmm.h>
-#include <gtk/gtkwindow.h>
 #include <time.h>
 #include <sys/time.h>
-#include "raul/log.hpp"
-#include "raul/Path.hpp"
-#include "lilv/lilv.h"
+
+#include <libgnomecanvasmm.h>
+#include <gtk/gtkwindow.h>
+
 #include "flowcanvas/Connection.hpp"
-#include "shared/World.hpp"
-#include "server/Engine.hpp"
 #include "ingen/ServerInterface.hpp"
-#include "shared/runtime_paths.hpp"
-#include "shared/LV2URIMap.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/client/ClientStore.hpp"
 #include "ingen/client/SigClientInterface.hpp"
-#include "NodeModule.hpp"
+#include "ingen/shared/runtime_paths.hpp"
+#include "lilv/lilv.h"
+#include "raul/Path.hpp"
+#include "raul/log.hpp"
+
+#include "server/Engine.hpp"
+#include "shared/LV2URIMap.hpp"
+#include "shared/World.hpp"
+
+#include "App.hpp"
+#include "Configuration.hpp"
+#include "ConnectWindow.hpp"
 #include "ControlPanel.hpp"
-#include "SubpatchModule.hpp"
 #include "LoadPluginWindow.hpp"
-#include "PatchWindow.hpp"
 #include "MessagesWindow.hpp"
-#include "WidgetFactory.hpp"
+#include "NodeModule.hpp"
 #include "PatchTreeWindow.hpp"
-#include "Configuration.hpp"
-#include "ConnectWindow.hpp"
+#include "PatchWindow.hpp"
+#include "Port.hpp"
+#include "SubpatchModule.hpp"
 #include "ThreadedLoader.hpp"
+#include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
-#include "Port.hpp"
 
 #define LOG(s) s << "[GUI] "
 
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 1d4cb7c8..33363f0d 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -25,7 +25,7 @@
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/ClientStore.hpp"
-#include "shared/runtime_paths.hpp"
+#include "ingen/shared/runtime_paths.hpp"
 #include "App.hpp"
 #include "LoadPatchWindow.hpp"
 #include "PatchView.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index befb706d..dba64490 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -24,8 +24,8 @@
 #include "flowcanvas/Ellipse.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "shared/LV2URIMap.hpp"
-#include "shared/Builder.hpp"
-#include "shared/ClashAvoider.hpp"
+#include "ingen/shared/Builder.hpp"
+#include "ingen/shared/ClashAvoider.hpp"
 #include "ingen/serialisation/Serialiser.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PatchModel.hpp"
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 68582fd3..f489d1db 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -15,10 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "WidgetFactory.hpp"
 #include <fstream>
+
 #include "raul/log.hpp"
-#include "shared/runtime_paths.hpp"
+
+#include "ingen/shared/runtime_paths.hpp"
+
+#include "WidgetFactory.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index aae428c8..688a75ec 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -42,9 +42,9 @@
 #include "ingen/EngineBase.hpp"
 #include "ingen/ServerInterface.hpp"
 #include "ingen/serialisation/Parser.hpp"
-#include "shared/Configuration.hpp"
+#include "ingen/shared/Configuration.hpp"
 #include "shared/World.hpp"
-#include "shared/runtime_paths.hpp"
+#include "ingen/shared/runtime_paths.hpp"
 #include "ingen/client/ThreadedSigClientInterface.hpp"
 #ifdef WITH_BINDINGS
 #include "bindings/ingen_bindings.hpp"
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index f89d1c53..90bf8e0b 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -21,7 +21,7 @@
 #include "raul/Maid.hpp"
 
 #include "shared/LV2URIMap.hpp"
-#include "shared/LV2Atom.hpp"
+#include "ingen/shared/LV2Atom.hpp"
 
 #include "AudioBuffer.hpp"
 #include "BufferFactory.hpp"
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index e5877d47..d71a504a 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -20,7 +20,7 @@
 #include "lv2/lv2plug.in/ns/ext/event/event.h"
 #include "shared/LV2URIMap.hpp"
 #include "shared/LV2Features.hpp"
-#include "shared/LV2Atom.hpp"
+#include "ingen/shared/LV2Atom.hpp"
 #include "shared/World.hpp"
 #include "AudioBuffer.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 02eed484..d61b2f40 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -43,8 +43,8 @@
 #include "ingen/ServerInterface.hpp"
 #include "shared/World.hpp"
 #include "ingen/serialisation/Parser.hpp"
-#include "shared/Configuration.hpp"
-#include "shared/runtime_paths.hpp"
+#include "ingen/shared/Configuration.hpp"
+#include "ingen/shared/runtime_paths.hpp"
 
 /** Record of a patch in this Ingen LV2 bundle */
 struct LV2Patch {
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index cac4201d..5539e958 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -24,7 +24,7 @@
 #include "ingen/Patch.hpp"
 #include "ingen/Plugin.hpp"
 #include "ingen/Port.hpp"
-#include "shared/Builder.hpp"
+#include "ingen/shared/Builder.hpp"
 #include "shared/LV2URIMap.hpp"
 
 using namespace std;
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index f2232554..b9135951 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -17,8 +17,11 @@
 
 #include <cstdio>
 #include <sstream>
+
 #include "raul/log.hpp"
-#include "ClashAvoider.hpp"
+
+#include "ingen/shared/ClashAvoider.hpp"
+
 #include "Store.hpp"
 
 using namespace std;
diff --git a/src/shared/Configuration.cpp b/src/shared/Configuration.cpp
index fca13b05..4cfc41e9 100644
--- a/src/shared/Configuration.cpp
+++ b/src/shared/Configuration.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/Atom.hpp"
 
-#include "Configuration.hpp"
+#include "ingen/shared/Configuration.hpp"
 
 using namespace Raul;
 
diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp
index 4f6afec4..4b4cbec5 100644
--- a/src/shared/LV2Atom.cpp
+++ b/src/shared/LV2Atom.cpp
@@ -15,12 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "raul/log.hpp"
-#include "raul/Atom.hpp"
-#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
+#include "ingen/shared/LV2Atom.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
+#include "raul/Atom.hpp"
+#include "raul/log.hpp"
+
 #include "LV2Features.hpp"
-#include "LV2Atom.hpp"
 #include "LV2URIMap.hpp"
 
 using namespace std;
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index e6742c85..19e85a15 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -26,7 +26,7 @@
 #include "sord/sordmm.hpp"
 
 #include "ingen/EngineBase.hpp"
-#include "shared/runtime_paths.hpp"
+#include "ingen/shared/runtime_paths.hpp"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "World.hpp"
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp
index d533c883..cf37d07b 100644
--- a/src/shared/runtime_paths.cpp
+++ b/src/shared/runtime_paths.cpp
@@ -25,8 +25,9 @@
 
 #include "raul/log.hpp"
 
+#include "ingen/shared/runtime_paths.hpp"
+
 #include "ingen-config.h"
-#include "runtime_paths.hpp"
 
 using namespace std;