From f0e33dd09a390ca946e95a6f55fea397dca0ca1f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 2 Jan 2021 18:17:04 +0100 Subject: Update for latest raul --- src/server/events/Copy.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/server/events/Copy.cpp') diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 3f7fa52e..9ce7ead6 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -66,7 +66,7 @@ Copy::pre_process(PreProcessContext& ctx) if (uri_is_path(_msg.old_uri)) { // Old URI is a path within the engine - const Raul::Path old_path = uri_to_path(_msg.old_uri); + const raul::Path old_path = uri_to_path(_msg.old_uri); // Find the old node const Store::iterator i = _engine.store()->find(old_path); @@ -104,8 +104,8 @@ bool Copy::engine_to_engine(PreProcessContext& ctx) { // Only support a single source for now - const Raul::Path new_path = uri_to_path(_msg.new_uri); - if (!Raul::Symbol::is_valid(new_path.symbol())) { + const raul::Path new_path = uri_to_path(_msg.new_uri); + if (!raul::Symbol::is_valid(new_path.symbol())) { return Event::pre_process_done(Status::BAD_REQUEST); } @@ -115,7 +115,7 @@ Copy::engine_to_engine(PreProcessContext& ctx) } // Find new parent graph - const Raul::Path parent_path = new_path.parent(); + const raul::Path parent_path = new_path.parent(); const Store::iterator p = _engine.store()->find(parent_path); if (p == _engine.store()->end()) { return Event::pre_process_done(Status::NOT_FOUND, parent_path); @@ -126,7 +126,7 @@ Copy::engine_to_engine(PreProcessContext& ctx) // Create new block if (!(_block = dynamic_cast( - _old_block->duplicate(_engine, Raul::Symbol(new_path.symbol()), _parent)))) { + _old_block->duplicate(_engine, raul::Symbol(new_path.symbol()), _parent)))) { return Event::pre_process_done(Status::INTERNAL_ERROR); } @@ -189,12 +189,12 @@ Copy::filesystem_to_engine(PreProcessContext&) // Old URI is a filesystem path and new URI is a path within the engine const std::string src_path(_msg.old_uri.path()); - const Raul::Path dst_path = uri_to_path(_msg.new_uri); - boost::optional dst_parent; - boost::optional dst_symbol; + const raul::Path dst_path = uri_to_path(_msg.new_uri); + boost::optional dst_parent; + boost::optional dst_symbol; if (!dst_path.is_root()) { dst_parent = dst_path.parent(); - dst_symbol = Raul::Symbol(dst_path.symbol()); + dst_symbol = raul::Symbol(dst_path.symbol()); } _engine.world().parser()->parse_file( -- cgit v1.2.1