From 69f9735ca83e3827565276479f590d51c4a6ebfb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 16 Dec 2008 08:45:46 +0000 Subject: Trim include dependency tree. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1870 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/ClientStore.hpp | 3 ++- src/client/DeprecatedLoader.cpp | 5 ----- src/client/DeprecatedLoader.hpp | 3 ++- src/client/HTTPClientReceiver.cpp | 1 + src/client/NodeModel.cpp | 1 - src/client/NodeModel.hpp | 3 ++- src/client/ObjectModel.hpp | 2 -- src/client/PluginModel.cpp | 13 +++++++++++++ src/client/PluginModel.hpp | 11 ++--------- src/client/PortModel.hpp | 3 ++- src/client/ThreadedSigClientInterface.hpp | 2 +- 11 files changed, 25 insertions(+), 22 deletions(-) (limited to 'src/client') diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index cd5ffb06..97930955 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -24,12 +24,13 @@ #include "raul/SharedPtr.hpp" #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" +namespace Raul { class Atom; } + using namespace std; using Ingen::Shared::EngineInterface; using Raul::Path; diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 82a5e578..794816bb 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -30,11 +30,6 @@ #include #include "raul/Path.hpp" #include "interface/EngineInterface.hpp" -#include "PatchModel.hpp" -#include "NodeModel.hpp" -#include "ConnectionModel.hpp" -#include "PortModel.hpp" -#include "PluginModel.hpp" #include "DeprecatedLoader.hpp" #define NS_INGEN "http://drobilla.net/ns/ingen#" diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp index ad1a8069..37d31f3f 100644 --- a/src/client/DeprecatedLoader.hpp +++ b/src/client/DeprecatedLoader.hpp @@ -26,7 +26,6 @@ #include #include #include "raul/SharedPtr.hpp" -#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "interface/GraphObject.hpp" #include "ObjectModel.hpp" @@ -35,6 +34,8 @@ using std::string; using Ingen::Shared::EngineInterface; using Ingen::Shared::GraphObject; +namespace Raul { class Path; } + namespace Ingen { namespace Client { diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp index 9464407a..969d617e 100644 --- a/src/client/HTTPClientReceiver.cpp +++ b/src/client/HTTPClientReceiver.cpp @@ -22,6 +22,7 @@ #include #include #include +#include "raul/Atom.hpp" #include "module/Module.hpp" #include "HTTPClientReceiver.hpp" diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index 9e966f63..5b1f6ce8 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -20,7 +20,6 @@ #include "config.h" #include "interface/Port.hpp" #include "NodeModel.hpp" -#include "PatchModel.hpp" namespace Ingen { namespace Client { diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index 3ce16413..1cf7233a 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -22,7 +22,6 @@ #include #include #include -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "interface/Node.hpp" #include "interface/Port.hpp" @@ -30,6 +29,8 @@ #include "PortModel.hpp" #include "PluginModel.hpp" +namespace Raul { class Path; } + namespace Ingen { namespace Client { diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp index 5f4eb11c..f1850d94 100644 --- a/src/client/ObjectModel.hpp +++ b/src/client/ObjectModel.hpp @@ -28,11 +28,9 @@ #include "raul/Atom.hpp" #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "raul/PathTable.hpp" #include "interface/GraphObject.hpp" #include "shared/ResourceImpl.hpp" -using Raul::PathTable; using std::string; using Raul::Atom; using Raul::Path; diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 7198235a..e5ec1d5c 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -16,7 +16,9 @@ */ #include +#include "config.h" #include "raul/Path.hpp" +#include "raul/Atom.hpp" #include "PluginModel.hpp" #include "PatchModel.hpp" #include "PluginUI.hpp" @@ -160,5 +162,16 @@ PluginModel::get_lv2_icon_path(SLV2Plugin plugin) } #endif + +const string +PluginModel::string_property(const std::string& name) const +{ + const Raul::Atom& atom = get_property(name); + if (atom.type() == Raul::Atom::STRING) + return atom.get_string(); + else + return ""; +} + } // namespace Client } // namespace Ingen diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index c59da63b..c93f5fda 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -21,7 +21,6 @@ #include "config.h" #include #include -#include "raul/Path.hpp" #include "raul/SharedPtr.hpp" #include "redlandmm/World.hpp" #ifdef HAVE_SLV2 @@ -92,15 +91,9 @@ public: static Redland::World* rdf_world() { return _rdf_world; } private: - const Type _type; + const Type _type; - const string string_property(const std::string& name) const { - const Raul::Atom& atom = get_property(name); - if (atom.type() == Raul::Atom::STRING) - return atom.get_string(); - else - return ""; - } + const string string_property(const std::string& name) const; #ifdef HAVE_SLV2 static SLV2World _slv2_world; diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index a0486ed5..3c4d779c 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -23,10 +23,11 @@ #include #include #include "raul/SharedPtr.hpp" -#include "raul/Path.hpp" #include "interface/Port.hpp" #include "ObjectModel.hpp" +namespace Raul { class Path; } + namespace Ingen { namespace Client { diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index dc3e342e..b855dc33 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -22,9 +22,9 @@ #include #include #include +#include "raul/Atom.hpp" #include "interface/ClientInterface.hpp" #include "SigClientInterface.hpp" -#include "raul/Atom.hpp" #include "raul/SRSWQueue.hpp" using std::string; -- cgit v1.2.1