From 18dbb3f103795daab90cabf83335c51cb7c05621 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 18 Oct 2008 16:58:12 +0000 Subject: Build against local library versions no matter what.... hopefully.... git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1677 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/App.cpp | 6 +++--- src/gui/App.hpp | 4 ++-- src/gui/BreadCrumb.hpp | 4 ++-- src/gui/BreadCrumbBox.hpp | 4 ++-- src/gui/ConnectWindow.cpp | 2 +- src/gui/ConnectWindow.hpp | 4 ++-- src/gui/Connection.hpp | 4 ++-- src/gui/ControlPanel.hpp | 2 +- src/gui/Controls.hpp | 2 +- src/gui/LoadPatchWindow.hpp | 2 +- src/gui/LoadPluginWindow.hpp | 4 ++-- src/gui/LoadRemotePatchWindow.cpp | 2 +- src/gui/LoadRemotePatchWindow.hpp | 2 +- src/gui/LoadSubpatchWindow.hpp | 2 +- src/gui/NewSubpatchWindow.hpp | 2 +- src/gui/NodeControlWindow.hpp | 2 +- src/gui/NodeMenu.hpp | 4 ++-- src/gui/NodeModule.cpp | 2 +- src/gui/NodeModule.hpp | 4 ++-- src/gui/NodePropertiesWindow.hpp | 2 +- src/gui/ObjectMenu.hpp | 4 ++-- src/gui/PatchCanvas.cpp | 4 ++-- src/gui/PatchCanvas.hpp | 8 ++++---- src/gui/PatchPortModule.hpp | 4 ++-- src/gui/PatchPropertiesWindow.hpp | 2 +- src/gui/PatchTreeWindow.cpp | 2 +- src/gui/PatchTreeWindow.hpp | 2 +- src/gui/PatchView.hpp | 2 +- src/gui/PatchWindow.hpp | 4 ++-- src/gui/Port.hpp | 6 +++--- src/gui/PortMenu.cpp | 2 +- src/gui/PortMenu.hpp | 4 ++-- src/gui/PortPropertiesWindow.hpp | 2 +- src/gui/RenameWindow.hpp | 2 +- src/gui/SubpatchModule.hpp | 2 +- src/gui/ThreadedLoader.hpp | 4 ++-- src/gui/UploadPatchWindow.cpp | 2 +- src/gui/UploadPatchWindow.hpp | 6 +++--- src/gui/WindowFactory.hpp | 2 +- src/gui/gui.hpp | 2 +- 40 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src/gui') diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 49f25b1e..7e414297 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include "raul/Path.hpp" +#include "flowcanvas/Connection.hpp" #include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" @@ -48,7 +48,7 @@ #include "WindowFactory.hpp" #include "Port.hpp" #ifdef HAVE_SLV2 -#include +#include "slv2/slv2.h" #endif using namespace std; diff --git a/src/gui/App.hpp b/src/gui/App.hpp index f9b39d40..d3399f63 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include "raul/SharedPtr.hpp" +#include "raul/Deletable.hpp" #include namespace Ingen { diff --git a/src/gui/BreadCrumb.hpp b/src/gui/BreadCrumb.hpp index c3b05e01..45bdae31 100644 --- a/src/gui/BreadCrumb.hpp +++ b/src/gui/BreadCrumb.hpp @@ -19,8 +19,8 @@ #define BREADCRUMB_H #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "PatchView.hpp" namespace Ingen { diff --git a/src/gui/BreadCrumbBox.hpp b/src/gui/BreadCrumbBox.hpp index b5650252..caaca612 100644 --- a/src/gui/BreadCrumbBox.hpp +++ b/src/gui/BreadCrumbBox.hpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "PatchView.hpp" namespace Ingen { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 906a16dc..41d26f5b 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include "raul/Process.hpp" #include "config.h" #include "interface/EngineInterface.hpp" #include "module/World.hpp" diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index 1635dbde..06283c70 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -21,13 +21,13 @@ #include "config.h" #ifdef HAVE_SLV2 -#include +#include "slv2/slv2.h" #endif #include #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/ThreadedSigClientInterface.hpp" using Ingen::Client::SigClientInterface; diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp index 55378891..5291a7c7 100644 --- a/src/gui/Connection.hpp +++ b/src/gui/Connection.hpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "flowcanvas/Connection.hpp" +#include "raul/SharedPtr.hpp" #include "client/ConnectionModel.hpp" using Ingen::Client::ConnectionModel; diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index 8af5a728..579531d8 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include "raul/Path.hpp" #include "Controls.hpp" namespace Ingen { namespace Client { diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp index 8a9c4064..db480dc2 100644 --- a/src/gui/Controls.hpp +++ b/src/gui/Controls.hpp @@ -23,7 +23,7 @@ #include #include #include "client/PortModel.hpp" -#include +#include "raul/SharedPtr.hpp" namespace Ingen { namespace Client { class PortModel; } } using namespace Ingen::Client; diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp index 4f3521e5..22d2509a 100644 --- a/src/gui/LoadPatchWindow.hpp +++ b/src/gui/LoadPatchWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PluginModel.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index ee804773..0faf4eb9 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "raul/SharedPtr.hpp" +#include "raul/Table.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index 5567d67b..c2979e80 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include "redlandmm/Query.hpp" #include "client/PatchModel.hpp" #include "interface/EngineInterface.hpp" #include "module/World.hpp" diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp index ca0ca814..e343fc64 100644 --- a/src/gui/LoadRemotePatchWindow.hpp +++ b/src/gui/LoadRemotePatchWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/LoadSubpatchWindow.hpp b/src/gui/LoadSubpatchWindow.hpp index ee8a5a16..e3d138c3 100644 --- a/src/gui/LoadSubpatchWindow.hpp +++ b/src/gui/LoadSubpatchWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" #include "interface/GraphObject.hpp" diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp index 00fb6a3b..b3482fdd 100644 --- a/src/gui/NewSubpatchWindow.hpp +++ b/src/gui/NewSubpatchWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp index 84e462c5..2e6c5837 100644 --- a/src/gui/NodeControlWindow.hpp +++ b/src/gui/NodeControlWindow.hpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include "raul/SharedPtr.hpp" using std::string; using std::vector; namespace Ingen { namespace Client { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index 67bed69a..d31aded2 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/NodeModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 742ad4c4..16e624e4 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include "raul/Atom.hpp" #include "interface/EngineInterface.hpp" #include "client/NodeModel.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 5747bf30..b9425a86 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -19,8 +19,8 @@ #include #include -#include -#include +#include "flowcanvas/Module.hpp" +#include "raul/SharedPtr.hpp" #include "Port.hpp" class Atom; diff --git a/src/gui/NodePropertiesWindow.hpp b/src/gui/NodePropertiesWindow.hpp index 248c8b42..0152ed5b 100644 --- a/src/gui/NodePropertiesWindow.hpp +++ b/src/gui/NodePropertiesWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/NodeModel.hpp" using namespace Ingen::Client; diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index b5c5bf49..838b8052 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/ObjectModel.hpp" using Ingen::Client::ObjectModel; diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index bc7832ea..cb596791 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -20,8 +20,8 @@ #include "module/World.hpp" #include -#include -#include +#include "flowcanvas/Canvas.hpp" +#include "flowcanvas/Ellipse.hpp" #include "interface/EngineInterface.hpp" #include "shared/Builder.hpp" #include "shared/ClashAvoider.hpp" diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index 98c71aff..5896957e 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -23,10 +23,10 @@ #include #include #include -#include -#include -#include -#include +#include "flowcanvas/Canvas.hpp" +#include "flowcanvas/Module.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" #include "client/ConnectionModel.hpp" #include "client/PatchModel.hpp" #include "interface/GraphObject.hpp" diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index d6715834..eec1b2c4 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "flowcanvas/Module.hpp" +#include "raul/Atom.hpp" #include "Port.hpp" using std::string; diff --git a/src/gui/PatchPropertiesWindow.hpp b/src/gui/PatchPropertiesWindow.hpp index 59d27389..1020bffc 100644 --- a/src/gui/PatchPropertiesWindow.hpp +++ b/src/gui/PatchPropertiesWindow.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include "raul/SharedPtr.hpp" using std::string; namespace Ingen { namespace Client { class PatchModel; } } diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 5afce50a..cf422409 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "client/ClientStore.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index f549a322..6fcea6d9 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/Path.hpp" namespace Ingen { namespace Client { class ClientStore; diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index 2c0570bd..209480f2 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" using std::string; diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp index 4d4f0f1e..3673e1a8 100644 --- a/src/gui/PatchWindow.hpp +++ b/src/gui/PatchWindow.hpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" #include "PatchView.hpp" using Ingen::Client::PatchModel; diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index 7b347194..ebf9a59e 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include "flowcanvas/Port.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/Atom.hpp" namespace Ingen { namespace Client { class PortModel; } } using Ingen::Client::PortModel; diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 45b216b6..ea9b2dc9 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "interface/EngineInterface.hpp" #include "client/PortModel.hpp" #include "App.hpp" diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index 520c5809..a7df2117 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/PortModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp index 4580c7c6..e8037e36 100644 --- a/src/gui/PortPropertiesWindow.hpp +++ b/src/gui/PortPropertiesWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/PortModel.hpp" using namespace Ingen::Client; diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp index 3cf37f7c..6e6a09f5 100644 --- a/src/gui/RenameWindow.hpp +++ b/src/gui/RenameWindow.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/ObjectModel.hpp" using Ingen::Client::ObjectModel; diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index 44e37e62..11c53a69 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -21,7 +21,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" #include "PatchPortModule.hpp" #include "NodeModule.hpp" diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 3cf88cf9..fee298d8 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include "raul/Thread.hpp" +#include "raul/Slave.hpp" #include #include "interface/EngineInterface.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp index 2ca54f3c..bb45cc71 100644 --- a/src/gui/UploadPatchWindow.cpp +++ b/src/gui/UploadPatchWindow.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include "redlandmm/Query.hpp" #include "module/global.hpp" #include "module/World.hpp" #include "client/ClientStore.hpp" diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp index af064bdb..4c3cfdfc 100644 --- a/src/gui/UploadPatchWindow.hpp +++ b/src/gui/UploadPatchWindow.hpp @@ -22,9 +22,9 @@ #include #include #include -#include -#include -#include +#include "raul/SharedPtr.hpp" +#include "raul/Thread.hpp" +#include "raul/AtomicInt.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" using Ingen::Client::PatchModel; diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 618b027c..487cbdb4 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "PatchView.hpp" diff --git a/src/gui/gui.hpp b/src/gui/gui.hpp index 3aa86f3b..ab1be8ab 100644 --- a/src/gui/gui.hpp +++ b/src/gui/gui.hpp @@ -20,7 +20,7 @@ #include "config.h" #include "module/global.hpp" -#include +#include "raul/SharedPtr.hpp" namespace Ingen { -- cgit v1.2.1