diff options
author | David Robillard <d@drobilla.net> | 2014-01-18 06:25:36 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-01-18 06:25:36 +0000 |
commit | ec8939dd7ef5267b43bd8ae3590e783495f0cfc9 (patch) | |
tree | ce151c34851e8a275f35aedb67ea6b4a25676baf /src/Resource.cpp | |
parent | 59492c673f5de893e8b91ca50a945a697ddfa404 (diff) | |
download | ingen-ec8939dd7ef5267b43bd8ae3590e783495f0cfc9.tar.gz ingen-ec8939dd7ef5267b43bd8ae3590e783495f0cfc9.tar.bz2 ingen-ec8939dd7ef5267b43bd8ae3590e783495f0cfc9.zip |
Consolidate URIs.
Add missing definition to ontology.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5317 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/Resource.cpp')
-rw-r--r-- | src/Resource.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Resource.cpp b/src/Resource.cpp index aa6adf07..79f998a0 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -53,8 +53,9 @@ Resource::set_property(const Raul::URI& uri, Properties::iterator next = i; ++next; if (i->second.context() == ctx) { + const Atom value(i->second); _properties.erase(i); - on_property_removed(uri, i->second); + on_property_removed(uri, value); } i = next; } @@ -68,7 +69,7 @@ Resource::set_property(const Raul::URI& uri, void Resource::remove_property(const Raul::URI& uri, const Atom& value) { - if (value == _uris.wildcard) { + if (value == _uris.patch_wildcard) { _properties.erase(uri); } else { for (Properties::iterator i = _properties.find(uri); @@ -163,7 +164,7 @@ Resource::set_properties(const Properties& props) // Erase existing properties with matching keys for (const auto& p : props) { _properties.erase(p.first); - on_property_removed(p.first, _uris.wildcard); + on_property_removed(p.first, _uris.patch_wildcard); } // Set new properties |