summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-10-18 16:58:12 +0000
committerDavid Robillard <d@drobilla.net>2008-10-18 16:58:12 +0000
commit18dbb3f103795daab90cabf83335c51cb7c05621 (patch)
treea1b6a0ae1ab5c600a8c04e7f97cd987df24b3229 /src/client
parent49cf0af71d300585778b9bf55b74c781387a183e (diff)
downloadingen-18dbb3f103795daab90cabf83335c51cb7c05621.tar.gz
ingen-18dbb3f103795daab90cabf83335c51cb7c05621.tar.bz2
ingen-18dbb3f103795daab90cabf83335c51cb7c05621.zip
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
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp2
-rw-r--r--src/client/ClientStore.hpp10
-rw-r--r--src/client/ConnectionModel.hpp4
-rw-r--r--src/client/DeprecatedLoader.cpp3
-rw-r--r--src/client/DeprecatedLoader.hpp4
-rw-r--r--src/client/NodeModel.cpp3
-rw-r--r--src/client/NodeModel.hpp4
-rw-r--r--src/client/OSCClientReceiver.cpp2
-rw-r--r--src/client/OSCEngineSender.cpp2
-rw-r--r--src/client/ObjectModel.cpp2
-rw-r--r--src/client/ObjectModel.hpp8
-rw-r--r--src/client/PatchModel.cpp6
-rw-r--r--src/client/PatchModel.hpp2
-rw-r--r--src/client/PluginModel.cpp2
-rw-r--r--src/client/PluginModel.hpp8
-rw-r--r--src/client/PluginUI.hpp4
-rw-r--r--src/client/PortModel.hpp4
-rw-r--r--src/client/ThreadedSigClientInterface.hpp4
-rw-r--r--src/client/client.hpp2
19 files changed, 37 insertions, 39 deletions
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 <raul/PathTable.hpp>
+#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 <cassert>
#include <string>
#include <list>
-#include <raul/SharedPtr.hpp>
+#include "raul/SharedPtr.hpp"
#include <sigc++/sigc++.h>
-#include <raul/Path.hpp>
-#include <raul/Atom.hpp>
-#include <raul/PathTable.hpp>
-#include <raul/TableImpl.hpp>
+#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 <cassert>
#include <string>
#include <list>
-#include <raul/Path.hpp>
-#include <raul/SharedPtr.hpp>
+#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 <iostream>
#include <fstream>
#include <vector>
@@ -29,7 +28,7 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xpath.h>
-#include <raul/Path.hpp>
+#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 <boost/optional.hpp>
#include <glibmm/ustring.h>
#include <libxml/tree.h>
-#include <raul/SharedPtr.hpp>
-#include <raul/Path.hpp>
+#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 <cassert>
#include <cmath>
+#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 <iostream>
#include <string>
#include <sigc++/sigc++.h>
-#include <raul/Path.hpp>
-#include <raul/SharedPtr.hpp>
+#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 <raul/AtomLiblo.hpp>
+#include "raul/AtomLiblo.hpp"
#include <list>
#include <cassert>
#include <cstring>
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 <iostream>
-#include <raul/AtomLiblo.hpp>
+#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 <iostream>
-#include <raul/TableImpl.hpp>
+#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 <cassert>
#include <boost/utility.hpp>
#include <sigc++/sigc++.h>
-#include <raul/Atom.hpp>
-#include <raul/Path.hpp>
-#include <raul/SharedPtr.hpp>
-#include <raul/PathTable.hpp>
+#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 <cassert>
+#include <iostream>
#include "PatchModel.hpp"
#include "NodeModel.hpp"
#include "ConnectionModel.hpp"
#include "ClientStore.hpp"
-#include <cassert>
-#include <iostream>
-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 <list>
#include <string>
#include <sigc++/sigc++.h>
-#include <raul/SharedPtr.hpp>
+#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 <sstream>
-#include <raul/Path.hpp>
+#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 <string>
#include <iostream>
-#include <raul/Path.hpp>
-#include <raul/SharedPtr.hpp>
-#include <redlandmm/World.hpp>
+#include "raul/Path.hpp"
+#include "raul/SharedPtr.hpp"
+#include "redlandmm/World.hpp"
#ifdef HAVE_SLV2
-#include <slv2/slv2.h>
+#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 <slv2/slv2.h>
-#include <raul/SharedPtr.hpp>
+#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 <iostream>
#include <string>
#include <sigc++/sigc++.h>
-#include <raul/SharedPtr.hpp>
-#include <raul/Path.hpp>
+#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 <glibmm/thread.h>
#include "interface/ClientInterface.hpp"
#include "SigClientInterface.hpp"
-#include <raul/Atom.hpp>
-#include <raul/SRSWQueue.hpp>
+#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 <raul/SharedPtr.hpp>
+#include "raul/SharedPtr.hpp"
namespace Ingen {