RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:57:45 +00:00
Code Issues Activity Actions

AK: Make Vector use size_t for its size and capacity

Browse source
This commit is contained in:
Andreas Kling 2020-02-25 14:49:47 +01:00
parent 9c6f7d3e7d
commit ceec1a7d38
94 changed files with 323 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/SystemServer/Service.cpp
View file

@ -241,7 +241,7 @@ void Service::spawn()
char* argv[m_extra_arguments.size() + 2];
argv[0] = const_cast<char*>(m_executable_path.characters());
for (int i = 0; i < m_extra_arguments.size(); i++)
for (size_t i = 0; i < m_extra_arguments.size(); i++)
argv[i + 1] = const_cast<char*>(m_extra_arguments[i].characters());
argv[m_extra_arguments.size() + 1] = nullptr;

9
Servers/WindowServer/AppletManager.cpp
View file

@ -72,10 +72,11 @@ void AppletManager::add_applet(Window& applet)
m_applets.append(applet.make_weak_ptr());
quick_sort(m_applets.begin(), m_applets.end(), [](auto& a, auto& b) {
int index_a = order_vector.find_first_index(a->title());
int index_b = order_vector.find_first_index(b->title());
return index_a > index_b;
auto index_a = order_vector.find_first_index(a->title());
auto index_b = order_vector.find_first_index(b->title());
ASSERT(index_a.has_value());
ASSERT(index_b.has_value());
return index_a.value() > index_b.value();
});
calculate_applet_rects(MenuManager::the().window());

2
Servers/WindowServer/ClientConnection.cpp
View file

@ -482,7 +482,7 @@ void ClientConnection::handle(const Messages::WindowServer::InvalidateRect& mess
return;
}
auto& window = *(*it).value;
for (int i = 0; i < message.rects().size(); ++i)
for (size_t i = 0; i < message.rects().size(); ++i)
window.request_update(message.rects()[i].intersected({ {}, window.size() }), message.ignore_occlusion());
}

8
Servers/WindowServer/Menu.cpp
View file

@ -403,7 +403,7 @@ void Menu::event(Core::Event& event)
--m_hovered_item_index;
} while (hovered_item()->type() == MenuItem::Separator);
ASSERT(m_hovered_item_index >= 0 && m_hovered_item_index <= m_items.size() - 1);
ASSERT(m_hovered_item_index >= 0 && m_hovered_item_index <= static_cast<int>(m_items.size()) - 1);
if (is_scrollable() && m_hovered_item_index < m_scroll_offset)
--m_scroll_offset;
@ -415,17 +415,17 @@ void Menu::event(Core::Event& event)
if (key == Key_Down) {
ASSERT(m_items.at(0).type() != MenuItem::Separator);
if (is_scrollable() && m_hovered_item_index == m_items.size() - 1)
if (is_scrollable() && m_hovered_item_index == static_cast<int>(m_items.size()) - 1)
return;
do {
if (m_hovered_item_index == m_items.size() - 1)
if (m_hovered_item_index == static_cast<int>(m_items.size()) - 1)
m_hovered_item_index = 0;
else
++m_hovered_item_index;
} while (hovered_item()->type() == MenuItem::Separator);
ASSERT(m_hovered_item_index >= 0 && m_hovered_item_index <= m_items.size() - 1);
ASSERT(m_hovered_item_index >= 0 && m_hovered_item_index <= static_cast<int>(m_items.size()) - 1);
if (is_scrollable() && m_hovered_item_index >= (m_scroll_offset + visible_item_count()))
++m_scroll_offset;

2
Servers/WindowServer/MenuManager.cpp
View file

@ -67,7 +67,7 @@ MenuManager::~MenuManager()
bool MenuManager::is_open(const Menu& menu) const
{
for (int i = 0; i < m_open_menu_stack.size(); ++i) {
for (size_t i = 0; i < m_open_menu_stack.size(); ++i) {
if (&menu == m_open_menu_stack[i].ptr())
return true;
}

20
Servers/WindowServer/WindowSwitcher.cpp
View file

@ -66,7 +66,7 @@ void WindowSwitcher::set_visible(bool visible)
Window* WindowSwitcher::selected_window()
{
if (m_selected_index < 0 || m_selected_index >= m_windows.size())
if (m_selected_index < 0 || m_selected_index >= static_cast<int>(m_windows.size()))
return nullptr;
return m_windows[m_selected_index].ptr();
}
@ -78,7 +78,7 @@ void WindowSwitcher::event(Core::Event& event)
auto& mouse_event = static_cast<MouseEvent&>(event);
int new_hovered_index = -1;
for (int i = 0; i < m_windows.size(); ++i) {
for (size_t i = 0; i < m_windows.size(); ++i) {
auto item_rect = this->item_rect(i);
if (item_rect.contains(mouse_event.position())) {
new_hovered_index = i;
@ -128,20 +128,20 @@ void WindowSwitcher::on_key_event(const KeyEvent& event)
int new_selected_index;
if (!event.shift()) {
new_selected_index = (m_selected_index + 1) % m_windows.size();
new_selected_index = (m_selected_index + 1) % static_cast<int>(m_windows.size());
} else {
new_selected_index = (m_selected_index - 1) % m_windows.size();
new_selected_index = (m_selected_index - 1) % static_cast<int>(m_windows.size());
if (new_selected_index < 0)
new_selected_index = m_windows.size() - 1;
new_selected_index = static_cast<int>(m_windows.size()) - 1;
}
ASSERT(new_selected_index < m_windows.size());
ASSERT(new_selected_index < static_cast<int>(m_windows.size()));
select_window_at_index(new_selected_index);
}
void WindowSwitcher::select_window(Window& window)
{
for (int i = 0; i < m_windows.size(); ++i) {
for (size_t i = 0; i < m_windows.size(); ++i) {
if (m_windows.at(i) == &window) {
select_window_at_index(i);
return;
@ -180,17 +180,17 @@ void WindowSwitcher::draw()
Gfx::Painter painter(*m_switcher_window->backing_store());
painter.fill_rect({ {}, m_rect.size() }, palette.window());
painter.draw_rect({ {}, m_rect.size() }, palette.threed_shadow2());
for (int index = 0; index < m_windows.size(); ++index) {
for (size_t index = 0; index < m_windows.size(); ++index) {
auto& window = *m_windows.at(index);
auto item_rect = this->item_rect(index);
Color text_color;
Color rect_text_color;
if (index == m_selected_index) {
if (static_cast<int>(index) == m_selected_index) {
painter.fill_rect(item_rect, palette.selection());
text_color = palette.selection_text();
rect_text_color = palette.threed_shadow1();
} else {
if (index == m_hovered_index)
if (static_cast<int>(index) == m_hovered_index)
Gfx::StylePainter::paint_button(painter, item_rect, palette, Gfx::ButtonStyle::CoolBar, false, true);
text_color = palette.window_text();
rect_text_color = palette.threed_shadow2();