diff options
Diffstat (limited to 'ingen')
| -rw-r--r-- | ingen/Arc.hpp (renamed from ingen/Edge.hpp) | 8 | ||||
| -rw-r--r-- | ingen/AtomWriter.hpp | 2 | ||||
| -rw-r--r-- | ingen/Node.hpp | 12 | ||||
| -rw-r--r-- | ingen/URIs.hpp | 4 | ||||
| -rw-r--r-- | ingen/client/ArcModel.hpp (renamed from ingen/client/EdgeModel.hpp) | 12 | ||||
| -rw-r--r-- | ingen/client/GraphModel.hpp | 16 | ||||
| -rw-r--r-- | ingen/serialisation/Serialiser.hpp | 6 |
7 files changed, 30 insertions, 30 deletions
diff --git a/ingen/Edge.hpp b/ingen/Arc.hpp index a586783b..69c65586 100644 --- a/ingen/Edge.hpp +++ b/ingen/Arc.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_EDGE_HPP -#define INGEN_EDGE_HPP +#ifndef INGEN_ARC_HPP +#define INGEN_ARC_HPP #include "raul/Deletable.hpp" @@ -27,7 +27,7 @@ namespace Ingen { * * @ingroup Ingen */ -class Edge : public Raul::Deletable +class Arc : public Raul::Deletable { public: virtual const Raul::Path& tail_path() const = 0; @@ -36,4 +36,4 @@ public: } // namespace Ingen -#endif // INGEN_EDGE_HPP +#endif // INGEN_ARC_HPP diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp index 00b64b54..4e3e489a 100644 --- a/ingen/AtomWriter.hpp +++ b/ingen/AtomWriter.hpp @@ -81,7 +81,7 @@ public: private: void forge_uri(const Raul::URI& uri); void forge_properties(const Resource::Properties& properties); - void forge_edge(const Raul::Path& tail, const Raul::Path& head); + void forge_arc(const Raul::Path& tail, const Raul::Path& head); void finish_msg(); int32_t next_id(); diff --git a/ingen/Node.hpp b/ingen/Node.hpp index db796ef7..42e21ee3 100644 --- a/ingen/Node.hpp +++ b/ingen/Node.hpp @@ -29,7 +29,7 @@ class Symbol; namespace Ingen { -class Edge; +class Arc; class Plugin; class Store; @@ -54,12 +54,12 @@ public: PORT }; - typedef std::pair<const Node*, const Node*> EdgesKey; - typedef std::map< EdgesKey, SharedPtr<Edge> > Edges; + typedef std::pair<const Node*, const Node*> ArcsKey; + typedef std::map< ArcsKey, SharedPtr<Arc> > Arcs; // Graphs only - Edges& edges() { return _edges; } - const Edges& edges() const { return _edges; } + Arcs& arcs() { return _arcs; } + const Arcs& arcs() const { return _arcs; } // Blocks and graphs only virtual uint32_t num_ports() const { return 0; } @@ -97,7 +97,7 @@ protected: : Resource(uris, path_to_uri(path)) {} - Edges _edges; ///< Graphs only + Arcs _arcs; ///< Graphs only }; } // namespace Ingen diff --git a/ingen/URIs.hpp b/ingen/URIs.hpp index 9cea37a8..3e6427e6 100644 --- a/ingen/URIs.hpp +++ b/ingen/URIs.hpp @@ -73,18 +73,18 @@ public: const Quark bufsz_minBlockLength; const Quark bufsz_sequenceSize; const Quark doap_name; + const Quark ingen_Arc; const Quark ingen_Block; - const Quark ingen_Edge; const Quark ingen_Graph; const Quark ingen_Internal; const Quark ingen_activity; + const Quark ingen_arc; const Quark ingen_block; const Quark ingen_broadcast; const Quark ingen_canvasX; const Quark ingen_canvasY; const Quark ingen_controlBinding; const Quark ingen_document; - const Quark ingen_edge; const Quark ingen_enabled; const Quark ingen_engine; const Quark ingen_head; diff --git a/ingen/client/EdgeModel.hpp b/ingen/client/ArcModel.hpp index 9006dd80..99d5afa0 100644 --- a/ingen/client/EdgeModel.hpp +++ b/ingen/client/ArcModel.hpp @@ -14,15 +14,15 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_CLIENT_EDGEMODEL_HPP -#define INGEN_CLIENT_EDGEMODEL_HPP +#ifndef INGEN_CLIENT_ARCMODEL_HPP +#define INGEN_CLIENT_ARCMODEL_HPP #include <cassert> #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "ingen/Edge.hpp" +#include "ingen/Arc.hpp" #include "ingen/client/PortModel.hpp" namespace Ingen { @@ -34,7 +34,7 @@ class ClientStore; * * @ingroup IngenClient */ -class EdgeModel : public Edge +class ArcModel : public Arc { public: SharedPtr<PortModel> tail() const { return _tail; } @@ -46,7 +46,7 @@ public: private: friend class ClientStore; - EdgeModel(SharedPtr<PortModel> tail, SharedPtr<PortModel> head) + ArcModel(SharedPtr<PortModel> tail, SharedPtr<PortModel> head) : _tail(tail) , _head(head) { @@ -64,4 +64,4 @@ private: } // namespace Client } // namespace Ingen -#endif // INGEN_CLIENT_EDGEMODEL_HPP +#endif // INGEN_CLIENT_ARCMODEL_HPP diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp index d527eb82..a721dc37 100644 --- a/ingen/client/GraphModel.hpp +++ b/ingen/client/GraphModel.hpp @@ -23,8 +23,8 @@ namespace Ingen { namespace Client { +class ArcModel; class ClientStore; -class EdgeModel; /** Client's model of a graph. * @@ -37,8 +37,8 @@ public: GraphType graph_type() const { return Node::GRAPH; } - SharedPtr<EdgeModel> get_edge(const Ingen::Node* tail, - const Ingen::Node* head); + SharedPtr<ArcModel> get_arc(const Ingen::Node* tail, + const Ingen::Node* head); bool enabled() const; bool polyphonic() const; @@ -47,8 +47,8 @@ public: // Signals INGEN_SIGNAL(new_block, void, SharedPtr<BlockModel>); INGEN_SIGNAL(removed_block, void, SharedPtr<BlockModel>); - INGEN_SIGNAL(new_edge, void, SharedPtr<EdgeModel>); - INGEN_SIGNAL(removed_edge, void, SharedPtr<EdgeModel>); + INGEN_SIGNAL(new_arc, void, SharedPtr<ArcModel>); + INGEN_SIGNAL(removed_arc, void, SharedPtr<ArcModel>); private: friend class ClientStore; @@ -61,9 +61,9 @@ private: void add_child(SharedPtr<ObjectModel> c); bool remove_child(SharedPtr<ObjectModel> c); - void add_edge(SharedPtr<EdgeModel> cm); - void remove_edge(const Ingen::Node* tail, - const Ingen::Node* head); + void add_arc(SharedPtr<ArcModel> arc); + void remove_arc(const Ingen::Node* tail, + const Ingen::Node* head); }; } // namespace Client diff --git a/ingen/serialisation/Serialiser.hpp b/ingen/serialisation/Serialiser.hpp index a694e800..979fee62 100644 --- a/ingen/serialisation/Serialiser.hpp +++ b/ingen/serialisation/Serialiser.hpp @@ -29,7 +29,7 @@ namespace Ingen { -class Edge; +class Arc; class Node; class Store; class World; @@ -64,8 +64,8 @@ public: virtual void serialise(SharedPtr<const Node> object) throw (std::logic_error); - virtual void serialise_edge(const Sord::Node& parent, - SharedPtr<const Edge> c) + virtual void serialise_arc(const Sord::Node& parent, + SharedPtr<const Arc> arc) throw (std::logic_error); virtual std::string finish(); |