diff --git a/Applications/FileManager/DirectoryModel.cpp b/Applications/FileManager/DirectoryModel.cpp index c15eb0f317..42a25a453e 100644 --- a/Applications/FileManager/DirectoryModel.cpp +++ b/Applications/FileManager/DirectoryModel.cpp @@ -26,6 +26,7 @@ int thumbnail_thread(void* model_ptr) Vector to_generate; { LOCKER(thumbnail_cache().lock()); + to_generate.ensure_capacity(thumbnail_cache().resource().size()); for (auto& it : thumbnail_cache().resource()) { if (it.value) continue; diff --git a/Applications/IRCClient/IRCClient.cpp b/Applications/IRCClient/IRCClient.cpp index 5c53b1e84a..67f1854ba1 100644 --- a/Applications/IRCClient/IRCClient.cpp +++ b/Applications/IRCClient/IRCClient.cpp @@ -87,9 +87,9 @@ void IRCClient::receive_from_server() void IRCClient::process_line(ByteBuffer&& line) { Message msg; - Vector prefix; - Vector command; - Vector current_parameter; + Vector prefix; + Vector command; + Vector current_parameter; enum { Start, InPrefix, diff --git a/Applications/ProcessManager/ProcessModel.cpp b/Applications/ProcessManager/ProcessModel.cpp index 9679b36815..9ed93c3e86 100644 --- a/Applications/ProcessManager/ProcessModel.cpp +++ b/Applications/ProcessManager/ProcessModel.cpp @@ -193,7 +193,7 @@ void ProcessModel::update() } m_pids.clear(); - Vector pids_to_remove; + Vector pids_to_remove; for (auto& it : m_processes) { if (!live_pids.contains(it.key)) { pids_to_remove.append(it.key); diff --git a/Applications/Terminal/Terminal.cpp b/Applications/Terminal/Terminal.cpp index a8e6267858..53ceef4cdf 100644 --- a/Applications/Terminal/Terminal.cpp +++ b/Applications/Terminal/Terminal.cpp @@ -136,7 +136,7 @@ static inline Color lookup_color(unsigned color) return Color::from_rgb(xterm_colors[color]); } -void Terminal::escape$m(const Vector& params) +void Terminal::escape$m(const ParamVector& params) { if (params.size() == 3 && params[1] == 5) { if (params[0] == 38) { @@ -183,25 +183,25 @@ void Terminal::escape$m(const Vector& params) } } -void Terminal::escape$s(const Vector&) +void Terminal::escape$s(const ParamVector&) { m_saved_cursor_row = m_cursor_row; m_saved_cursor_column = m_cursor_column; } -void Terminal::escape$u(const Vector&) +void Terminal::escape$u(const ParamVector&) { set_cursor(m_saved_cursor_row, m_saved_cursor_column); } -void Terminal::escape$t(const Vector& params) +void Terminal::escape$t(const ParamVector& params) { if (params.size() < 1) return; dbgprintf("FIXME: escape$t: Ps: %u\n", params[0]); } -void Terminal::escape$r(const Vector& params) +void Terminal::escape$r(const ParamVector& params) { unsigned top = 1; unsigned bottom = m_rows; @@ -212,7 +212,7 @@ void Terminal::escape$r(const Vector& params) dbgprintf("FIXME: escape$r: Set scrolling region: %u-%u\n", top, bottom); } -void Terminal::escape$H(const Vector& params) +void Terminal::escape$H(const ParamVector& params) { unsigned row = 1; unsigned col = 1; @@ -223,7 +223,7 @@ void Terminal::escape$H(const Vector& params) set_cursor(row - 1, col - 1); } -void Terminal::escape$A(const Vector& params) +void Terminal::escape$A(const ParamVector& params) { int num = 1; if (params.size() >= 1) @@ -236,7 +236,7 @@ void Terminal::escape$A(const Vector& params) set_cursor(new_row, m_cursor_column); } -void Terminal::escape$B(const Vector& params) +void Terminal::escape$B(const ParamVector& params) { int num = 1; if (params.size() >= 1) @@ -249,7 +249,7 @@ void Terminal::escape$B(const Vector& params) set_cursor(new_row, m_cursor_column); } -void Terminal::escape$C(const Vector& params) +void Terminal::escape$C(const ParamVector& params) { int num = 1; if (params.size() >= 1) @@ -262,7 +262,7 @@ void Terminal::escape$C(const Vector& params) set_cursor(m_cursor_row, new_column); } -void Terminal::escape$D(const Vector& params) +void Terminal::escape$D(const ParamVector& params) { int num = 1; if (params.size() >= 1) @@ -275,7 +275,7 @@ void Terminal::escape$D(const Vector& params) set_cursor(m_cursor_row, new_column); } -void Terminal::escape$G(const Vector& params) +void Terminal::escape$G(const ParamVector& params) { int new_column = 1; if (params.size() >= 1) @@ -285,7 +285,7 @@ void Terminal::escape$G(const Vector& params) set_cursor(m_cursor_row, new_column); } -void Terminal::escape$d(const Vector& params) +void Terminal::escape$d(const ParamVector& params) { int new_row = 1; if (params.size() >= 1) @@ -295,7 +295,7 @@ void Terminal::escape$d(const Vector& params) set_cursor(new_row, m_cursor_column); } -void Terminal::escape$X(const Vector& params) +void Terminal::escape$X(const ParamVector& params) { // Erase characters (without moving cursor) int num = 1; @@ -309,7 +309,7 @@ void Terminal::escape$X(const Vector& params) } } -void Terminal::escape$K(const Vector& params) +void Terminal::escape$K(const ParamVector& params) { int mode = 0; if (params.size() >= 1) @@ -336,7 +336,7 @@ void Terminal::escape$K(const Vector& params) } } -void Terminal::escape$J(const Vector& params) +void Terminal::escape$J(const ParamVector& params) { int mode = 0; if (params.size() >= 1) @@ -370,7 +370,7 @@ void Terminal::escape$J(const Vector& params) } } -void Terminal::escape$M(const Vector& params) +void Terminal::escape$M(const ParamVector& params) { int count = 1; if (params.size() >= 1) @@ -414,7 +414,7 @@ void Terminal::execute_escape_sequence(byte final) { m_final = final; auto paramparts = String((const char*)m_parameters.data(), m_parameters.size()).split(';'); - Vector params; + ParamVector params; for (auto& parampart : paramparts) { bool ok; unsigned value = parse_uint(parampart, ok); diff --git a/Applications/Terminal/Terminal.h b/Applications/Terminal/Terminal.h index 724b128772..faee6ed02a 100644 --- a/Applications/Terminal/Terminal.h +++ b/Applications/Terminal/Terminal.h @@ -25,6 +25,8 @@ public: void apply_size_increments_to_window(GWindow&); private: + typedef Vector ParamVector; + virtual void event(CEvent&) override; virtual void paint_event(GPaintEvent&) override; virtual void resize_event(GResizeEvent&) override; @@ -42,22 +44,22 @@ private: void unimplemented_escape(); void unimplemented_xterm_escape(); - void escape$A(const Vector&); - void escape$B(const Vector&); - void escape$C(const Vector&); - void escape$D(const Vector&); - void escape$H(const Vector&); - void escape$J(const Vector&); - void escape$K(const Vector&); - void escape$M(const Vector&); - void escape$G(const Vector&); - void escape$X(const Vector&); - void escape$d(const Vector&); - void escape$m(const Vector&); - void escape$s(const Vector&); - void escape$u(const Vector&); - void escape$t(const Vector&); - void escape$r(const Vector&); + void escape$A(const ParamVector&); + void escape$B(const ParamVector&); + void escape$C(const ParamVector&); + void escape$D(const ParamVector&); + void escape$H(const ParamVector&); + void escape$J(const ParamVector&); + void escape$K(const ParamVector&); + void escape$M(const ParamVector&); + void escape$G(const ParamVector&); + void escape$X(const ParamVector&); + void escape$d(const ParamVector&); + void escape$m(const ParamVector&); + void escape$s(const ParamVector&); + void escape$u(const ParamVector&); + void escape$t(const ParamVector&); + void escape$r(const ParamVector&); void clear(); diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 7390085369..af7716c0bd 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -2276,7 +2276,7 @@ void SharedBuffer::destroy_if_unused() void Process::disown_all_shared_buffers() { LOCKER(shared_buffers().lock()); - Vector buffers_to_disown; + Vector buffers_to_disown; for (auto& it : shared_buffers().resource()) buffers_to_disown.append(it.value.ptr()); for (auto* shared_buffer : buffers_to_disown) diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index c052d4aaab..ebd43a23b4 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -167,7 +167,7 @@ void Thread::finalize() void Thread::finalize_dying_threads() { - Vector dying_threads; + Vector dying_threads; { InterruptDisabler disabler; for_each_in_state(Thread::State::Dying, [&] (Thread& thread) { diff --git a/LibC/unistd.cpp b/LibC/unistd.cpp index a0bd5be157..19f02c034e 100644 --- a/LibC/unistd.cpp +++ b/LibC/unistd.cpp @@ -64,7 +64,7 @@ int execvp(const char* filename, char* const argv[]) int execl(const char* filename, const char* arg0, ...) { - Vector args; + Vector args; args.append(arg0); va_list ap; diff --git a/LibCore/CEventLoop.cpp b/LibCore/CEventLoop.cpp index 963465106d..485ac4b5d9 100644 --- a/LibCore/CEventLoop.cpp +++ b/LibCore/CEventLoop.cpp @@ -95,7 +95,7 @@ int CEventLoop::exec() wait_for_event(); do_processing(); } - Vector events = move(m_queued_events); + auto events = move(m_queued_events); for (auto& queued_event : events) { auto* receiver = queued_event.receiver.ptr(); auto& event = *queued_event.event; diff --git a/LibCore/CEventLoop.h b/LibCore/CEventLoop.h index 509c0ebd73..50dc8e8f11 100644 --- a/LibCore/CEventLoop.h +++ b/LibCore/CEventLoop.h @@ -52,7 +52,7 @@ private: WeakPtr receiver; OwnPtr event; }; - Vector m_queued_events; + Vector m_queued_events; bool m_running { false }; bool m_exit_requested { false }; diff --git a/LibGUI/GEventLoop.h b/LibGUI/GEventLoop.h index 3ee1dfc1fc..36b9b00ea5 100644 --- a/LibGUI/GEventLoop.h +++ b/LibGUI/GEventLoop.h @@ -60,7 +60,7 @@ private: void handle_wm_event(const WSAPI_ServerMessage&, GWindow&); void connect_to_server(); - Vector m_unprocessed_messages; + Vector m_unprocessed_messages; static pid_t s_server_pid; static pid_t s_event_fd; }; diff --git a/LibGUI/GFileSystemModel.cpp b/LibGUI/GFileSystemModel.cpp index 3b7d9c1213..71d0dddc9b 100644 --- a/LibGUI/GFileSystemModel.cpp +++ b/LibGUI/GFileSystemModel.cpp @@ -76,7 +76,7 @@ struct GFileSystemModel::Node { String full_path(const GFileSystemModel& model) const { - Vector lineage; + Vector lineage; for (auto* ancestor = parent; ancestor; ancestor = ancestor->parent) { lineage.append(ancestor->name); } diff --git a/LibGUI/GShortcut.cpp b/LibGUI/GShortcut.cpp index 7aa946d1dd..871bf1c99c 100644 --- a/LibGUI/GShortcut.cpp +++ b/LibGUI/GShortcut.cpp @@ -116,7 +116,7 @@ static String to_string(KeyCode key) String GShortcut::to_string() const { - Vector parts; + Vector parts; if (m_modifiers & Mod_Ctrl) parts.append("Ctrl"); diff --git a/SharedGraphics/DisjointRectSet.cpp b/SharedGraphics/DisjointRectSet.cpp index a811899d76..38221fea66 100644 --- a/SharedGraphics/DisjointRectSet.cpp +++ b/SharedGraphics/DisjointRectSet.cpp @@ -14,7 +14,7 @@ void DisjointRectSet::add(const Rect& new_rect) void DisjointRectSet::shatter() { - Vector output; + Vector output; output.ensure_capacity(m_rects.size()); bool pass_had_intersections = false; do { diff --git a/SharedGraphics/DisjointRectSet.h b/SharedGraphics/DisjointRectSet.h index 5b3f26d20b..4256b933db 100644 --- a/SharedGraphics/DisjointRectSet.h +++ b/SharedGraphics/DisjointRectSet.h @@ -13,11 +13,11 @@ public: void clear() { m_rects.clear(); } void clear_with_capacity() { m_rects.clear_with_capacity(); } - const Vector& rects() const { return m_rects; } + const Vector& rects() const { return m_rects; } private: void shatter(); - Vector m_rects; + Vector m_rects; }; diff --git a/SharedGraphics/Painter.h b/SharedGraphics/Painter.h index 275d84463f..fe9cb65307 100644 --- a/SharedGraphics/Painter.h +++ b/SharedGraphics/Painter.h @@ -75,7 +75,7 @@ protected: Rect m_clip_origin; Retained m_target; - Vector m_state_stack; + Vector m_state_stack; }; class PainterStateSaver { diff --git a/Userland/ls.cpp b/Userland/ls.cpp index edfa2b23fe..1984c1b54e 100644 --- a/Userland/ls.cpp +++ b/Userland/ls.cpp @@ -197,7 +197,7 @@ int do_dir_short(const char* path) return 1; } - Vector names; + Vector names; int longest_name = 0; while (auto* de = readdir(dirp)) { if (de->d_name[0] == '.' && !flag_show_dotfiles)