summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-01 15:48:53 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 01:48:48 +0200
commit483ecd16de6801aed536eca64ed51a6a4c669e39 (patch)
treefbb67f71d7a9529d3f9896ab8fdb43816f75d4e5
parent9bc9ce00dd4d64a85700def449d7204c83bb79ad (diff)
downloadingen-483ecd16de6801aed536eca64ed51a6a4c669e39.tar.gz
ingen-483ecd16de6801aed536eca64ed51a6a4c669e39.tar.bz2
ingen-483ecd16de6801aed536eca64ed51a6a4c669e39.zip
Don't access static methods through instances
-rw-r--r--.clang-tidy1
-rw-r--r--src/Parser.cpp2
-rw-r--r--src/client/PluginUI.cpp6
-rw-r--r--src/gui/App.cpp4
-rw-r--r--src/server/RunContext.cpp3
5 files changed, 7 insertions, 9 deletions
diff --git a/.clang-tidy b/.clang-tidy
index 9f13c4fb..c9a4cb1b 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -69,7 +69,6 @@ Checks: >
-readability-else-after-return,
-readability-implicit-bool-conversion,
-readability-named-parameter,
- -readability-static-accessed-through-instance,
WarningsAsErrors: '*'
HeaderFilterRegex: 'ingen/.*|tests/.*|src/.*'
FormatStyle: file
diff --git a/src/Parser.cpp b/src/Parser.cpp
index e7bd0163..55ab4695 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -121,7 +121,7 @@ get_properties(ingen::World& world,
*world.rdf_world(), model.c_obj(), i.get_object().c_obj());
const LV2_Atom* atom = forge.atom();
Atom atomm;
- atomm = world.forge().alloc(
+ atomm = Forge::alloc(
atom->size, atom->type, LV2_ATOM_BODY_CONST(atom));
props.emplace(i.get_predicate(), Property(atomm, ctx));
}
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 9c759696..1074be3e 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -81,9 +81,9 @@ lv2_ui_write(SuilController controller,
} else if (format == uris.atom_eventTransfer.urid()) {
const auto* atom = static_cast<const LV2_Atom*>(buffer);
- Atom val = ui->world().forge().alloc(atom->size,
- atom->type,
- LV2_ATOM_BODY_CONST(atom));
+ Atom val = Forge::alloc(atom->size,
+ atom->type,
+ LV2_ATOM_BODY_CONST(atom));
ui->signal_property_changed()(port->uri(),
uris.ingen_activity,
val,
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index fa48cb18..dc8f605a 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -151,12 +151,12 @@ App::run()
// with 'ingen -egl' we'd get a bunch of notifications about load
// immediately before even knowing about the root graph or plugins)
while (!_connect_window->attached()) {
- if (_main->iteration()) {
+ if (Gtk::Main::iteration()) {
break;
}
}
- _main->run();
+ Gtk::Main::run();
}
void
diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp
index 57aaa299..b4b8156e 100644
--- a/src/server/RunContext.cpp
+++ b/src/server/RunContext.cpp
@@ -124,8 +124,7 @@ RunContext::emit_notifications(FrameTime end)
return;
}
if (_event_sink->read(sizeof(note), &note) == sizeof(note)) {
- Atom value = _engine.world().forge().alloc(
- note.size, note.type, nullptr);
+ Atom value = Forge::alloc(note.size, note.type, nullptr);
if (_event_sink->read(note.size, value.get_body()) == note.size) {
i += note.size;
const char* key = _engine.world().uri_map().unmap_uri(note.key);