diff options
Diffstat (limited to 'src/Store.cpp')
| -rw-r--r-- | src/Store.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Store.cpp b/src/Store.cpp index f176613e..fe5527a5 100644 --- a/src/Store.cpp +++ b/src/Store.cpp @@ -100,9 +100,9 @@ Store::remove(const iterator top, Objects& removed) } void -Store::rename(const iterator top, const Raul::Path& new_path) +Store::rename(const iterator top, const raul::Path& new_path) { - const Raul::Path old_path = top->first; + const raul::Path old_path = top->first; // Remove the object and all its descendants Objects removed; @@ -110,10 +110,10 @@ Store::rename(const iterator top, const Raul::Path& new_path) // Rename all the removed objects for (Objects::const_iterator i = removed.begin(); i != removed.end(); ++i) { - const Raul::Path path = (i->first == old_path) + const raul::Path path = (i->first == old_path) ? new_path : new_path.child( - Raul::Path(i->first.substr(old_path.base().length() - 1))); + raul::Path(i->first.substr(old_path.base().length() - 1))); i->second->set_path(path); assert(find(path) == end()); // Shouldn't be dropping objects! @@ -122,8 +122,8 @@ Store::rename(const iterator top, const Raul::Path& new_path) } unsigned -Store::child_name_offset(const Raul::Path& parent, - const Raul::Symbol& symbol, +Store::child_name_offset(const raul::Path& parent, + const raul::Symbol& symbol, bool allow_zero) const { unsigned offset = 0; @@ -134,7 +134,7 @@ Store::child_name_offset(const Raul::Path& parent, if (offset > 0) { ss << "_" << offset; } - if (find(parent.child(Raul::Symbol(ss.str()))) == end() && + if (find(parent.child(raul::Symbol(ss.str()))) == end() && (allow_zero || offset > 0)) { break; } else if (offset == 0) { |