diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-24 07:59:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 07:59:56 +0100 |
| commit | 96e70ac5f4f477eee3866ea788389a87d0dbd086 (patch) | |
| tree | 21fb39b40de2674a99018d88e142e6f0196c68b0 /scene/main/viewport.cpp | |
| parent | 5efe80f3085c8c6451363fe4c743bf3d7fc20b6c (diff) | |
| parent | e078f970db0e72bcc665d714416e6fc74e8434a6 (diff) | |
Merge pull request #50139 from LightningAA/rename-remove-to-remove-at
Rename `remove()` to `remove_at()` when removing by index
Diffstat (limited to 'scene/main/viewport.cpp')
| -rw-r--r-- | scene/main/viewport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 48a672b310..5404b173d5 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -290,7 +290,7 @@ void Viewport::_sub_window_grab_focus(Window *p_window) { if (p_window->get_flag(Window::FLAG_NO_FOCUS)) { // Can only move to foreground, but no focus granted. SubWindow sw = gui.sub_windows[index]; - gui.sub_windows.remove(index); + gui.sub_windows.remove_at(index); gui.sub_windows.push_back(sw); index = gui.sub_windows.size() - 1; _sub_window_update_order(); @@ -318,7 +318,7 @@ void Viewport::_sub_window_grab_focus(Window *p_window) { { // Move to foreground. SubWindow sw = gui.sub_windows[index]; - gui.sub_windows.remove(index); + gui.sub_windows.remove_at(index); gui.sub_windows.push_back(sw); index = gui.sub_windows.size() - 1; _sub_window_update_order(); @@ -335,7 +335,7 @@ void Viewport::_sub_window_remove(Window *p_window) { for (int i = 0; i < gui.sub_windows.size(); i++) { if (gui.sub_windows[i].window == p_window) { RS::get_singleton()->free(gui.sub_windows[i].canvas_item); - gui.sub_windows.remove(i); + gui.sub_windows.remove_at(i); break; } } |