diff options
| author | David Robillard <d@drobilla.net> | 2024-10-06 17:00:07 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2024-10-11 19:37:24 -0400 |
| commit | 932c0db65e54d24cbc9131e00412a7f0a8f2bcd2 (patch) | |
| tree | 1a2e3542d8e480e6135243b5e96b62ac84b0322d | |
| parent | 1ecbb458c9877cf18d0438449d8757fb713d46d2 (diff) | |
| download | ingen-932c0db65e54d24cbc9131e00412a7f0a8f2bcd2.tar.gz ingen-932c0db65e54d24cbc9131e00412a7f0a8f2bcd2.tar.bz2 ingen-932c0db65e54d24cbc9131e00412a7f0a8f2bcd2.zip | |
Reduce variable scopes
| -rw-r--r-- | .suppress.cppcheck | 1 | ||||
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 19 | ||||
| -rw-r--r-- | src/gui/GraphBox.cpp | 6 | ||||
| -rw-r--r-- | src/runtime_paths.cpp | 3 | ||||
| -rw-r--r-- | src/server/events/Delta.cpp | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/.suppress.cppcheck b/.suppress.cppcheck index 44f9e760..55309381 100644 --- a/.suppress.cppcheck +++ b/.suppress.cppcheck @@ -18,5 +18,4 @@ shadowFunction unsafeClassCanLeak useStlAlgorithm uselessOverride -variableScope virtualCallInConstructor diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index b33c3b81..3c9f7e89 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -440,18 +440,17 @@ ConnectWindow::internal_toggled() void ConnectWindow::next_stage() { - static const char* labels[] = { - "Connecting...", - "Pinging engine...", - "Attaching to engine...", - "Requesting root graph...", - "Waiting for root graph...", - "Connected" - }; - - ++_connect_stage; if (_widgets_loaded) { + static const char* labels[] = { + "Connecting...", + "Pinging engine...", + "Attaching to engine...", + "Requesting root graph...", + "Waiting for root graph...", + "Connected" + }; + _progress_label->set_text(labels[_connect_stage]); } } diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index 0764e4ed..4c3ff50d 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -885,10 +885,10 @@ GraphBox::event_refresh_activated() void GraphBox::event_fullscreen_toggled() { - // FIXME: ugh, use GTK signals to track state and know for sure - static bool is_fullscreen = false; - if (_window) { + // FIXME: ugh, use GTK signals to track state and know for sure + static bool is_fullscreen = false; + if (!is_fullscreen) { _window->fullscreen(); is_fullscreen = true; diff --git a/src/runtime_paths.cpp b/src/runtime_paths.cpp index b876ebd4..cca9490d 100644 --- a/src/runtime_paths.cpp +++ b/src/runtime_paths.cpp @@ -44,7 +44,8 @@ static const char* const library_suffix = ".so"; #endif static std::vector<FilePath> -parse_search_path(const char* search_path, std::vector<FilePath> defaults) +parse_search_path(const char* search_path, + const std::vector<FilePath>& defaults) { if (!search_path) { return defaults; diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 3f9e3b9d..96f13ee5 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -316,8 +316,8 @@ Delta::pre_process(PreProcessContext& ctx) const Property& value = p.second; SpecialType op = SpecialType::NONE; if (obj) { - Resource& resource = *obj; if (value != uris.patch_wildcard) { + Resource& resource = *obj; if (resource.add_property(key, value, value.context())) { _added.emplace(key, value); } |