From e0743e9d9b15fb2731e26bf5700413c083a89186 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 17 Aug 2008 06:50:15 +0000 Subject: Tidy. git-svn-id: http://svn.drobilla.net/lad/ingen@1415 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/ObjectModel.cpp | 4 ++-- src/libs/client/ObjectModel.hpp | 6 +++--- src/libs/client/PatchModel.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libs/client') diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp index c9236c9e..0afb9ad8 100644 --- a/src/libs/client/ObjectModel.cpp +++ b/src/libs/client/ObjectModel.cpp @@ -63,7 +63,7 @@ ObjectModel::get_property(const string& key) const { static const Atom null_atom; - Variables::const_iterator i = _properties.find(key); + Properties::const_iterator i = _properties.find(key); if (i != _properties.end()) return i->second; else @@ -74,7 +74,7 @@ ObjectModel::get_property(const string& key) const bool ObjectModel::polyphonic() const { - Variables::const_iterator i = _properties.find("ingen:polyphonic"); + Properties::const_iterator i = _properties.find("ingen:polyphonic"); return (i != _properties.end() && i->second.type() == Atom::BOOL && i->second.get_bool()); } diff --git a/src/libs/client/ObjectModel.hpp b/src/libs/client/ObjectModel.hpp index b0796275..2b465fe8 100644 --- a/src/libs/client/ObjectModel.hpp +++ b/src/libs/client/ObjectModel.hpp @@ -69,7 +69,7 @@ public: { _properties[key] = value; signal_property.emit(key, value); } const Variables& variables() const { return _variables; } - const Variables& properties() const { return _properties; } + const Properties& properties() const { return _properties; } const Path path() const { return _path; } const Symbol symbol() const { return _path.name(); } SharedPtr parent() const { return _parent; } @@ -100,8 +100,8 @@ protected: Path _path; SharedPtr _parent; - Variables _variables; - Variables _properties; + Variables _variables; + Properties _properties; }; diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp index 4fe0e641..9b109bd6 100644 --- a/src/libs/client/PatchModel.cpp +++ b/src/libs/client/PatchModel.cpp @@ -163,7 +163,7 @@ PatchModel::remove_connection(const string& src_port_path, const string& dst_por bool PatchModel::enabled() const { - Variables::const_iterator i = _properties.find("ingen:enabled"); + Properties::const_iterator i = _properties.find("ingen:enabled"); return (i != _properties.end() && i->second.type() == Atom::BOOL && i->second.get_bool()); } -- cgit v1.2.1