diff options
| -rw-r--r-- | src/client/HTTPClientReceiver.hpp | 1 | ||||
| -rw-r--r-- | src/client/NodeModel.hpp | 1 | ||||
| -rw-r--r-- | src/common/interface/CommonInterface.hpp | 4 | ||||
| -rw-r--r-- | src/common/interface/GraphObject.hpp | 8 | ||||
| -rw-r--r-- | src/engine/GraphObjectImpl.hpp | 1 | ||||
| -rw-r--r-- | src/gui/PatchCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/serialisation/Serialiser.cpp | 2 |
7 files changed, 8 insertions, 11 deletions
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp index 6d589b3a..7cb42948 100644 --- a/src/client/HTTPClientReceiver.hpp +++ b/src/client/HTTPClientReceiver.hpp @@ -24,6 +24,7 @@ #include <glibmm/thread.h> #include "redlandmm/World.hpp" #include "raul/Deletable.hpp" +#include "raul/SharedPtr.hpp" #include "raul/Thread.hpp" #include "interface/ClientInterface.hpp" #include "serialisation/Parser.hpp" diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index 63bcb323..b5af737e 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -21,6 +21,7 @@ #include <cstdlib> #include <iostream> #include <string> +#include <vector> #include <sigc++/sigc++.h> #include "raul/SharedPtr.hpp" #include "interface/Node.hpp" diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp index 5855bfaa..e3c5998d 100644 --- a/src/common/interface/CommonInterface.hpp +++ b/src/common/interface/CommonInterface.hpp @@ -45,8 +45,8 @@ public: /** End (and send) an atomic bundle */ virtual void bundle_end() = 0; - virtual void put(const Raul::URI& uri, - const Ingen::Shared::Resource::Properties& properties) = 0; + virtual void put(const Raul::URI& uri, + const Resource::Properties& properties) = 0; virtual void move(const Raul::Path& old_path, const Raul::Path& new_path) = 0; diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp index fa2b75c6..072fbff9 100644 --- a/src/common/interface/GraphObject.hpp +++ b/src/common/interface/GraphObject.hpp @@ -18,13 +18,9 @@ #ifndef GRAPHOBJECT_H #define GRAPHOBJECT_H -#include <string> -#include <map> #include "raul/Deletable.hpp" -#include "raul/PathTable.hpp" +#include "raul/Path.hpp" #include "raul/Symbol.hpp" -#include "raul/SharedPtr.hpp" -#include "raul/WeakPtr.hpp" #include "interface/Resource.hpp" namespace Raul { class Atom; } @@ -43,8 +39,6 @@ class GraphObject : public Raul::Deletable , public virtual Resource { public: - typedef Raul::PathTable< SharedPtr<GraphObject> >::const_iterator const_iterator; - virtual const Resource& meta() const = 0; virtual Resource& meta() = 0; diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp index 66bda3e2..e855cbb9 100644 --- a/src/engine/GraphObjectImpl.hpp +++ b/src/engine/GraphObjectImpl.hpp @@ -24,6 +24,7 @@ #include <cassert> #include "raul/Deletable.hpp" #include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "shared/ResourceImpl.hpp" diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 46a1c003..aaab8bdf 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -254,7 +254,7 @@ PatchCanvas::build() boost::dynamic_pointer_cast<PatchCanvas>(shared_from_this()); // Create modules for nodes - for (ObjectModel::const_iterator i = App::instance().store()->children_begin(_patch); + for (Store::const_iterator i = App::instance().store()->children_begin(_patch); i != App::instance().store()->children_end(_patch); ++i) { SharedPtr<NodeModel> node = PtrCast<NodeModel>(i->second); if (node && node->parent() == _patch) diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index 24aca9cb..e070d771 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -318,7 +318,7 @@ Serialiser::serialise_patch(SharedPtr<Shared::Patch> patch, const Redland::Node& serialise_properties(patch_id, patch->meta().properties()); - for (GraphObject::const_iterator n = _store->children_begin(patch); + for (Store::const_iterator n = _store->children_begin(patch); n != _store->children_end(patch); ++n) { if (n->second->graph_parent() != patch.get()) |