summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/.clang-tidy6
-rw-r--r--src/gui/BreadCrumbs.cpp16
-rw-r--r--src/gui/BreadCrumbs.hpp22
-rw-r--r--src/gui/ConnectWindow.cpp4
-rw-r--r--src/gui/GraphBox.cpp4
-rw-r--r--src/gui/GraphBox.hpp6
-rw-r--r--src/gui/GraphCanvas.cpp26
-rw-r--r--src/gui/GraphCanvas.hpp2
-rw-r--r--src/gui/LoadGraphWindow.cpp18
-rw-r--r--src/gui/LoadGraphWindow.hpp4
-rw-r--r--src/gui/LoadPluginWindow.cpp8
-rw-r--r--src/gui/NewSubgraphWindow.cpp8
-rw-r--r--src/gui/NodeMenu.cpp4
-rw-r--r--src/gui/PortMenu.cpp2
-rw-r--r--src/gui/RenameWindow.cpp10
-rw-r--r--src/gui/ThreadedLoader.cpp8
-rw-r--r--src/gui/ThreadedLoader.hpp14
-rw-r--r--src/gui/WindowFactory.hpp2
-rw-r--r--src/gui/ingen_gui_lv2.cpp2
19 files changed, 86 insertions, 80 deletions
diff --git a/src/gui/.clang-tidy b/src/gui/.clang-tidy
index 335a294c..7f216d2c 100644
--- a/src/gui/.clang-tidy
+++ b/src/gui/.clang-tidy
@@ -63,6 +63,12 @@ Checks: >
-readability-convert-member-functions-to-static,
-readability-implicit-bool-conversion,
-readability-use-anyofallof,
+CheckOptions:
+ - key: modernize-use-override.AllowOverrideAndFinal
+ value: 'true'
+CheckOptions:
+ - key: cppcoreguidelines-explicit-virtual-functions.AllowOverrideAndFinal
+ value: 'true'
WarningsAsErrors: '*'
HeaderFilterRegex: 'include/ingen/.*|tests/.*|src/.*'
FormatStyle: file
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 5b90c55d..4e257d88 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -46,7 +46,7 @@ BreadCrumbs::BreadCrumbs(App& app)
}
std::shared_ptr<GraphView>
-BreadCrumbs::view(const Raul::Path& path)
+BreadCrumbs::view(const raul::Path& path)
{
for (const auto& b : _breadcrumbs) {
if (b->path() == path) {
@@ -63,7 +63,7 @@ BreadCrumbs::view(const Raul::Path& path)
* children preserved.
*/
void
-BreadCrumbs::build(const Raul::Path& path,
+BreadCrumbs::build(const raul::Path& path,
const std::shared_ptr<GraphView>& view)
{
bool old_enable_signal = _enable_signal;
@@ -98,7 +98,7 @@ BreadCrumbs::build(const Raul::Path& path,
suffix = suffix.substr(1);
}
const string name = suffix.substr(0, suffix.find('/'));
- _full_path = _full_path.child(Raul::Symbol(name));
+ _full_path = _full_path.child(raul::Symbol(name));
BreadCrumb* but = create_crumb(_full_path, view);
pack_start(*but, false, false, 1);
_breadcrumbs.push_back(but);
@@ -129,19 +129,19 @@ BreadCrumbs::build(const Raul::Path& path,
_breadcrumbs.clear();
// Add root
- BreadCrumb* root_but = create_crumb(Raul::Path("/"), view);
+ BreadCrumb* root_but = create_crumb(raul::Path("/"), view);
pack_start(*root_but, false, false, 1);
_breadcrumbs.push_front(root_but);
root_but->set_active(root_but->path() == _active_path);
- Raul::Path working_path("/");
+ raul::Path working_path("/");
string suffix = path.substr(1);
while (suffix.length() > 0) {
if (suffix[0] == '/') {
suffix = suffix.substr(1);
}
const string name = suffix.substr(0, suffix.find('/'));
- working_path = working_path.child(Raul::Symbol(name));
+ working_path = working_path.child(raul::Symbol(name));
BreadCrumb* but = create_crumb(working_path, view);
pack_start(*but, false, false, 1);
_breadcrumbs.push_back(but);
@@ -162,7 +162,7 @@ BreadCrumbs::build(const Raul::Path& path,
* match, otherwise ignoring `view`.
*/
BreadCrumbs::BreadCrumb*
-BreadCrumbs::create_crumb(const Raul::Path& path,
+BreadCrumbs::create_crumb(const raul::Path& path,
const std::shared_ptr<GraphView>& view)
{
BreadCrumb* but = manage(new BreadCrumb(
@@ -219,7 +219,7 @@ BreadCrumbs::object_destroyed(const URI& uri)
}
void
-BreadCrumbs::object_moved(const Raul::Path& old_path, const Raul::Path& new_path)
+BreadCrumbs::object_moved(const raul::Path& old_path, const raul::Path& new_path)
{
for (const auto& b : _breadcrumbs) {
if (b->path() == old_path) {
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 0b553faa..d877d0c5 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -50,11 +50,11 @@ class BreadCrumbs : public Gtk::HBox
public:
explicit BreadCrumbs(App& app);
- std::shared_ptr<GraphView> view(const Raul::Path& path);
+ std::shared_ptr<GraphView> view(const raul::Path& path);
- void build(const Raul::Path& path, const std::shared_ptr<GraphView>& view);
+ void build(const raul::Path& path, const std::shared_ptr<GraphView>& view);
- sigc::signal<void, const Raul::Path&, std::shared_ptr<GraphView>>
+ sigc::signal<void, const raul::Path&, std::shared_ptr<GraphView>>
signal_graph_selected;
private:
@@ -70,7 +70,7 @@ private:
class BreadCrumb : public Gtk::ToggleButton
{
public:
- BreadCrumb(const Raul::Path& path,
+ BreadCrumb(const raul::Path& path,
const std::shared_ptr<GraphView>& view = nullptr)
: _path(path), _view(view)
{
@@ -86,10 +86,10 @@ private:
_view = view;
}
- const Raul::Path& path() const { return _path; }
+ const raul::Path& path() const { return _path; }
std::shared_ptr<GraphView> view() const { return _view; }
- void set_path(const Raul::Path& path) {
+ void set_path(const raul::Path& path) {
remove();
const char* text = (path.is_root()) ? "/" : path.symbol();
Gtk::Label* lab = manage(new Gtk::Label(text));
@@ -103,21 +103,21 @@ private:
}
private:
- Raul::Path _path;
+ raul::Path _path;
std::shared_ptr<GraphView> _view;
};
- BreadCrumb* create_crumb(const Raul::Path& path,
+ BreadCrumb* create_crumb(const raul::Path& path,
const std::shared_ptr<GraphView>& view = nullptr);
void breadcrumb_clicked(BreadCrumb* crumb);
void message(const Message& msg);
void object_destroyed(const URI& uri);
- void object_moved(const Raul::Path& old_path, const Raul::Path& new_path);
+ void object_moved(const raul::Path& old_path, const raul::Path& new_path);
- Raul::Path _active_path;
- Raul::Path _full_path;
+ raul::Path _active_path;
+ raul::Path _full_path;
bool _enable_signal;
std::list<BreadCrumb*> _breadcrumbs;
};
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 8534c89c..ea1a6e27 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -274,7 +274,7 @@ ConnectWindow::connect(bool existing)
const std::string port = std::to_string(_port_spinbutton->get_value_as_int());
const char* cmd[] = { "ingen", "-e", "-E", port.c_str(), nullptr };
- if (!Raul::Process::launch(cmd)) {
+ if (!raul::Process::launch(cmd)) {
error("Failed to launch engine process");
return;
}
@@ -548,7 +548,7 @@ ConnectWindow::gtk_callback()
} else if (_connect_stage == 4) {
if (!_app->store()->empty()) {
auto root = std::dynamic_pointer_cast<const client::GraphModel>(
- _app->store()->object(Raul::Path("/")));
+ _app->store()->object(raul::Path("/")));
if (root) {
set_connected_to(_app->interface());
_app->window_factory()->present_graph(root);
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 9fef803b..f994d47c 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -299,7 +299,7 @@ GraphBox::set_status_text(const std::string& text)
}
void
-GraphBox::set_graph_from_path(const Raul::Path& path,
+GraphBox::set_graph_from_path(const raul::Path& path,
const std::shared_ptr<GraphView>& view)
{
if (view) {
@@ -654,7 +654,7 @@ GraphBox::event_save_as()
const std::string symbol(basename.substr(0, basename.find('.')));
- if (!Raul::Symbol::is_valid(symbol)) {
+ if (!raul::Symbol::is_valid(symbol)) {
error(
"<b>Ingen bundle names must be valid symbols.</b>",
"All characters must be _, a-z, A-Z, or 0-9, but the first may not be 0-9.");
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index b8f2cce0..cfc4a67f 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -42,9 +42,9 @@ class MenuItem;
class Statusbar;
} // namespace Gtk
-namespace Raul {
+namespace raul {
class Path;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -97,7 +97,7 @@ public:
void show_port_status(const client::PortModel* port,
const Atom& value);
- void set_graph_from_path(const Raul::Path& path,
+ void set_graph_from_path(const raul::Path& path,
const std::shared_ptr<GraphView>& view);
void object_entered(const client::ObjectModel* model);
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index c833f20f..77c33052 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -714,7 +714,7 @@ GraphCanvas::paste()
const Glib::ustring str = Gtk::Clipboard::get()->wait_for_text();
auto parser = _app.loader()->parser();
const URIs& uris = _app.uris();
- const Raul::Path& parent = _graph->path();
+ const raul::Path& parent = _graph->path();
if (!parser) {
_app.log().error("Unable to load parser, paste unavailable\n");
return;
@@ -736,7 +736,7 @@ GraphCanvas::paste()
_app.world(), clipboard, str, main_uri());
// Figure out the copy graph base path
- Raul::Path copy_root("/");
+ raul::Path copy_root("/");
if (base_uri) {
std::string base = *base_uri;
if (base[base.size() - 1] == '/') {
@@ -749,7 +749,7 @@ GraphCanvas::paste()
float min_x = std::numeric_limits<float>::max();
float min_y = std::numeric_limits<float>::max();
for (const auto& c : clipboard) {
- if (c.first.parent() == Raul::Path("/")) {
+ if (c.first.parent() == raul::Path("/")) {
const Atom& x = c.second->get_property(uris.ingen_canvasX);
const Atom& y = c.second->get_property(uris.ingen_canvasY);
if (x.type() == uris.atom_Float) {
@@ -776,14 +776,14 @@ GraphCanvas::paste()
// Put each top level object in the clipboard store
ClashAvoider avoider(*_app.store());
for (const auto& c : clipboard) {
- if (c.first.is_root() || c.first.parent() != Raul::Path("/")) {
+ if (c.first.is_root() || c.first.parent() != raul::Path("/")) {
continue;
}
const auto node = c.second;
- const Raul::Path& old_path = copy_root.child(node->path());
+ const raul::Path& old_path = copy_root.child(node->path());
const URI& old_uri = path_to_uri(old_path);
- const Raul::Path& new_path =
+ const raul::Path& new_path =
avoider.map_path(parent.child(node->path()));
// Copy properties, except those that should not be inherited in copies
@@ -825,7 +825,7 @@ GraphCanvas::paste()
}
// Connect objects
- for (const auto& a : clipboard.object(Raul::Path("/"))->arcs()) {
+ for (const auto& a : clipboard.object(raul::Path("/"))->arcs()) {
_app.interface()->connect(
avoider.map_path(parent.child(a.second->tail_path())),
avoider.map_path(parent.child(a.second->head_path())));
@@ -848,12 +848,12 @@ GraphCanvas::generate_port_name(
snprintf(num_buf, sizeof(num_buf), "%u", i);
symbol = sym_base + "_";
symbol += num_buf;
- if (!_graph->get_port(Raul::Symbol::symbolify(symbol))) {
+ if (!_graph->get_port(raul::Symbol::symbolify(symbol))) {
break;
}
}
- assert(Raul::Path::is_valid(string("/") + symbol));
+ assert(raul::Path::is_valid(string("/") + symbol));
name.append(" ").append(num_buf);
}
@@ -867,7 +867,7 @@ GraphCanvas::menu_add_port(const string& sym_base,
string sym;
string name;
generate_port_name(sym_base, sym, name_base, name);
- const Raul::Path& path = _graph->path().child(Raul::Symbol(sym));
+ const raul::Path& path = _graph->path().child(raul::Symbol(sym));
const URIs& uris = _app.uris();
@@ -893,16 +893,16 @@ GraphCanvas::load_plugin(const std::weak_ptr<PluginModel>& weak_plugin)
return;
}
- Raul::Symbol symbol = plugin->default_block_symbol();
+ raul::Symbol symbol = plugin->default_block_symbol();
unsigned offset = _app.store()->child_name_offset(_graph->path(), symbol);
if (offset != 0) {
std::stringstream ss;
ss << symbol << "_" << offset;
- symbol = Raul::Symbol(ss.str());
+ symbol = raul::Symbol(ss.str());
}
const URIs& uris = _app.uris();
- const Raul::Path path = _graph->path().child(symbol);
+ const raul::Path path = _graph->path().child(symbol);
// FIXME: polyphony?
Properties props = get_initial_data();
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index e413c194..b1e60aa3 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -149,7 +149,7 @@ private:
int _paste_count;
// Track pasted objects so they can be selected when they arrive
- std::set<Raul::Path> _pastees;
+ std::set<raul::Path> _pastees;
Gtk::Menu* _menu = nullptr;
Gtk::Menu* _internal_menu = nullptr;
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index bdd6c349..7a80a2bf 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -187,8 +187,8 @@ LoadGraphWindow::ok_clicked()
if (_import) {
// If unset load_graph will load value
- boost::optional<Raul::Path> parent;
- boost::optional<Raul::Symbol> symbol;
+ boost::optional<raul::Path> parent;
+ boost::optional<raul::Symbol> symbol;
if (!_graph->path().is_root()) {
parent = _graph->path().parent();
symbol = _graph->symbol();
@@ -206,9 +206,9 @@ LoadGraphWindow::ok_clicked()
Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
y = _app->forge().make(y.get<float>() + 20.0f);
- Raul::Symbol symbol(symbol_from_filename(u));
+ raul::Symbol symbol(symbol_from_filename(u));
if (uri_list.size() == 1 && !_symbol_entry->get_text().empty()) {
- symbol = Raul::Symbol::symbolify(_symbol_entry->get_text());
+ symbol = raul::Symbol::symbolify(_symbol_entry->get_text());
}
symbol = avoid_symbol_clash(symbol);
@@ -233,16 +233,16 @@ LoadGraphWindow::cancel_clicked()
hide();
}
-Raul::Symbol
+raul::Symbol
LoadGraphWindow::symbol_from_filename(const Glib::ustring& filename)
{
std::string symbol_str = Glib::path_get_basename(get_filename());
symbol_str = symbol_str.substr(0, symbol_str.find('.'));
- return Raul::Symbol::symbolify(symbol_str);
+ return raul::Symbol::symbolify(symbol_str);
}
-Raul::Symbol
-LoadGraphWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
+raul::Symbol
+LoadGraphWindow::avoid_symbol_clash(const raul::Symbol& symbol)
{
unsigned offset = _app->store()->child_name_offset(
_graph->path(), symbol);
@@ -250,7 +250,7 @@ LoadGraphWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
if (offset != 0) {
std::stringstream ss;
ss << symbol << "_" << offset;
- return Raul::Symbol(ss.str());
+ return raul::Symbol(ss.str());
} else {
return symbol;
}
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index f18998c7..b2063d75 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -77,8 +77,8 @@ private:
void cancel_clicked();
void ok_clicked();
- Raul::Symbol symbol_from_filename(const Glib::ustring& filename);
- Raul::Symbol avoid_symbol_clash(const Raul::Symbol& symbol);
+ raul::Symbol symbol_from_filename(const Glib::ustring& filename);
+ raul::Symbol avoid_symbol_clash(const raul::Symbol& symbol);
App* _app = nullptr;
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 67115cf3..5a9536a2 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -167,9 +167,9 @@ LoadPluginWindow::name_changed()
// Toggle add button sensitivity according name legality
if (_selection->get_selected_rows().size() == 1) {
const string sym = _name_entry->get_text();
- if (!Raul::Symbol::is_valid(sym)) {
+ if (!raul::Symbol::is_valid(sym)) {
_add_button->property_sensitive() = false;
- } else if (_app->store()->find(_graph->path().child(Raul::Symbol(sym)))
+ } else if (_app->store()->find(_graph->path().child(raul::Symbol(sym)))
!= _app->store()->end()) {
_add_button->property_sensitive() = false;
} else {
@@ -407,7 +407,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
name = generate_module_name(plugin, _name_offset);
}
- if (name.empty() || !Raul::Symbol::is_valid(name)) {
+ if (name.empty() || !raul::Symbol::is_valid(name)) {
Gtk::MessageDialog dialog(
*this,
"Unable to choose a default name, please provide one",
@@ -415,7 +415,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
dialog.run();
} else {
- Raul::Path path = _graph->path().child(Raul::Symbol::symbolify(name));
+ raul::Path path = _graph->path().child(raul::Symbol::symbolify(name));
Properties props = _initial_data;
props.emplace(uris.rdf_type, Property(uris.ingen_Block));
props.emplace(uris.lv2_prototype, _app->forge().make_urid(plugin->uri()));
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index b6f1ccc1..9b6c4a1a 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -95,10 +95,10 @@ void
NewSubgraphWindow::name_changed()
{
std::string name = _name_entry->get_text();
- if (!Raul::Symbol::is_valid(name)) {
+ if (!raul::Symbol::is_valid(name)) {
_message_label->set_text("Name contains invalid characters.");
_ok_button->property_sensitive() = false;
- } else if (_app->store()->find(_graph->path().child(Raul::Symbol(name)))
+ } else if (_app->store()->find(_graph->path().child(raul::Symbol(name)))
!= _app->store()->end()) {
_message_label->set_text("An object already exists with that name.");
_ok_button->property_sensitive() = false;
@@ -112,8 +112,8 @@ void
NewSubgraphWindow::ok_clicked()
{
const uint32_t poly = _poly_spinbutton->get_value_as_int();
- const Raul::Path path = _graph->path().child(
- Raul::Symbol::symbolify(_name_entry->get_text()));
+ const raul::Path path = _graph->path().child(
+ raul::Symbol::symbolify(_name_entry->get_text()));
// Create graph
Properties props;
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index d0cb2e65..517d0018 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -239,9 +239,9 @@ NodeMenu::on_save_preset_activated()
const std::string user_path = Glib::filename_from_uri(user_uri);
const std::string dirname = Glib::path_get_dirname(user_path);
const std::string basename = Glib::path_get_basename(user_path);
- const std::string sym = Raul::Symbol::symbolify(basename);
+ const std::string sym = raul::Symbol::symbolify(basename);
const std::string plugname = block()->plugin_model()->human_name();
- const std::string prefix = Raul::Symbol::symbolify(plugname);
+ const std::string prefix = raul::Symbol::symbolify(plugname);
const std::string bundle = prefix + "_" + sym + ".preset.lv2/";
const std::string file = sym + ".ttl";
const std::string real_path = Glib::build_filename(dirname, bundle, file);
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 8a6acfce..652ac05d 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -169,7 +169,7 @@ PortMenu::on_menu_expose()
auto block = std::dynamic_pointer_cast<const BlockModel>(port->parent());
const std::string label = block->label() + " " + block->port_label(port);
- const Raul::Path path = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol()));
+ const raul::Path path = raul::Path(block->path() + raul::Symbol("_" + port->symbol()));
ingen::Resource r(*_object);
r.remove_property(uris.lv2_index, uris.patch_wildcard);
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index af213129..e2c1e98c 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -95,12 +95,12 @@ void
RenameWindow::values_changed()
{
const std::string& symbol = _symbol_entry->get_text();
- if (!Raul::Symbol::is_valid(symbol)) {
+ if (!raul::Symbol::is_valid(symbol)) {
_message_label->set_text("Invalid symbol");
_ok_button->property_sensitive() = false;
} else if (_object->symbol() != symbol &&
_app->store()->object(
- _object->parent()->path().child(Raul::Symbol(symbol)))) {
+ _object->parent()->path().child(raul::Symbol(symbol)))) {
_message_label->set_text("An object already exists with that path");
_ok_button->property_sensitive() = false;
} else {
@@ -128,7 +128,7 @@ RenameWindow::ok_clicked()
const URIs& uris = _app->uris();
const std::string& symbol_str = _symbol_entry->get_text();
const std::string& label = _label_entry->get_text();
- Raul::Path path = _object->path();
+ raul::Path path = _object->path();
const Atom& name_atom = _object->get_property(uris.lv2_name);
if (!label.empty() && (name_atom.type() != uris.forge.String ||
@@ -138,8 +138,8 @@ RenameWindow::ok_clicked()
_app->forge().alloc(label));
}
- if (Raul::Symbol::is_valid(symbol_str)) {
- const Raul::Symbol symbol(symbol_str);
+ if (raul::Symbol::is_valid(symbol_str)) {
+ const raul::Symbol symbol(symbol_str);
if (symbol != _object->symbol()) {
path = _object->path().parent().child(symbol);
_app->interface()->move(_object->path(), path);
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index ff12e028..663529da 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -89,8 +89,8 @@ ThreadedLoader::run()
void
ThreadedLoader::load_graph(bool merge,
const FilePath& file_path,
- const optional<Raul::Path>& engine_parent,
- const optional<Raul::Symbol>& engine_symbol,
+ const optional<raul::Path>& engine_parent,
+ const optional<raul::Symbol>& engine_symbol,
const optional<Properties>& engine_data)
{
std::lock_guard<std::mutex> lock(_mutex);
@@ -116,8 +116,8 @@ ThreadedLoader::load_graph(bool merge,
void
ThreadedLoader::load_graph_event(const FilePath& file_path,
- const optional<Raul::Path>& engine_parent,
- const optional<Raul::Symbol>& engine_symbol,
+ const optional<raul::Path>& engine_parent,
+ const optional<raul::Symbol>& engine_symbol,
const optional<Properties>& engine_data)
{
std::lock_guard<std::mutex> lock(_app.world().rdf_mutex());
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index ebb84c40..5e9392bc 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -31,10 +31,10 @@ namespace boost {
template <class T> class optional;
} // namespace boost
-namespace Raul {
+namespace raul {
class Path;
class Symbol;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -70,8 +70,8 @@ public:
void load_graph(bool merge,
const FilePath& file_path,
- const boost::optional<Raul::Path>& engine_parent,
- const boost::optional<Raul::Symbol>& engine_symbol,
+ const boost::optional<raul::Path>& engine_parent,
+ const boost::optional<raul::Symbol>& engine_symbol,
const boost::optional<Properties>& engine_data);
void save_graph(const std::shared_ptr<const client::GraphModel>& model,
@@ -81,8 +81,8 @@ public:
private:
void load_graph_event(const FilePath& file_path,
- const boost::optional<Raul::Path>& engine_parent,
- const boost::optional<Raul::Symbol>& engine_symbol,
+ const boost::optional<raul::Path>& engine_parent,
+ const boost::optional<raul::Symbol>& engine_symbol,
const boost::optional<Properties>& engine_data);
void
@@ -95,7 +95,7 @@ private:
void run();
App& _app;
- Raul::Semaphore _sem;
+ raul::Semaphore _sem;
std::shared_ptr<Interface> _engine;
std::mutex _mutex;
std::list<Closure> _events;
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 5230f516..581e2e0f 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -99,7 +99,7 @@ public:
void clear();
private:
- using GraphWindowMap = std::map<Raul::Path, GraphWindow*>;
+ using GraphWindowMap = std::map<raul::Path, GraphWindow*>;
GraphWindow*
new_graph_window(const std::shared_ptr<const client::GraphModel>& graph,
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 8efd65bc..ffa50779 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -160,7 +160,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
// Create a GraphBox for the root and set as the UI widget
auto root = std::dynamic_pointer_cast<const ingen::client::GraphModel>(
- ui->app->store()->object(Raul::Path("/")));
+ ui->app->store()->object(raul::Path("/")));
ui->view = ingen::gui::GraphBox::create(*ui->app, root);
ui->view->unparent();
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-10 01:17:29 +0000