Consistent local or installed includes for interface headers.

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

31 files changed, 32 insertions, 32 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 28e72a5f..cd14d037 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -29,7 +29,7 @@
 #include "flowcanvas/Connection.hpp"
 #include "module/World.hpp"
 #include "engine/Engine.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/runtime_paths.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 9e1a33b4..dc24498e 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -24,7 +24,7 @@
 #include "raul/log.hpp"
 #include "raul/Process.hpp"
 #include "ingen-config.h"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/Module.hpp"
 #include "module/World.hpp"
 #include "engine/tuning.hpp"
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 9434ba0e..236cb92a 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/EngineInterface.hpp"
-#include "interface/PortType.hpp"
+#include "ingen/EngineInterface.hpp"
+#include "ingen/PortType.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index 1a443ec7..ed16350e 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -18,7 +18,7 @@
 #include <cmath>
 #include <algorithm>
 #include "raul/log.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PluginModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 81066a8c..c4229f61 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <boost/optional.hpp>
 #include <glibmm/miscutils.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp
index 73f0d686..51a21332 100644
--- a/src/gui/LoadPatchWindow.hpp
+++ b/src/gui/LoadPatchWindow.hpp
@@ -21,7 +21,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 using namespace Ingen::Shared;
 
 namespace Ingen {
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 3952397a..080520c4 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <ctype.h>
 #include "ingen-config.h"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 6d97ea91..f04ed903 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -25,7 +25,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/Table.hpp"
 #include "ingen-config.h"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "client/ClientStore.hpp"
 #include "Window.hpp"
 
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index f48bd0bc..d3b0f456 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -19,7 +19,7 @@
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include "client/PatchModel.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "module/World.hpp"
 #include "App.hpp"
 #include "Configuration.hpp"
diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp
index 9c549588..32ff32b6 100644
--- a/src/gui/LoadRemotePatchWindow.hpp
+++ b/src/gui/LoadRemotePatchWindow.hpp
@@ -21,7 +21,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "Window.hpp"
 using namespace Ingen::Shared;
 
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 13ea0c47..b91bf306 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "App.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp
index e7f31313..2375d5d9 100644
--- a/src/gui/NewSubpatchWindow.hpp
+++ b/src/gui/NewSubpatchWindow.hpp
@@ -21,7 +21,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "Window.hpp"
 
 namespace Ingen {
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index 548f69c1..64c8371a 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <cmath>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 806282fb..3eb361e3 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <gtkmm.h>
 #include "ingen-config.h"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index d7523083..f85ad2f4 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -19,7 +19,7 @@
 #include "ingen-config.h"
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index b0c20af9..e821e846 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -17,7 +17,7 @@
 
 #include <utility>
 #include <gtkmm.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index d3d8c5c4..ce5de9d5 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -22,7 +22,7 @@
 #include "raul/log.hpp"
 #include "flowcanvas/Canvas.hpp"
 #include "flowcanvas/Ellipse.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/Builder.hpp"
 #include "shared/ClashAvoider.hpp"
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index 702f90bb..b0e8491d 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -28,7 +28,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/Path.hpp"
 #include "client/ConnectionModel.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 #include "NodeModule.hpp"
 
 using namespace FlowCanvas;
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index b8e74a8f..ba243b75 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <utility>
 #include "PatchPortModule.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/NodeModel.hpp"
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 3111f54c..b1462459 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/log.hpp"
 #include "raul/Path.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 1313f65e..5fd643a2 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include <fstream>
 #include "raul/log.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index c64d72b9..ca045f2f 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -22,7 +22,7 @@
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
 #include "raul/AtomRDF.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 949e459d..14769ee0 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -18,7 +18,7 @@
 #include <cassert>
 #include "raul/log.hpp"
 #include "flowcanvas/Module.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 068d8ccc..6b0591dc 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -18,7 +18,7 @@
 #include <math.h>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/PatchModel.hpp"
 #include "client/PortModel.hpp"
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 5cfe33ef..3805dad1 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/NodeModel.hpp"
 #include "client/PluginModel.hpp"
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index bafa23b6..e9a92dfa 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,7 +17,7 @@
 
 #include <cassert>
 #include <string>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ObjectModel.hpp"
 #include "client/ClientStore.hpp"
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 957496ca..695f7459 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -17,7 +17,7 @@
 
 #include "SubpatchModule.hpp"
 #include <cassert>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "client/PatchModel.hpp"
 #include "App.hpp"
 #include "NodeModule.hpp"
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 96c64af3..2e49b4d4 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -25,7 +25,7 @@
 #include "raul/Thread.hpp"
 #include "raul/Slave.hpp"
 #include <glibmm/thread.h>
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/Parser.hpp"
 using std::string;
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index d2982bc3..bce639b9 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -24,7 +24,7 @@
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "client/ClientStore.hpp"
-#include "interface/EngineInterface.hpp"
+#include "ingen/EngineInterface.hpp"
 #include "serialisation/Serialiser.hpp"
 #include "serialisation/names.hpp"
 #include "client/PatchModel.hpp"
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index a00ffc1e..e8eb7837 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -21,7 +21,7 @@
 #include <map>
 #include <gtkmm.h>
 #include "raul/SharedPtr.hpp"
-#include "interface/GraphObject.hpp"
+#include "ingen/GraphObject.hpp"
 
 using namespace Ingen::Shared;
 
diff --git a/src/gui/wscript b/src/gui/wscript
index 81965960..49d19fa1 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -46,7 +46,7 @@ def build(bld):
 		obj.source += 'UploadPatchWindow.cpp'
 
 	obj.export_includes = ['.']
-	obj.includes        = ['.', '..', '../..', '../common', '../client', '../module']
+	obj.includes        = ['.', '..', '../..', '../../include', '../client', '../module']
 	obj.name            = 'libingen_gui'
 	obj.target          = 'ingen_gui'
 	obj.install_path    = '${LIBDIR}'