Stricter symbol construction and conversion.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4670 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index add13996..9170ed9b 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -221,7 +221,7 @@ LoadPatchWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
 	if (offset != 0) {
 		std::stringstream ss;
 		ss << symbol << "_" << offset;
-		return ss.str();
+		return Raul::Symbol(ss.str());
 	} else {
 		return symbol;
 	}
@@ -238,7 +238,7 @@ LoadPatchWindow::selection_changed()
 		_symbol_entry->set_sensitive(false);
 	} else {
 		_symbol_entry->set_text(avoid_symbol_clash(
-				symbol_from_filename(get_filename()).c_str()).c_str());
+				symbol_from_filename(get_filename())).c_str());
 		_symbol_entry->set_sensitive(true);
 	}
 }
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index fbbe88b1..6e6667fc 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -785,7 +785,7 @@ PatchCanvas::generate_port_name(
 		snprintf(num_buf, sizeof(num_buf), "%u", i);
 		symbol = sym_base + "_";
 		symbol += num_buf;
-		if (!_patch->get_port(symbol))
+		if (!_patch->get_port(Raul::Symbol::symbolify(symbol)))
 			break;
 	}
 
@@ -832,7 +832,7 @@ PatchCanvas::load_plugin(WeakPtr<PluginModel> weak_plugin)
 	if (offset != 0) {
 		std::stringstream ss;
 		ss << symbol << "_" << offset;
-		symbol = ss.str();
+		symbol = Raul::Symbol(ss.str());
 	}
 
 	const URIs& uris = _app.uris();
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);