mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 13:37:45 +00:00
Everywhere: Stop using NonnullRefPtrVector
This class had slightly confusing semantics and the added weirdness doesn't seem worth it just so we can say "." instead of "->" when iterating over a vector of NNRPs. This patch replaces NonnullRefPtrVector<T> with Vector<NNRP<T>>.
This commit is contained in:
parent
104be6c8ac
commit
8a48246ed1
168 changed files with 1280 additions and 1280 deletions
|
@ -243,13 +243,13 @@ void BookmarksBarWidget::update_content_size()
|
|||
|
||||
for (size_t i = 0; i < m_bookmarks.size(); ++i) {
|
||||
auto& bookmark = m_bookmarks.at(i);
|
||||
if (x_position + bookmark.width() + m_additional->width() > width()) {
|
||||
if (x_position + bookmark->width() + m_additional->width() > width()) {
|
||||
m_last_visible_index = i;
|
||||
break;
|
||||
}
|
||||
bookmark.set_x(x_position);
|
||||
bookmark.set_visible(true);
|
||||
x_position += bookmark.width();
|
||||
bookmark->set_x(x_position);
|
||||
bookmark->set_visible(true);
|
||||
x_position += bookmark->width();
|
||||
}
|
||||
|
||||
if (m_last_visible_index < 0) {
|
||||
|
@ -261,8 +261,8 @@ void BookmarksBarWidget::update_content_size()
|
|||
m_additional->set_menu(m_additional_menu);
|
||||
for (size_t i = m_last_visible_index; i < m_bookmarks.size(); ++i) {
|
||||
auto& bookmark = m_bookmarks.at(i);
|
||||
bookmark.set_visible(false);
|
||||
m_additional_menu->add_action(GUI::Action::create(bookmark.text().to_deprecated_string(), g_icon_bag.filetype_html, [&](auto&) { bookmark.on_click(0); }));
|
||||
bookmark->set_visible(false);
|
||||
m_additional_menu->add_action(GUI::Action::create(bookmark->text().to_deprecated_string(), g_icon_bag.filetype_html, [&](auto&) { bookmark->on_click(0); }));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -66,7 +66,7 @@ private:
|
|||
RefPtr<GUI::Action> m_context_menu_default_action;
|
||||
DeprecatedString m_context_menu_url;
|
||||
|
||||
NonnullRefPtrVector<GUI::Button> m_bookmarks;
|
||||
Vector<NonnullRefPtr<GUI::Button>> m_bookmarks;
|
||||
|
||||
int m_last_visible_index { -1 };
|
||||
};
|
||||
|
|
|
@ -65,7 +65,7 @@ WindowActions::WindowActions(GUI::Window& window)
|
|||
on_tabs[i]();
|
||||
},
|
||||
&window));
|
||||
m_tab_actions.last().set_status_tip(DeprecatedString::formatted("Switch to tab {}", i + 1));
|
||||
m_tab_actions.last()->set_status_tip(DeprecatedString::formatted("Switch to tab {}", i + 1));
|
||||
}
|
||||
m_tab_actions.append(GUI::Action::create(
|
||||
"Last tab", { Mod_Ctrl, Key_9 }, [this](auto&) {
|
||||
|
@ -73,7 +73,7 @@ WindowActions::WindowActions(GUI::Window& window)
|
|||
on_tabs[8]();
|
||||
},
|
||||
&window));
|
||||
m_tab_actions.last().set_status_tip("Switch to last tab");
|
||||
m_tab_actions.last()->set_status_tip("Switch to last tab");
|
||||
|
||||
m_about_action = GUI::CommonActions::make_about_action("Browser", GUI::Icon::default_icon("app-browser"sv), &window);
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ private:
|
|||
RefPtr<GUI::Action> m_create_new_window_action;
|
||||
RefPtr<GUI::Action> m_next_tab_action;
|
||||
RefPtr<GUI::Action> m_previous_tab_action;
|
||||
NonnullRefPtrVector<GUI::Action> m_tab_actions;
|
||||
Vector<NonnullRefPtr<GUI::Action>> m_tab_actions;
|
||||
RefPtr<GUI::Action> m_about_action;
|
||||
RefPtr<GUI::Action> m_show_bookmarks_bar_action;
|
||||
RefPtr<GUI::Action> m_vertical_tabs_action;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue