RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:17:35 +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

4
Libraries/LibC/grp.cpp
View file

@ -116,7 +116,7 @@ next_entry:
String line(s, Chomp);
auto parts = line.split(':', true);
if (parts.size() != 4) {
fprintf(stderr, "getgrent(): Malformed entry on line %u: '%s' has %u parts\n", __grdb_line_number, line.characters(), parts.size());
fprintf(stderr, "getgrent(): Malformed entry on line %u: '%s' has %zu parts\n", __grdb_line_number, line.characters(), parts.size());
goto next_entry;
}
auto& e_name = parts[0];
@ -133,7 +133,7 @@ next_entry:
__grdb_entry->gr_gid = e_gid;
__grdb_entry->gr_name = __grdb_entry->name_buffer;
__grdb_entry->gr_passwd = __grdb_entry->passwd_buffer;
for (ssize_t i = 0; i < members.size(); ++i) {
for (size_t i = 0; i < members.size(); ++i) {
__grdb_entry->members[i] = __grdb_entry->members_buffer[i];
strcpy(__grdb_entry->members_buffer[i], members[i].characters());
}

10
Libraries/LibCore/ArgsParser.cpp
View file

@ -48,14 +48,14 @@ void ArgsParser::parse(int argc, char** argv)
int index_of_found_long_option = -1;
for (int i = 0; i < m_options.size(); i++) {
for (size_t i = 0; i < m_options.size(); i++) {
auto& opt = m_options[i];
if (opt.long_name) {
option long_opt {
opt.long_name,
opt.requires_argument ? required_argument : no_argument,
&index_of_found_long_option,
i
static_cast<int>(i)
};
long_options.append(long_opt);
}
@ -107,7 +107,7 @@ void ArgsParser::parse(int argc, char** argv)
int values_left = argc - optind;
int num_values_for_arg[m_positional_args.size()];
int total_values_required = 0;
for (int i = 0; i < m_positional_args.size(); i++) {
for (size_t i = 0; i < m_positional_args.size(); i++) {
auto& arg = m_positional_args[i];
num_values_for_arg[i] = arg.min_values;
total_values_required += arg.min_values;
@ -117,7 +117,7 @@ void ArgsParser::parse(int argc, char** argv)
print_usage_and_exit();
int extra_values_to_distribute = values_left - total_values_required;
for (int i = 0; i < m_positional_args.size(); i++) {
for (size_t i = 0; i < m_positional_args.size(); i++) {
auto& arg = m_positional_args[i];
int extra_values_to_this_arg = min(arg.max_values - arg.min_values, extra_values_to_distribute);
num_values_for_arg[i] += extra_values_to_this_arg;
@ -131,7 +131,7 @@ void ArgsParser::parse(int argc, char** argv)
print_usage_and_exit();
}
for (int i = 0; i < m_positional_args.size(); i++) {
for (size_t i = 0; i < m_positional_args.size(); i++) {
auto& arg = m_positional_args[i];
for (int j = 0; j < num_values_for_arg[i]; j++) {
const char* value = argv[optind++];

2
Libraries/LibCore/EventLoop.cpp
View file

@ -296,7 +296,7 @@ void EventLoop::pump(WaitMode mode)
events = move(m_queued_events);
}
for (int i = 0; i < events.size(); ++i) {
for (size_t i = 0; i < events.size(); ++i) {
auto& queued_event = events.at(i);
#ifndef __clang__
ASSERT(queued_event.event);

10
Libraries/LibCore/IODevice.cpp
View file

@ -60,7 +60,7 @@ int IODevice::read(u8* buffer, int length)
return read_buffer.size();
}
ByteBuffer IODevice::read(int max_size)
ByteBuffer IODevice::read(size_t max_size)
{
if (m_fd < 0)
return {};
@ -68,8 +68,8 @@ ByteBuffer IODevice::read(int max_size)
return {};
auto buffer = ByteBuffer::create_uninitialized(max_size);
auto* buffer_ptr = (char*)buffer.data();
int remaining_buffer_space = buffer.size();
int taken_from_buffered = 0;
size_t remaining_buffer_space = buffer.size();
size_t taken_from_buffered = 0;
if (!m_buffered_data.is_empty()) {
taken_from_buffered = min(remaining_buffer_space, m_buffered_data.size());
memcpy(buffer_ptr, m_buffered_data.data(), taken_from_buffered);
@ -171,7 +171,7 @@ ByteBuffer IODevice::read_all()
return ByteBuffer::copy(data.data(), data.size());
}
ByteBuffer IODevice::read_line(int max_size)
ByteBuffer IODevice::read_line(size_t max_size)
{
if (m_fd < 0)
return {};
@ -189,7 +189,7 @@ ByteBuffer IODevice::read_line(int max_size)
return buffer;
}
auto line = ByteBuffer::create_uninitialized(max_size + 1);
int line_index = 0;
size_t line_index = 0;
while (line_index < max_size) {
u8 ch = m_buffered_data[line_index];
line[line_index++] = ch;

4
Libraries/LibCore/IODevice.h
View file

@ -58,8 +58,8 @@ public:
int read(u8* buffer, int length);
ByteBuffer read(int max_size);
ByteBuffer read_line(int max_size);
ByteBuffer read(size_t max_size);
ByteBuffer read_line(size_t max_size);
ByteBuffer read_all();
bool write(const u8*, int size);

2
Libraries/LibCore/Object.cpp
View file

@ -102,7 +102,7 @@ void Object::insert_child_before(Object& new_child, Object& before_child)
void Object::remove_child(Object& object)
{
for (int i = 0; i < m_children.size(); ++i) {
for (size_t i = 0; i < m_children.size(); ++i) {
if (m_children.ptr_at(i).ptr() == &object) {
// NOTE: We protect the child so it survives the handling of ChildRemoved.
NonnullRefPtr<Object> protector = object;

2
Libraries/LibGUI/AbstractTableView.cpp
View file

@ -222,7 +222,7 @@ void AbstractTableView::update_headers()
AbstractTableView::ColumnData& AbstractTableView::column_data(int column) const
{
if (column >= m_column_data.size())
if (static_cast<size_t>(column) >= m_column_data.size())
m_column_data.resize(column + 1);
return m_column_data.at(column);
}

8
Libraries/LibGUI/BoxLayout.cpp
View file

@ -58,9 +58,9 @@ void BoxLayout::run(Widget& widget)
if (should_log)
dbgprintf("BoxLayout: Starting with available size: %s\n", available_size.to_string().characters());
int last_entry_with_automatic_size = -1;
Optional<size_t> last_entry_with_automatic_size;
for (int i = 0; i < m_entries.size(); ++i) {
for (size_t i = 0; i < m_entries.size(); ++i) {
auto& entry = m_entries[i];
if (entry.type == Entry::Type::Spacer) {
++number_of_visible_entries;
@ -123,7 +123,7 @@ void BoxLayout::run(Widget& widget)
int current_x = margins().left();
int current_y = margins().top();
for (int i = 0; i < m_entries.size(); ++i) {
for (size_t i = 0; i < m_entries.size(); ++i) {
auto& entry = m_entries[i];
if (entry.type == Entry::Type::Spacer) {
current_x += automatic_size.width();
@ -141,7 +141,7 @@ void BoxLayout::run(Widget& widget)
}
ASSERT(entry.widget);
if (i == last_entry_with_automatic_size) {
if (last_entry_with_automatic_size.has_value() && i == last_entry_with_automatic_size.value()) {
rect.set_size(automatic_size_for_last_entry);
} else {
rect.set_size(automatic_size);

2
Libraries/LibGUI/ColumnsView.cpp
View file

@ -74,7 +74,7 @@ void ColumnsView::paint_event(PaintEvent& event)
int column_x = 0;
for (int i = 0; i < m_columns.size(); i++) {
for (size_t i = 0; i < m_columns.size(); i++) {
auto& column = m_columns[i];
auto* next_column = i + 1 == m_columns.size() ? nullptr : &m_columns[i + 1];

16
Libraries/LibGUI/CppSyntaxHighlighter.cpp
View file

@ -72,8 +72,8 @@ void CppSyntaxHighlighter::highlight_matching_token_pair()
Backward,
};
auto find_span_of_type = [&](int i, CppToken::Type type, CppToken::Type not_type, Direction direction) {
int nesting_level = 0;
auto find_span_of_type = [&](auto i, CppToken::Type type, CppToken::Type not_type, Direction direction) -> Optional<size_t> {
size_t nesting_level = 0;
bool forward = direction == Direction::Forward;
for (forward ? ++i : --i; forward ? (i < document.spans().size()) : (i >= 0); forward ? ++i : --i) {
auto& span = document.spans().at(i);
@ -85,7 +85,7 @@ void CppSyntaxHighlighter::highlight_matching_token_pair()
return i;
}
}
return -1;
return {};
};
auto make_buddies = [&](int index0, int index1) {
@ -114,15 +114,15 @@ void CppSyntaxHighlighter::highlight_matching_token_pair()
{ CppToken::Type::LeftBracket, CppToken::Type::RightBracket },
};
for (int i = 0; i < document.spans().size(); ++i) {
for (size_t i = 0; i < document.spans().size(); ++i) {
auto& span = const_cast<GUI::TextDocumentSpan&>(document.spans().at(i));
auto token_type = (CppToken::Type)((uintptr_t)span.data);
for (auto& pair : pairs) {
if (token_type == pair.open && span.range.start() == m_editor->cursor()) {
auto buddy = find_span_of_type(i, pair.close, pair.open, Direction::Forward);
if (buddy != -1)
make_buddies(i, buddy);
if (buddy.has_value())
make_buddies(i, buddy.value());
return;
}
}
@ -133,8 +133,8 @@ void CppSyntaxHighlighter::highlight_matching_token_pair()
for (auto& pair : pairs) {
if (token_type == pair.close && right_of_end == m_editor->cursor()) {
auto buddy = find_span_of_type(i, pair.open, pair.close, Direction::Backward);
if (buddy != -1)
make_buddies(i, buddy);
if (buddy.has_value())
make_buddies(i, buddy.value());
return;
}
}

6
Libraries/LibGUI/FileSystemModel.cpp
View file

@ -44,7 +44,7 @@ ModelIndex FileSystemModel::Node::index(const FileSystemModel& model, int column
{
if (!parent)
return {};
for (int row = 0; row < parent->children.size(); ++row) {
for (size_t row = 0; row < parent->children.size(); ++row) {
if (&parent->children[row] == this)
return model.create_index(row, column, const_cast<Node*>(this));
}
@ -169,7 +169,7 @@ ModelIndex FileSystemModel::index(const StringView& path, int column) const
const Node* node = m_root;
if (canonical_path.string() == "/")
return m_root->index(*this, column);
for (int i = 0; i < canonical_path.parts().size(); ++i) {
for (size_t i = 0; i < canonical_path.parts().size(); ++i) {
auto& part = canonical_path.parts()[i];
bool found = false;
for (auto& child : node->children) {
@ -318,7 +318,7 @@ ModelIndex FileSystemModel::index(int row, int column, const ModelIndex& parent)
return {};
auto& node = this->node(parent);
const_cast<Node&>(node).reify_if_needed(*this);
if (row >= node.children.size())
if (static_cast<size_t>(row) >= node.children.size())
return {};
return create_index(row, column, &node.children[row]);
}

2
Libraries/LibGUI/JsonArrayModel.cpp
View file

@ -50,7 +50,7 @@ void JsonArrayModel::update()
Model::ColumnMetadata JsonArrayModel::column_metadata(int column) const
{
ASSERT(column < m_fields.size());
ASSERT(column < static_cast<int>(m_fields.size()));
return { 100, m_fields[column].text_alignment };
}

4
Libraries/LibGUI/Menu.cpp
View file

@ -108,7 +108,7 @@ int Menu::realize_menu()
dbgprintf("GUI::Menu::realize_menu(): New menu ID: %d\n", m_menu_id);
#endif
ASSERT(m_menu_id > 0);
for (int i = 0; i < m_items.size(); ++i) {
for (size_t i = 0; i < m_items.size(); ++i) {
auto& item = m_items[i];
item.set_menu_id({}, m_menu_id);
item.set_identifier({}, i);
@ -157,7 +157,7 @@ void Menu::unrealize_menu()
m_menu_id = 0;
}
Action* Menu::action_at(int index)
Action* Menu::action_at(size_t index)
{
if (index >= m_items.size())
return nullptr;

2
Libraries/LibGUI/Menu.h
View file

@ -50,7 +50,7 @@ public:
const String& name() const { return m_name; }
Action* action_at(int);
Action* action_at(size_t);
void add_action(NonnullRefPtr<Action>);
void add_separator();

2
Libraries/LibGUI/Shortcut.cpp
View file

@ -264,7 +264,7 @@ String Shortcut::to_string() const
parts.append(key_code_to_string(m_key));
StringBuilder builder;
for (int i = 0; i < parts.size(); ++i) {
for (size_t i = 0; i < parts.size(); ++i) {
builder.append(parts[i]);
if (i != parts.size() - 1)
builder.append('+');

4
Libraries/LibGUI/SortingProxyModel.cpp
View file

@ -59,7 +59,7 @@ ModelIndex SortingProxyModel::map_to_target(const ModelIndex& index) const
{
if (!index.is_valid())
return {};
if (index.row() >= m_row_mappings.size() || index.column() >= column_count())
if (static_cast<size_t>(index.row()) >= m_row_mappings.size() || index.column() >= column_count())
return {};
return target().index(m_row_mappings[index.row()], index.column());
}
@ -143,7 +143,7 @@ void SortingProxyModel::resort()
selection.clear();
for (auto& index : selected_indexes_in_target) {
for (int i = 0; i < m_row_mappings.size(); ++i) {
for (size_t i = 0; i < m_row_mappings.size(); ++i) {
if (m_row_mappings[i] == index.row()) {
selection.add(this->index(i, index.column()));
continue;

4
Libraries/LibGUI/SyntaxHighlighter.cpp
View file

@ -24,9 +24,9 @@ void SyntaxHighlighter::cursor_did_change()
ASSERT(m_editor);
auto& document = m_editor->document();
if (m_has_brace_buddies) {
if (m_brace_buddies[0].index >= 0 && m_brace_buddies[0].index < document.spans().size())
if (m_brace_buddies[0].index >= 0 && m_brace_buddies[0].index < static_cast<int>(document.spans().size()))
document.set_span_at_index(m_brace_buddies[0].index, m_brace_buddies[0].span_backup);
if (m_brace_buddies[1].index >= 0 && m_brace_buddies[1].index < document.spans().size())
if (m_brace_buddies[1].index >= 0 && m_brace_buddies[1].index < static_cast<int>(document.spans().size()))
document.set_span_at_index(m_brace_buddies[1].index, m_brace_buddies[1].span_backup);
m_has_brace_buddies = false;
m_editor->update();

14
Libraries/LibGUI/TabWidget.cpp
View file

@ -145,19 +145,19 @@ void TabWidget::paint_event(PaintEvent& event)
Gfx::StylePainter::paint_frame(painter, container_rect, palette(), Gfx::FrameShape::Container, Gfx::FrameShadow::Raised, 2);
for (int i = 0; i < m_tabs.size(); ++i) {
for (size_t i = 0; i < m_tabs.size(); ++i) {
if (m_tabs[i].widget == m_active_widget)
continue;
bool hovered = i == m_hovered_tab_index;
bool hovered = static_cast<int>(i) == m_hovered_tab_index;
auto button_rect = this->button_rect(i);
Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), false, hovered, m_tabs[i].widget->is_enabled());
painter.draw_text(button_rect.translated(0, 1), m_tabs[i].title, Gfx::TextAlignment::Center, palette().button_text());
}
for (int i = 0; i < m_tabs.size(); ++i) {
for (size_t i = 0; i < m_tabs.size(); ++i) {
if (m_tabs[i].widget != m_active_widget)
continue;
bool hovered = i == m_hovered_tab_index;
bool hovered = static_cast<int>(i) == m_hovered_tab_index;
auto button_rect = this->button_rect(i);
Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), true, hovered, m_tabs[i].widget->is_enabled());
painter.draw_text(button_rect.translated(0, 1), m_tabs[i].title, Gfx::TextAlignment::Center, palette().button_text());
@ -190,7 +190,7 @@ int TabWidget::TabData::width(const Gfx::Font& font) const
void TabWidget::mousedown_event(MouseEvent& event)
{
for (int i = 0; i < m_tabs.size(); ++i) {
for (size_t i = 0; i < m_tabs.size(); ++i) {
auto button_rect = this->button_rect(i);
if (!button_rect.contains(event.position()))
continue;
@ -202,7 +202,7 @@ void TabWidget::mousedown_event(MouseEvent& event)
void TabWidget::mousemove_event(MouseEvent& event)
{
int hovered_tab = -1;
for (int i = 0; i < m_tabs.size(); ++i) {
for (size_t i = 0; i < m_tabs.size(); ++i) {
auto button_rect = this->button_rect(i);
if (!button_rect.contains(event.position()))
continue;
@ -243,7 +243,7 @@ void TabWidget::set_tab_position(TabPosition tab_position)
int TabWidget::active_tab_index() const
{
for (int i = 0; i < m_tabs.size(); i++) {
for (size_t i = 0; i < m_tabs.size(); i++) {
if (m_tabs.at(i).widget == m_active_widget)
return i;
}

2
Libraries/LibGUI/TextDocument.cpp
View file

@ -389,7 +389,7 @@ Optional<TextDocumentSpan> TextDocument::first_non_skippable_span_before(const T
Optional<TextDocumentSpan> TextDocument::first_non_skippable_span_after(const TextPosition& position) const
{
for (int i = 0; i < m_spans.size(); ++i) {
for (size_t i = 0; i < m_spans.size(); ++i) {
if (!m_spans[i].range.contains(position))
continue;
while ((i + 1) < m_spans.size() && m_spans[i + 1].is_skippable)

2
Libraries/LibGUI/TextEditor.cpp
View file

@ -1352,7 +1352,7 @@ void TextEditor::recompute_visual_lines(size_t line_index)
visual_data.visual_line_breaks.append(line.length());
if (is_line_wrapping_enabled())
visual_data.visual_rect = { m_horizontal_content_padding, 0, available_width, visual_data.visual_line_breaks.size() * line_height() };
visual_data.visual_rect = { m_horizontal_content_padding, 0, available_width, static_cast<int>(visual_data.visual_line_breaks.size()) * line_height() };
else
visual_data.visual_rect = { m_horizontal_content_padding, 0, font().width(line.view()), line_height() };
}

6
Libraries/LibGUI/UndoStack.cpp
View file

@ -52,7 +52,7 @@ void UndoStack::undo()
return;
}
for (int i = 0; i < undo_vector.size(); i++) {
for (size_t i = 0; i < undo_vector.size(); i++) {
auto& undo_command = undo_vector[i];
undo_command.undo();
}
@ -68,7 +68,7 @@ void UndoStack::redo()
auto& undo_container = m_stack[m_stack_index - 1];
auto& redo_vector = undo_container.m_undo_vector;
for (int i = redo_vector.size() - 1; i >= 0; i--) {
for (int i = static_cast<int>(redo_vector.size()) - 1; i >= 0; i--) {
auto& undo_command = redo_vector[i];
undo_command.redo();
}
@ -84,7 +84,7 @@ void UndoStack::push(NonnullOwnPtr<Command>&& command)
}
// Clear the elements of the stack before the m_undo_stack_index (Excluding our new element)
for (int i = 1; i < m_stack_index; i++)
for (size_t i = 1; i < m_stack_index; i++)
m_stack.remove(1);
if (m_stack_index > 0 && !m_stack.is_empty())

4
Libraries/LibGUI/UndoStack.h
View file

@ -52,8 +52,8 @@ private:
};
NonnullOwnPtrVector<UndoCommandsContainer> m_stack;
int m_stack_index { 0 };
int m_last_updated_undo_vector_size { 0 };
size_t m_stack_index { 0 };
size_t m_last_updated_undo_vector_size { 0 };
};
}

2
Libraries/LibGUI/Widget.cpp
View file

@ -677,7 +677,7 @@ void Widget::focus_previous_widget()
void Widget::focus_next_widget()
{
auto focusable_widgets = window()->focusable_widgets();
for (int i = 0; i < focusable_widgets.size(); ++i) {
for (size_t i = 0; i < focusable_widgets.size(); ++i) {
if (focusable_widgets[i] != this)
continue;
if (i < focusable_widgets.size() - 1)

4
Libraries/LibGfx/DisjointRectSet.cpp
View file

@ -48,9 +48,9 @@ void DisjointRectSet::shatter()
do {
pass_had_intersections = false;
output.clear_with_capacity();
for (int i = 0; i < m_rects.size(); ++i) {
for (size_t i = 0; i < m_rects.size(); ++i) {
auto& r1 = m_rects[i];
for (int j = 0; j < m_rects.size(); ++j) {
for (size_t j = 0; j < m_rects.size(); ++j) {
if (i == j)
continue;
auto& r2 = m_rects[j];

2
Libraries/LibGfx/DisjointRectSet.h
View file

@ -43,7 +43,7 @@ public:
void add(const Rect&);
bool is_empty() const { return m_rects.is_empty(); }
int size() const { return m_rects.size(); }
size_t size() const { return m_rects.size(); }
void clear() { m_rects.clear(); }
void clear_with_capacity() { m_rects.clear_with_capacity(); }

6
Libraries/LibGfx/GIFLoader.cpp
View file

@ -249,13 +249,13 @@ RefPtr<Gfx::Bitmap> load_gif_impl(const u8* data, size_t data_size)
}
// We exited the block loop after finding a trailer. We should have everything needed.
printf("Image count: %d\n", images.size());
printf("Image count: %zu\n", images.size());
if (images.is_empty())
return nullptr;
for (int i = 0; i < images.size(); ++i) {
for (size_t i = 0; i < images.size(); ++i) {
auto& image = images.at(i);
printf("Image %d: %d,%d %dx%d %d bytes LZW-encoded\n", i, image.x, image.y, image.width, image.height, image.lzw_encoded_bytes.size());
printf("Image %zu: %d,%d %dx%d %zu bytes LZW-encoded\n", i, image.x, image.y, image.width, image.height, image.lzw_encoded_bytes.size());
// FIXME: Decode the LZW-encoded bytes and turn them into an image.
}

6
Libraries/LibGfx/PNGLoader.cpp
View file

@ -357,9 +357,9 @@ template<bool has_alpha, u8 filter_type>
for (int i = 0; i < context.width; ++i) {
auto& pixel = (Pixel&)context.bitmap->scanline(y)[i];
auto& color = context.palette_data.at((int)palette_index[i]);
auto transparency = context.palette_transparency_data.size() >= palette_index[i] + 1
? (int)context.palette_transparency_data.data()[palette_index[i]]
: 0xFF;
auto transparency = context.palette_transparency_data.size() >= palette_index[i] + 1u
? context.palette_transparency_data.data()[palette_index[i]]
: 0xff;
pixel.r = color.r;
pixel.g = color.g;
pixel.b = color.b;

6
Libraries/LibGfx/Painter.cpp
View file

@ -767,7 +767,7 @@ void Painter::draw_text(const Rect& rect, const StringView& raw_text, const Font
static const int line_spacing = 4;
int line_height = font.glyph_height() + line_spacing;
Rect bounding_rect { 0, 0, 0, (lines.size() * line_height) - line_spacing };
Rect bounding_rect { 0, 0, 0, (static_cast<int>(lines.size()) * line_height) - line_spacing };
for (auto& line : lines) {
auto line_width = font.width(line);
@ -795,9 +795,9 @@ void Painter::draw_text(const Rect& rect, const StringView& raw_text, const Font
ASSERT_NOT_REACHED();
}
for (int i = 0; i < lines.size(); ++i) {
for (size_t i = 0; i < lines.size(); ++i) {
auto& line = lines[i];
Rect line_rect { bounding_rect.x(), bounding_rect.y() + i * line_height, bounding_rect.width(), line_height };
Rect line_rect { bounding_rect.x(), bounding_rect.y() + static_cast<int>(i) * line_height, bounding_rect.width(), line_height };
line_rect.intersect(rect);
draw_text_line(line_rect, line, font, alignment, color, elision);
}

2
Libraries/LibHTML/DOM/HTMLFormElement.cpp
View file

@ -68,7 +68,7 @@ void HTMLFormElement::submit()
});
StringBuilder builder;
for (int i = 0; i < parameters.size(); ++i) {
for (size_t i = 0; i < parameters.size(); ++i) {
builder.append(parameters[i].name);
builder.append('=');
builder.append(parameters[i].value);

20
Libraries/LibHTML/Dump.cpp
View file

@ -69,8 +69,8 @@ void dump_tree(const Node& node)
void dump_tree(const LayoutNode& layout_node)
{
static int indent = 0;
for (int i = 0; i < indent; ++i)
static size_t indent = 0;
for (size_t i = 0; i < indent; ++i)
dbgprintf(" ");
String tag_name;
@ -122,17 +122,17 @@ void dump_tree(const LayoutNode& layout_node)
if (layout_node.is_block() && static_cast<const LayoutBlock&>(layout_node).children_are_inline()) {
auto& block = static_cast<const LayoutBlock&>(layout_node);
for (int i = 0; i < indent; ++i)
for (size_t i = 0; i < indent; ++i)
dbgprintf(" ");
dbgprintf(" Line boxes (%d):\n", block.line_boxes().size());
for (int line_box_index = 0; line_box_index < block.line_boxes().size(); ++line_box_index) {
for (size_t line_box_index = 0; line_box_index < block.line_boxes().size(); ++line_box_index) {
auto& line_box = block.line_boxes()[line_box_index];
for (int i = 0; i < indent; ++i)
for (size_t i = 0; i < indent; ++i)
dbgprintf(" ");
dbgprintf(" [%d] width: %g\n", line_box_index, line_box.width());
for (int fragment_index = 0; fragment_index < line_box.fragments().size(); ++fragment_index) {
for (size_t fragment_index = 0; fragment_index < line_box.fragments().size(); ++fragment_index) {
auto& fragment = line_box.fragments()[fragment_index];
for (int i = 0; i < indent; ++i)
for (size_t i = 0; i < indent; ++i)
dbgprintf(" ");
dbgprintf(" [%d] layout_node: %s{%p}, start: %d, length: %d, rect: %s\n",
fragment_index,
@ -142,7 +142,7 @@ void dump_tree(const LayoutNode& layout_node)
fragment.length(),
fragment.rect().to_string().characters());
if (fragment.layout_node().is_text()) {
for (int i = 0; i < indent; ++i)
for (size_t i = 0; i < indent; ++i)
dbgprintf(" ");
auto& layout_text = static_cast<const LayoutText&>(fragment.layout_node());
auto fragment_text = layout_text.text_for_rendering().substring(fragment.start(), fragment.length());
@ -153,7 +153,7 @@ void dump_tree(const LayoutNode& layout_node)
}
layout_node.style().for_each_property([&](auto property_id, auto& value) {
for (int i = 0; i < indent; ++i)
for (size_t i = 0; i < indent; ++i)
dbgprintf(" ");
dbgprintf(" (%s: %s)\n", CSS::string_from_property_id(property_id), value.to_string().characters());
});
@ -195,7 +195,7 @@ void dump_rule(const StyleRule& rule)
if (*relation_description)
dbgprintf("{%s} ", relation_description);
for (int i = 0; i < complex_selector.compound_selector.size(); ++i) {
for (size_t i = 0; i < complex_selector.compound_selector.size(); ++i) {
auto& simple_selector = complex_selector.compound_selector[i];
const char* type_description = "Unknown";
switch (simple_selector.type) {

4
Libraries/LibHTML/Layout/LayoutBlock.cpp
View file

@ -143,7 +143,7 @@ void LayoutBlock::layout_inline_children()
float justified_space_width = whitespace_count ? (excess_horizontal_space_including_whitespace / (float)whitespace_count) : 0;
for (int i = 0; i < line_box.fragments().size(); ++i) {
for (size_t i = 0; i < line_box.fragments().size(); ++i) {
auto& fragment = line_box.fragments()[i];
// Vertically align everyone's bottom to the line.
// FIXME: Support other kinds of vertical alignment.
@ -156,7 +156,7 @@ void LayoutBlock::layout_inline_children()
float diff = justified_space_width - fragment.rect().width();
fragment.rect().set_width(justified_space_width);
// Shift subsequent sibling fragments to the right to adjust for change in width.
for (int j = i + 1; j < line_box.fragments().size(); ++j) {
for (size_t j = i + 1; j < line_box.fragments().size(); ++j) {
line_box.fragments()[j].rect().move_by(diff, 0);
}
}

2
Libraries/LibHTML/Layout/LayoutText.cpp
View file

@ -203,7 +203,7 @@ void LayoutText::split_into_lines(LayoutBlock& container)
words.append({ Utf8View(view), start, length });
});
for (int i = 0; i < words.size(); ++i) {
for (size_t i = 0; i < words.size(); ++i) {
auto& word = words[i];
float word_width;

2
Libraries/LibIPC/ClientConnection.h
View file

@ -125,7 +125,7 @@ public:
}
}
ASSERT(nwritten == buffer.size());
ASSERT(static_cast<size_t>(nwritten) == buffer.size());
}
void drain_messages_from_client()

6
Libraries/LibIPC/ServerConnection.h
View file

@ -89,7 +89,7 @@ public:
{
// Double check we don't already have the event waiting for us.
// Otherwise we might end up blocked for a while for no reason.
for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
for (size_t i = 0; i < m_unprocessed_messages.size(); ++i) {
if (m_unprocessed_messages[i]->message_id() == MessageType::static_message_id()) {
auto message = move(m_unprocessed_messages[i]);
m_unprocessed_messages.remove(i);
@ -108,7 +108,7 @@ public:
ASSERT(FD_ISSET(m_connection->fd(), &rfds));
if (!drain_messages_from_server())
return nullptr;
for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
for (size_t i = 0; i < m_unprocessed_messages.size(); ++i) {
if (m_unprocessed_messages[i]->message_id() == MessageType::static_message_id()) {
auto message = move(m_unprocessed_messages[i]);
m_unprocessed_messages.remove(i);
@ -127,7 +127,7 @@ public:
ASSERT_NOT_REACHED();
return false;
}
ASSERT(nwritten == buffer.size());
ASSERT(static_cast<size_t>(nwritten) == buffer.size());
return true;
}

2
Libraries/LibMarkdown/MDText.cpp
View file

@ -212,7 +212,7 @@ bool MDText::parse(const StringView& str)
while (offset < str.length() && str[offset] != ')');
const StringView href = str.substring_view(start_of_href, offset - start_of_href);
for (int i = first_span_in_the_current_link; i < m_spans.size(); i++)
for (size_t i = first_span_in_the_current_link; i < m_spans.size(); i++)
m_spans[i].style.href = href;
first_span_in_the_current_link = -1;
break;

4
Libraries/LibVT/Terminal.cpp
View file

@ -961,12 +961,12 @@ void Terminal::unimplemented_escape()
builder.appendf("((Unimplemented escape: %c", m_final);
if (!m_parameters.is_empty()) {
builder.append(" parameters:");
for (int i = 0; i < m_parameters.size(); ++i)
for (size_t i = 0; i < m_parameters.size(); ++i)
builder.append((char)m_parameters[i]);
}
if (!m_intermediates.is_empty()) {
builder.append(" intermediates:");
for (int i = 0; i < m_intermediates.size(); ++i)
for (size_t i = 0; i < m_intermediates.size(); ++i)
builder.append((char)m_intermediates[i]);
}
builder.append("))");

6
Libraries/LibVT/Terminal.h
View file

@ -128,7 +128,7 @@ public:
return m_lines[index];
}
int max_history_size() const { return 500; }
size_t max_history_size() const { return 500; }
const NonnullOwnPtrVector<Line>& history() const { return m_history; }
void inject_string(const StringView&);
@ -184,8 +184,8 @@ private:
NonnullOwnPtrVector<Line> m_history;
NonnullOwnPtrVector<Line> m_lines;
int m_scroll_region_top { 0 };
int m_scroll_region_bottom { 0 };
size_t m_scroll_region_top { 0 };
size_t m_scroll_region_bottom { 0 };
u16 m_columns { 1 };
u16 m_rows { 1 };