diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ClientStore.cpp | 16 | ||||
| -rw-r--r-- | src/client/ObjectModel.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index d69992fe..9948fd7b 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -179,8 +179,8 @@ ClientStore::object(const Raul::Path& path) const SPtr<Resource> ClientStore::_resource(const Raul::URI& uri) { - if (Node::uri_is_path(uri)) { - return _object(Node::uri_to_path(uri)); + if (uri_is_path(uri)) { + return _object(uri_to_path(uri)); } else { return _plugin(uri); } @@ -209,8 +209,8 @@ ClientStore::add_plugin(SPtr<PluginModel> pm) void ClientStore::del(const Raul::URI& uri) { - if (Node::uri_is_path(uri)) { - remove_object(Node::uri_to_path(uri)); + if (uri_is_path(uri)) { + remove_object(uri_to_path(uri)); } else { Plugins::iterator p = _plugins->find(uri); if (p != _plugins->end()) { @@ -277,13 +277,13 @@ ClientStore::put(const Raul::URI& uri, } } - if (!Node::uri_is_path(uri)) { + if (!uri_is_path(uri)) { _log.error(fmt("Put for unknown subject <%1%>\n") % uri.c_str()); return; } - const Raul::Path path(Node::uri_to_path(uri)); + const Raul::Path path(uri_to_path(uri)); SPtr<ObjectModel> obj = dynamic_ptr_cast<ObjectModel>(_object(path)); if (obj) { @@ -352,13 +352,13 @@ ClientStore::delta(const Raul::URI& uri, return; } - if (!Node::uri_is_path(uri)) { + if (!uri_is_path(uri)) { _log.error(fmt("Delta for unknown subject <%1%>\n") % uri.c_str()); return; } - const Raul::Path path(Node::uri_to_path(uri)); + const Raul::Path path(uri_to_path(uri)); SPtr<ObjectModel> obj = _object(path); if (obj) { diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 98f54cbe..79c6c67b 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -96,7 +96,7 @@ ObjectModel::set_path(const Raul::Path& p) { _path = p; _symbol = Raul::Symbol(p.is_root() ? "root" : p.symbol()); - set_uri(Node::path_to_uri(p)); + set_uri(path_to_uri(p)); _signal_moved.emit(); } |