RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:17:44 +00:00
Code Issues Activity Actions

Everywhere: Replace Vector<T*> with nonnull entries with Vector<T&>

Browse source
This commit is contained in:
Ali Mohammad Pur 2021-06-08 19:36:27 +04:30 • committed by Andreas Kling
parent 3d94b5051d
commit 7ac196974d
22 changed files with 92 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibGUI/Widget.cpp
View file

@ -851,14 +851,14 @@ void Widget::focus_previous_widget(FocusSource source, bool siblings_only)
{
auto focusable_widgets = window()->focusable_widgets(source);
if (siblings_only)
focusable_widgets.remove_all_matching([this](auto& entry) { return entry->parent() != parent(); });
focusable_widgets.remove_all_matching([this](auto& entry) { return entry.parent() != parent(); });
for (int i = focusable_widgets.size() - 1; i >= 0; --i) {
if (focusable_widgets[i] != this)
if (&focusable_widgets[i] != this)
continue;
if (i > 0)
focusable_widgets[i - 1]->set_focus(true, source);
focusable_widgets[i - 1].set_focus(true, source);
else
focusable_widgets.last()->set_focus(true, source);
focusable_widgets.last().set_focus(true, source);
}
}
@ -866,24 +866,24 @@ void Widget::focus_next_widget(FocusSource source, bool siblings_only)
{
auto focusable_widgets = window()->focusable_widgets(source);
if (siblings_only)
focusable_widgets.remove_all_matching([this](auto& entry) { return entry->parent() != parent(); });
focusable_widgets.remove_all_matching([this](auto& entry) { return entry.parent() != parent(); });
for (size_t i = 0; i < focusable_widgets.size(); ++i) {
if (focusable_widgets[i] != this)
if (&focusable_widgets[i] != this)
continue;
if (i < focusable_widgets.size() - 1)
focusable_widgets[i + 1]->set_focus(true, source);
focusable_widgets[i + 1].set_focus(true, source);
else
focusable_widgets.first()->set_focus(true, source);
focusable_widgets.first().set_focus(true, source);
}
}
Vector<Widget*> Widget::child_widgets() const
Vector<Widget&> Widget::child_widgets() const
{
Vector<Widget*> widgets;
Vector<Widget&> widgets;
widgets.ensure_capacity(children().size());
for (auto& child : const_cast<Widget*>(this)->children()) {
if (is<Widget>(child))
widgets.append(static_cast<Widget*>(&child));
widgets.append(static_cast<Widget&>(child));
}
return widgets;
}