diff options
| author | David Robillard <d@drobilla.net> | 2013-01-11 04:47:21 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-11 04:47:21 +0000 |
| commit | 10e9a3a800a35916872abf9e354be4c554338e4e (patch) | |
| tree | d6be3ce7993f5d8efd525629fd321b32a6341633 /ingen/client | |
| parent | 684eaf6b58e41f6758b160b882a6313faf0cff18 (diff) | |
| download | ingen-10e9a3a800a35916872abf9e354be4c554338e4e.tar.gz ingen-10e9a3a800a35916872abf9e354be4c554338e4e.tar.bz2 ingen-10e9a3a800a35916872abf9e354be4c554338e4e.zip | |
Use type safe enumerations.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4918 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client')
| -rw-r--r-- | ingen/client/BlockModel.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/ClientStore.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/GraphModel.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/PortModel.hpp | 8 | ||||
| -rw-r--r-- | ingen/client/SigClientInterface.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/ThreadedSigClientInterface.hpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp index 547894b4..3262b230 100644 --- a/ingen/client/BlockModel.hpp +++ b/ingen/client/BlockModel.hpp @@ -48,7 +48,7 @@ public: BlockModel(const BlockModel& copy); virtual ~BlockModel(); - GraphType graph_type() const { return Node::BLOCK; } + GraphType graph_type() const { return Node::GraphType::BLOCK; } typedef std::vector< SharedPtr<const PortModel> > Ports; diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index fa5b2f5a..3d7d724a 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -75,7 +75,7 @@ public: void put(const Raul::URI& uri, const Resource::Properties& properties, - Resource::Graph ctx=Resource::DEFAULT); + Resource::Graph ctx=Resource::Graph::DEFAULT); void delta(const Raul::URI& uri, const Resource::Properties& remove, diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp index a721dc37..996e9129 100644 --- a/ingen/client/GraphModel.hpp +++ b/ingen/client/GraphModel.hpp @@ -35,7 +35,7 @@ class GraphModel : public BlockModel public: /* WARNING: Copy constructor creates a shallow copy WRT connections */ - GraphType graph_type() const { return Node::GRAPH; } + GraphType graph_type() const { return Node::GraphType::GRAPH; } SharedPtr<ArcModel> get_arc(const Ingen::Node* tail, const Ingen::Node* head); diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp index 41b871ab..92379e6e 100644 --- a/ingen/client/PortModel.hpp +++ b/ingen/client/PortModel.hpp @@ -39,17 +39,17 @@ namespace Client { class PortModel : public ObjectModel { public: - enum Direction { INPUT, OUTPUT }; + enum class Direction { INPUT, OUTPUT }; - GraphType graph_type() const { return Node::PORT; } + GraphType graph_type() const { return Node::GraphType::PORT; } bool supports(const Raul::URI& value_type) const; inline uint32_t index() const { return _index; } inline const Raul::Atom& value() const { return get_property(_uris.ingen_value); } inline bool connected() const { return (_connections > 0); } - inline bool is_input() const { return (_direction == INPUT); } - inline bool is_output() const { return (_direction == OUTPUT); } + inline bool is_input() const { return (_direction == Direction::INPUT); } + inline bool is_output() const { return (_direction == Direction::OUTPUT); } bool port_property(const Raul::URI& uri) const; diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index 2453440f..900a9923 100644 --- a/ingen/client/SigClientInterface.hpp +++ b/ingen/client/SigClientInterface.hpp @@ -83,7 +83,7 @@ protected: void put(const Raul::URI& uri, const Resource::Properties& properties, - Resource::Graph ctx=Resource::DEFAULT) + Resource::Graph ctx=Resource::Graph::DEFAULT) { EMIT(put, uri, properties, ctx); } void delta(const Raul::URI& uri, diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp index 0b53a15a..d4e5f6d6 100644 --- a/ingen/client/ThreadedSigClientInterface.hpp +++ b/ingen/client/ThreadedSigClientInterface.hpp @@ -81,7 +81,7 @@ public: void put(const Raul::URI& path, const Resource::Properties& properties, - Resource::Graph ctx=Resource::DEFAULT) + Resource::Graph ctx=Resource::Graph::DEFAULT) { push_sig(sigc::bind(put_slot, path, properties, ctx)); } void delta(const Raul::URI& path, |