summaryrefslogtreecommitdiffstats
path: root/src/gui/RenameWindow.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-22 03:08:06 +0000
committerDavid Robillard <d@drobilla.net>2011-10-22 03:08:06 +0000
commitac1d6d135bda8d739fdb8bf564f89c38b664c097 (patch)
treed750da79dd88b64ab2a88cca1651c2a5a240bd72 /src/gui/RenameWindow.cpp
parent143968e38cc2f058dd7c500e984904a39864d652 (diff)
downloadingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.tar.gz
ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.tar.bz2
ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.zip
De-singleton-ify GUI.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3584 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/RenameWindow.cpp')
-rw-r--r--src/gui/RenameWindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index e62eb101..7e5d8ed2 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -87,7 +87,7 @@ RenameWindow::values_changed()
} else if (!Path::is_valid_name(symbol)) {
_message_label->set_text("Symbol contains invalid characters");
_ok_button->property_sensitive() = false;
- } else if (App::instance().store()->object(_object->parent()->path().child(symbol))) {
+ } else if (_app->store()->object(_object->parent()->path().child(symbol))) {
_message_label->set_text("An object already exists with that path");
_ok_button->property_sensitive() = false;
} else if (label.empty()) {
@@ -115,7 +115,7 @@ RenameWindow::cancel_clicked()
void
RenameWindow::ok_clicked()
{
- const Shared::URIs& uris = App::instance().uris();
+ const Shared::URIs& uris = _app->uris();
const string& symbol_str = _symbol_entry->get_text();
const string& label = _label_entry->get_text();
@@ -126,12 +126,12 @@ RenameWindow::ok_clicked()
const Symbol& symbol(symbol_str);
if (symbol != _object->symbol()) {
path = _object->path().parent().child(symbol);
- App::instance().engine()->move(_object->path(), path);
+ _app->engine()->move(_object->path(), path);
}
}
if (!label.empty() && (!name_atom.is_valid() || label != name_atom.get_string())) {
- App::instance().engine()->set_property(path, uris.lv2_name, Atom(label));
+ _app->engine()->set_property(path, uris.lv2_name, Atom(label));
}
hide();