From 21b1e2e485d9fa954ca742965d000f3273fcb862 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 12 Aug 2012 15:56:21 +0000 Subject: Stricter symbol construction and conversion. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4670 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/RenameWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/RenameWindow.cpp') diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index c8e72168..c770a087 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -85,10 +85,10 @@ RenameWindow::values_changed() if (symbol.length() == 0) { _message_label->set_text("Symbol must be at least 1 character"); _ok_button->property_sensitive() = false; - } else if (!Path::is_valid_name(symbol)) { + } else if (!Symbol::is_valid(symbol)) { _message_label->set_text("Symbol contains invalid characters"); _ok_button->property_sensitive() = false; - } else if (_object->symbol() != symbol && + } else if (_object->symbol().c_str() != symbol && _app->store()->object(_object->parent()->path().child(symbol))) { _message_label->set_text("An object already exists with that path"); _ok_button->property_sensitive() = false; @@ -124,7 +124,7 @@ RenameWindow::ok_clicked() const Atom& name_atom = _object->get_property(uris.lv2_name); if (Symbol::is_valid(symbol_str)) { - const Symbol& symbol(symbol_str); + const Symbol symbol(symbol_str); if (symbol != _object->symbol()) { path = _object->path().parent().child(symbol); _app->interface()->move(_object->path(), path); -- cgit v1.2.1