diff --git a/AK/JsonArray.h b/AK/JsonArray.h index a7bbff1573..575549def2 100644 --- a/AK/JsonArray.h +++ b/AK/JsonArray.h @@ -48,7 +48,7 @@ public: return *this; } - int size() const { return m_values.size(); } + size_t size() const { return m_values.size(); } bool is_empty() const { return m_values.is_empty(); } JsonValue const& at(size_t index) const { return m_values.at(index); } @@ -56,7 +56,7 @@ public: void clear() { m_values.clear(); } void append(JsonValue value) { m_values.append(move(value)); } - void set(int index, JsonValue value) { m_values[index] = move(value); } + void set(size_t index, JsonValue value) { m_values[index] = move(value); } template typename Builder::OutputType serialized() const; @@ -75,7 +75,7 @@ public: Vector const& values() const { return m_values; } - void ensure_capacity(int capacity) { m_values.ensure_capacity(capacity); } + void ensure_capacity(size_t capacity) { m_values.ensure_capacity(capacity); } private: Vector m_values; diff --git a/AK/JsonObject.h b/AK/JsonObject.h index 01ef593b7b..4a53556b75 100644 --- a/AK/JsonObject.h +++ b/AK/JsonObject.h @@ -44,7 +44,7 @@ public: return *this; } - int size() const { return m_members.size(); } + size_t size() const { return m_members.size(); } bool is_empty() const { return m_members.is_empty(); } JsonValue const& get(String const& key) const diff --git a/AK/JsonValue.cpp b/AK/JsonValue.cpp index 7f2dc7d99d..c3682046a8 100644 --- a/AK/JsonValue.cpp +++ b/AK/JsonValue.cpp @@ -90,7 +90,7 @@ bool JsonValue::equals(const JsonValue& other) const if (is_array() && other.is_array() && as_array().size() == other.as_array().size()) { bool result = true; - for (int i = 0; i < as_array().size(); ++i) { + for (size_t i = 0; i < as_array().size(); ++i) { result &= as_array().at(i).equals(other.as_array().at(i)); } return result; diff --git a/Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp b/Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp index a27e0de92a..8244f012e5 100644 --- a/Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp +++ b/Userland/DevTools/Inspector/RemoteObjectPropertyModel.cpp @@ -22,7 +22,7 @@ int RemoteObjectPropertyModel::row_count(const GUI::ModelIndex& index) const return value.as_array().size(); else if (value.is_object()) return value.as_object().size(); - return 0; + return (size_t)0; }; if (index.is_valid()) { diff --git a/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp b/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp index 808d2d13b7..fd1db73cf9 100644 --- a/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp +++ b/Userland/Libraries/LibGUI/CommonLocationsProvider.cpp @@ -58,7 +58,7 @@ void CommonLocationsProvider::load_from_json(const String& json_path) s_common_locations.clear(); auto contents = json.value().as_array(); - for (auto i = 0; i < contents.size(); ++i) { + for (size_t i = 0; i < contents.size(); ++i) { auto entry_value = contents.at(i); if (!entry_value.is_object()) continue; diff --git a/Userland/Libraries/LibGUI/JsonArrayModel.cpp b/Userland/Libraries/LibGUI/JsonArrayModel.cpp index 601faef990..f294083f14 100644 --- a/Userland/Libraries/LibGUI/JsonArrayModel.cpp +++ b/Userland/Libraries/LibGUI/JsonArrayModel.cpp @@ -59,7 +59,7 @@ bool JsonArrayModel::set(int row, Vector&& values) { VERIFY(values.size() == m_fields.size()); - if (row >= m_array.size()) + if ((size_t)row >= m_array.size()) return false; JsonObject obj; @@ -76,12 +76,12 @@ bool JsonArrayModel::set(int row, Vector&& values) bool JsonArrayModel::remove(int row) { - if (row >= m_array.size()) + if ((size_t)row >= m_array.size()) return false; JsonArray new_array; - for (int i = 0; i < m_array.size(); ++i) - if (i != row) + for (size_t i = 0; i < m_array.size(); ++i) + if (i != (size_t)row) new_array.append(m_array.at(i)); m_array = new_array; diff --git a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp index 362b3a5f21..9add21aac9 100644 --- a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp +++ b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp @@ -74,7 +74,7 @@ Vector CharacterMapFile::read_map(const JsonObject& json, const String& nam buffer.resize(CHAR_MAP_SIZE); auto map_arr = json.get(name).as_array(); - for (int i = 0; i < map_arr.size(); i++) { + for (size_t i = 0; i < map_arr.size(); i++) { auto key_value = map_arr.at(i).as_string(); if (key_value.length() == 0) { buffer[i] = 0; diff --git a/Userland/Utilities/fortune.cpp b/Userland/Utilities/fortune.cpp index 94ceff7e78..9353595b2b 100644 --- a/Userland/Utilities/fortune.cpp +++ b/Userland/Utilities/fortune.cpp @@ -59,7 +59,7 @@ private: static Vector parse_all(const JsonArray& array) { Vector quotes; - for (int i = 0; i < array.size(); ++i) { + for (size_t i = 0; i < array.size(); ++i) { Optional q = Quote::try_parse(array[i]); if (!q.has_value()) { warnln("WARNING: Could not parse quote #{}!", i); diff --git a/Userland/Utilities/gron.cpp b/Userland/Utilities/gron.cpp index b24eabd3eb..c0ca58f2d0 100644 --- a/Userland/Utilities/gron.cpp +++ b/Userland/Utilities/gron.cpp @@ -112,7 +112,7 @@ static void print(const String& name, const JsonValue& value, Vector& tr if (value.is_array()) { outln("{}[]{};", color_brace, color_off); trail.append(String::formatted("{}{}{}", color_name, name, color_off)); - for (int i = 0; i < value.as_array().size(); ++i) { + for (size_t i = 0; i < value.as_array().size(); ++i) { auto element_name = String::formatted("{}{}[{}{}{}{}{}]{}", color_off, color_brace, color_off, color_index, i, color_off, color_brace, color_off); print(element_name, value.as_array()[i], trail); }