Skip to content

Commit

Permalink
Userland: Migrate to argument-less deferred_invoke
Browse files Browse the repository at this point in the history
Only one place used this argument and it was to hold on to a strong ref
for the object. Since we already do that now, there's no need to keep
this argument around since this can be easily captured.

This commit contains no changes.
  • Loading branch information
sin-ack authored and alimpfard committed Sep 1, 2021
1 parent e9121f8 commit 8ea2212
Show file tree
Hide file tree
Showing 32 changed files with 72 additions and 75 deletions.
4 changes: 2 additions & 2 deletions Userland/Applications/Browser/BrowserWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ void BrowserWindow::create_new_tab(URL url, bool activate)
};

new_tab.on_tab_close_request = [this](auto& tab) {
m_tab_widget->deferred_invoke([this, &tab](auto&) {
m_tab_widget->deferred_invoke([this, &tab] {
m_tab_widget->remove_tab(tab);
m_tab_widget->set_bar_visible(!is_fullscreen() && m_tab_widget->children().size() > 1);
if (m_tab_widget->children().is_empty())
Expand All @@ -443,7 +443,7 @@ void BrowserWindow::create_new_tab(URL url, bool activate)
};

new_tab.on_tab_close_other_request = [this](auto& tab) {
m_tab_widget->deferred_invoke([this, &tab](auto&) {
m_tab_widget->deferred_invoke([this, &tab] {
m_tab_widget->remove_all_tabs_except(tab);
VERIFY(m_tab_widget->children().size() == 1);
m_tab_widget->set_bar_visible(false);
Expand Down
2 changes: 1 addition & 1 deletion Userland/Applications/FontEditor/FontEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ void FontEditorWidget::initialize(const String& path, RefPtr<Gfx::BitmapFont>&&
m_fixed_width_checkbox->set_checked(m_edited_font->is_fixed_width());

m_glyph_map_widget->set_selected_glyph('A');
deferred_invoke([this](auto&) {
deferred_invoke([this] {
m_glyph_map_widget->set_focus(true);
m_glyph_map_widget->scroll_to_glyph(m_glyph_map_widget->selected_glyph());
window()->set_modified(false);
Expand Down
4 changes: 2 additions & 2 deletions Userland/Applications/FontEditor/NewFontDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,15 @@ NewFontDialog::NewFontDialog(GUI::Window* parent_window)

m_glyph_width_spinbox->on_change = [&](int value) {
preview_editor.set_preview_size(value, m_glyph_height_spinbox->value());
deferred_invoke([&](auto&) {
deferred_invoke([&] {
m_glyph_editor_container->set_fixed_height(1 + preview_editor.height() + preview_editor.frame_thickness() * 2);
});
};
m_glyph_height_spinbox->on_change = [&](int value) {
preview_editor.set_preview_size(m_glyph_width_spinbox->value(), value);
m_mean_line_spinbox->set_max(max(value - 2, 0));
m_baseline_spinbox->set_max(max(value - 2, 0));
deferred_invoke([&](auto&) {
deferred_invoke([&] {
m_glyph_editor_container->set_fixed_height(1 + preview_editor.height() + preview_editor.frame_thickness() * 2);
});
};
Expand Down
2 changes: 1 addition & 1 deletion Userland/Applications/Help/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ int main(int argc, char* argv[])
auto url = URL::create_with_file_protocol(path);
page_view.load_html(html, url);

app->deferred_invoke([&, path](auto&) {
app->deferred_invoke([&, path] {
auto tree_view_index = model->index_from_path(path);
if (tree_view_index.has_value()) {
tree_view.expand_tree(tree_view_index.value().parent());
Expand Down
2 changes: 1 addition & 1 deletion Userland/Applications/PixelPaint/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ int main(int argc, char** argv)
layer_properties_widget.set_layer(nullptr);
}

tab_widget.deferred_invoke([&](auto&) {
tab_widget.deferred_invoke([&] {
tab_widget.remove_tab(image_editor);
});
};
Expand Down
2 changes: 1 addition & 1 deletion Userland/Libraries/LibGUI/ComboBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ComboBox::ComboBox()
};

m_list_view->on_activation = [this](auto& index) {
deferred_invoke([this, index](auto&) {
deferred_invoke([this, index] {
selection_updated(index);
if (on_change)
on_change(m_editor->text(), index);
Expand Down
8 changes: 4 additions & 4 deletions Userland/Libraries/LibGUI/TabWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void TabWidget::set_active_widget(Widget* widget)
if (active_widget_had_focus)
m_active_widget->set_focus(true);
m_active_widget->set_visible(true);
deferred_invoke([this](auto&) {
deferred_invoke([this] {
if (on_change)
on_change(*m_active_widget);
});
Expand Down Expand Up @@ -396,7 +396,7 @@ void TabWidget::mousedown_event(MouseEvent& event)
set_active_widget(m_tabs[i].widget);
} else if (event.button() == MouseButton::Middle) {
auto* widget = m_tabs[i].widget;
deferred_invoke([this, widget](auto&) {
deferred_invoke([this, widget] {
if (on_middle_click && widget)
on_middle_click(*widget);
});
Expand All @@ -417,7 +417,7 @@ void TabWidget::mouseup_event(MouseEvent& event)

if (close_button_rect.contains(event.position())) {
auto* widget = m_tabs[m_pressed_close_button_index.value()].widget;
deferred_invoke([this, widget](auto&) {
deferred_invoke([this, widget] {
if (on_tab_close_click && widget)
on_tab_close_click(*widget);
});
Expand Down Expand Up @@ -573,7 +573,7 @@ void TabWidget::context_menu_event(ContextMenuEvent& context_menu_event)
if (!button_rect.contains(context_menu_event.position()))
continue;
auto* widget = m_tabs[i].widget;
deferred_invoke([this, widget, context_menu_event](auto&) {
deferred_invoke([this, widget, context_menu_event] {
if (on_context_menu_request && widget)
on_context_menu_request(*widget, context_menu_event);
});
Expand Down
2 changes: 1 addition & 1 deletion Userland/Libraries/LibGUI/TextEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@ void TextEditor::did_change()
m_needs_rehighlight = true;
if (!m_has_pending_change_notification) {
m_has_pending_change_notification = true;
deferred_invoke([this](auto&) {
deferred_invoke([this] {
m_has_pending_change_notification = false;
if (on_change)
on_change();
Expand Down
4 changes: 2 additions & 2 deletions Userland/Libraries/LibGUI/Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ void Window::update(const Gfx::IntRect& a_rect)
}

if (m_pending_paint_event_rects.is_empty()) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
auto rects = move(m_pending_paint_event_rects);
if (rects.is_empty())
return;
Expand Down Expand Up @@ -1029,7 +1029,7 @@ void Window::schedule_relayout()
if (m_layout_pending)
return;
m_layout_pending = true;
deferred_invoke([this](auto&) {
deferred_invoke([this] {
if (main_widget())
main_widget()->do_layout();
update();
Expand Down
2 changes: 1 addition & 1 deletion Userland/Libraries/LibGUI/WindowServerConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void WindowServerConnection::display_link_notification()
return;

m_display_link_notification_pending = true;
deferred_invoke([this](auto&) {
deferred_invoke([this] {
DisplayLink::notify({});
m_display_link_notification_pending = false;
});
Expand Down
8 changes: 4 additions & 4 deletions Userland/Libraries/LibGemini/GeminiJob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ void GeminiJob::start()
};
m_socket->on_tls_error = [this](TLS::AlertDescription error) {
if (error == TLS::AlertDescription::HandshakeFailure) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ProtocolFailed);
});
} else if (error == TLS::AlertDescription::DecryptError) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed);
});
} else {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::TransmissionFailed);
});
}
Expand All @@ -47,7 +47,7 @@ void GeminiJob::start()
};
bool success = ((TLS::TLSv12&)*m_socket).connect(m_request.url().host(), m_request.url().port());
if (!success) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed);
});
}
Expand Down
18 changes: 9 additions & 9 deletions Userland/Libraries/LibGemini/Job.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void Job::on_socket_connected()
}
bool success = write(raw_request);
if (!success)
deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
deferred_invoke([this] { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
});
register_on_ready_to_read([this] {
if (is_cancelled())
Expand All @@ -66,19 +66,19 @@ void Job::on_socket_connected()
auto line = read_line(PAGE_SIZE);
if (line.is_null()) {
warnln("Job: Expected status line");
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
}

auto parts = line.split_limit(' ', 2);
if (parts.size() != 2) {
warnln("Job: Expected 2-part status line, got '{}'", line);
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}

auto status = parts[0].to_uint();
if (!status.has_value()) {
warnln("Job: Expected numeric status code");
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}

m_status = status.value();
Expand All @@ -98,7 +98,7 @@ void Job::on_socket_connected()
m_state = State::InBody;
} else {
warnln("Job: Expected status between 10 and 69; instead got {}", m_status);
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}

return;
Expand All @@ -117,7 +117,7 @@ void Job::on_socket_connected()
}

if (should_fail_on_empty_payload()) {
deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return IterationDecision::Break;
}
}
Expand All @@ -126,7 +126,7 @@ void Job::on_socket_connected()
m_received_size += payload.size();
flush_received_buffers();

deferred_invoke([this](auto&) { did_progress({}, m_received_size); });
deferred_invoke([this] { did_progress({}, m_received_size); });

return IterationDecision::Continue;
});
Expand All @@ -147,14 +147,14 @@ void Job::finish_up()
// before we can actually call `did_finish`. in a normal flow, this should
// never be hit since the client is reading as we are writing, unless there
// are too many concurrent downloads going on.
deferred_invoke([this](auto&) {
deferred_invoke([this] {
finish_up();
});
return;
}

auto response = GeminiResponse::create(m_status, m_meta);
deferred_invoke([this, response](auto&) {
deferred_invoke([this, response] {
did_finish(move(response));
});
}
Expand Down
4 changes: 2 additions & 2 deletions Userland/Libraries/LibHTTP/HttpJob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ void HttpJob::start()
};
m_socket->on_error = [this] {
dbgln_if(CHTTPJOB_DEBUG, "HttpJob: on_error callback");
deferred_invoke([this](auto&) {
deferred_invoke([this] {
did_fail(Core::NetworkJob::Error::ConnectionFailed);
});
};
bool success = m_socket->connect(m_request.url().host(), m_request.url().port());
if (!success) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed);
});
}
Expand Down
8 changes: 4 additions & 4 deletions Userland/Libraries/LibHTTP/HttpsJob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ void HttpsJob::start()
};
m_socket->on_tls_error = [&](TLS::AlertDescription error) {
if (error == TLS::AlertDescription::HandshakeFailure) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ProtocolFailed);
});
} else if (error == TLS::AlertDescription::DecryptError) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed);
});
} else {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::TransmissionFailed);
});
}
Expand All @@ -48,7 +48,7 @@ void HttpsJob::start()
};
bool success = ((TLS::TLSv12&)*m_socket).connect(m_request.url().host(), m_request.url().port());
if (!success) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
return did_fail(Core::NetworkJob::Error::ConnectionFailed);
});
}
Expand Down
20 changes: 10 additions & 10 deletions Userland/Libraries/LibHTTP/Job.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void Job::on_socket_connected()

bool success = write(raw_request);
if (!success)
deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
deferred_invoke([this] { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
});
register_on_ready_to_read([&] {
if (is_cancelled())
Expand All @@ -137,17 +137,17 @@ void Job::on_socket_connected()
auto line = read_line(PAGE_SIZE);
if (line.is_null()) {
warnln("Job: Expected HTTP status");
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
}
auto parts = line.split_view(' ');
if (parts.size() < 3) {
warnln("Job: Expected 3-part HTTP status, got '{}'", line);
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}
auto code = parts[1].to_uint();
if (!code.has_value()) {
warnln("Job: Expected numeric HTTP status");
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}
m_code = code.value();
m_state = State::InHeaders;
Expand Down Expand Up @@ -186,7 +186,7 @@ void Job::on_socket_connected()
return finish_up();
}
warnln("Job: Expected HTTP header with key/value");
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}
auto name = parts[0];
if (line.length() < name.length() + 2) {
Expand All @@ -197,7 +197,7 @@ void Job::on_socket_connected()
return finish_up();
}
warnln("Job: Malformed HTTP header: '{}' ({})", line, line.length());
return deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
}
auto value = line.substring(name.length() + 2, line.length() - name.length() - 2);
m_headers.set(name, value);
Expand Down Expand Up @@ -238,7 +238,7 @@ void Job::on_socket_connected()
auto size = strtoul(size_string.characters(), &endptr, 16);
if (*endptr) {
// invalid number
deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
deferred_invoke([this] { did_fail(Core::NetworkJob::Error::TransmissionFailed); });
return IterationDecision::Break;
}
if (size == 0) {
Expand Down Expand Up @@ -287,7 +287,7 @@ void Job::on_socket_connected()
}

if (should_fail_on_empty_payload()) {
deferred_invoke([this](auto&) { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
deferred_invoke([this] { did_fail(Core::NetworkJob::Error::ProtocolFailed); });
return IterationDecision::Break;
}
}
Expand Down Expand Up @@ -330,7 +330,7 @@ void Job::on_socket_connected()
content_length = length.value();
}

deferred_invoke([this, content_length](auto&) { did_progress(content_length, m_received_size); });
deferred_invoke([this, content_length] { did_progress(content_length, m_received_size); });

if (content_length.has_value()) {
auto length = content_length.value();
Expand Down Expand Up @@ -397,7 +397,7 @@ void Job::finish_up()

m_has_scheduled_finish = true;
auto response = HttpResponse::create(m_code, move(m_headers));
deferred_invoke([this, response = move(response)](auto&) {
deferred_invoke([this, response = move(response)] {
did_finish(response);
});
}
Expand Down
4 changes: 2 additions & 2 deletions Userland/Libraries/LibIPC/Connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class Connection : public Core::Object {
}
if (nread == 0) {
if (bytes.is_empty()) {
deferred_invoke([this](auto&) { shutdown(); });
deferred_invoke([this] { shutdown(); });
return false;
}
break;
Expand Down Expand Up @@ -241,7 +241,7 @@ class Connection : public Core::Object {
}

if (!m_unprocessed_messages.is_empty()) {
deferred_invoke([this](auto&) {
deferred_invoke([this] {
handle_messages();
});
}
Expand Down
Loading

0 comments on commit 8ea2212

Please sign in to comment.