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/client/ClientStore.cpp | 2 +- src/client/ClientStore.hpp | 10 +++++----- src/client/ConnectionModel.hpp | 4 ++-- src/client/DeprecatedLoader.cpp | 3 +-- src/client/DeprecatedLoader.hpp | 4 ++-- src/client/NodeModel.cpp | 3 +-- src/client/NodeModel.hpp | 4 ++-- src/client/OSCClientReceiver.cpp | 2 +- src/client/OSCEngineSender.cpp | 2 +- src/client/ObjectModel.cpp | 2 +- src/client/ObjectModel.hpp | 8 ++++---- src/client/PatchModel.cpp | 6 +++--- src/client/PatchModel.hpp | 2 +- src/client/PluginModel.cpp | 2 +- src/client/PluginModel.hpp | 8 ++++---- src/client/PluginUI.hpp | 4 ++-- src/client/PortModel.hpp | 4 ++-- src/client/ThreadedSigClientInterface.hpp | 4 ++-- src/client/client.hpp | 2 +- 19 files changed, 37 insertions(+), 39 deletions(-) (limited to 'src/client') diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 18582046..8c54e96e 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "raul/PathTable.hpp" #include "ClientStore.hpp" #include "ObjectModel.hpp" #include "PatchModel.hpp" diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index f08fcd9b..4df8149b 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -21,12 +21,12 @@ #include #include #include -#include +#include "raul/SharedPtr.hpp" #include -#include -#include -#include -#include +#include "raul/Path.hpp" +#include "raul/Atom.hpp" +#include "raul/PathTable.hpp" +#include "raul/TableImpl.hpp" #include "interface/EngineInterface.hpp" #include "shared/Store.hpp" using std::string; using std::list; diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp index 91c448df..46b9050a 100644 --- a/src/client/ConnectionModel.hpp +++ b/src/client/ConnectionModel.hpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "interface/Connection.hpp" #include "PortModel.hpp" diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 6284d42c..84f47aeb 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -15,7 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include #include #include @@ -29,7 +28,7 @@ #include #include #include -#include +#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "PatchModel.hpp" #include "NodeModel.hpp" diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp index f7213aca..ad1a8069 100644 --- a/src/client/DeprecatedLoader.hpp +++ b/src/client/DeprecatedLoader.hpp @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "interface/GraphObject.hpp" #include "ObjectModel.hpp" diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index ee4988e3..2975ecff 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -15,10 +15,9 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include #include +#include "config.h" #include "interface/Port.hpp" #include "NodeModel.hpp" #include "PatchModel.hpp" diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index b7bbb5af..3ce16413 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "interface/Node.hpp" #include "interface/Port.hpp" #include "ObjectModel.hpp" diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 8ebd9d8e..f1c4e4eb 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -16,7 +16,7 @@ */ #include "OSCClientReceiver.hpp" -#include +#include "raul/AtomLiblo.hpp" #include #include #include diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index c21d16ce..0111ac8f 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include "raul/AtomLiblo.hpp" #include "OSCEngineSender.hpp" using namespace std; diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index ede5f822..b1a0169f 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include "raul/TableImpl.hpp" #include "interface/GraphObject.hpp" #include "ObjectModel.hpp" diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp index 11cc87a4..ac54ff98 100644 --- a/src/client/ObjectModel.hpp +++ b/src/client/ObjectModel.hpp @@ -25,10 +25,10 @@ #include #include #include -#include -#include -#include -#include +#include "raul/Atom.hpp" +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/PathTable.hpp" #include "interface/GraphObject.hpp" using Raul::PathTable; diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp index af20c9f8..d9f62b45 100644 --- a/src/client/PatchModel.cpp +++ b/src/client/PatchModel.cpp @@ -15,14 +15,14 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include #include "PatchModel.hpp" #include "NodeModel.hpp" #include "ConnectionModel.hpp" #include "ClientStore.hpp" -#include -#include -using std::cerr; using std::cout; using std::endl; +using namespace std; namespace Ingen { namespace Client { diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp index ac1e2ac0..64ceaddf 100644 --- a/src/client/PatchModel.hpp +++ b/src/client/PatchModel.hpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include "raul/SharedPtr.hpp" #include "interface/Patch.hpp" #include "NodeModel.hpp" diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index ff7e5b5c..2b824034 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include "raul/Path.hpp" #include "PluginModel.hpp" #include "PatchModel.hpp" #include "PluginUI.hpp" diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index 9260e39c..f27bb232 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -21,11 +21,11 @@ #include "config.h" #include #include -#include -#include -#include +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" +#include "redlandmm/World.hpp" #ifdef HAVE_SLV2 -#include +#include "slv2/slv2.h" #endif #include "interface/EngineInterface.hpp" #include "interface/Plugin.hpp" diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp index d20dd16a..81aa23a4 100644 --- a/src/client/PluginUI.hpp +++ b/src/client/PluginUI.hpp @@ -18,8 +18,8 @@ #ifndef PLUGINUI_H #define PLUGINUI_H -#include -#include +#include "slv2/slv2.h" +#include "raul/SharedPtr.hpp" #include "module/World.hpp" namespace Ingen { diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index 0a078aaa..a0486ed5 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" #include "interface/Port.hpp" #include "ObjectModel.hpp" diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index 3014c139..a5a667df 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -24,8 +24,8 @@ #include #include "interface/ClientInterface.hpp" #include "SigClientInterface.hpp" -#include -#include +#include "raul/Atom.hpp" +#include "raul/SRSWQueue.hpp" using std::string; diff --git a/src/client/client.hpp b/src/client/client.hpp index 82166da5..c33b0abd 100644 --- a/src/client/client.hpp +++ b/src/client/client.hpp @@ -18,7 +18,7 @@ #ifndef INGEN_CLIENT_H #define INGEN_CLIENT_H -#include +#include "raul/SharedPtr.hpp" namespace Ingen { -- cgit v1.2.1