summaryrefslogtreecommitdiffstats
path: root/core/variant/array.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-11-24 07:59:56 +0100
committerGitHub <noreply@github.com>2021-11-24 07:59:56 +0100
commit96e70ac5f4f477eee3866ea788389a87d0dbd086 (patch)
tree21fb39b40de2674a99018d88e142e6f0196c68b0 /core/variant/array.cpp
parent5efe80f3085c8c6451363fe4c743bf3d7fc20b6c (diff)
parente078f970db0e72bcc665d714416e6fc74e8434a6 (diff)
downloadredot-engine-96e70ac5f4f477eee3866ea788389a87d0dbd086.tar.gz
Merge pull request #50139 from LightningAA/rename-remove-to-remove-at
Rename `remove()` to `remove_at()` when removing by index
Diffstat (limited to 'core/variant/array.cpp')
-rw-r--r--core/variant/array.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index 69a0fff1a1..b049c29688 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -322,8 +322,8 @@ bool Array::has(const Variant &p_value) const {
return _p->array.find(p_value, 0) != -1;
}
-void Array::remove(int p_pos) {
- _p->array.remove(p_pos);
+void Array::remove_at(int p_pos) {
+ _p->array.remove_at(p_pos);
}
void Array::set(int p_idx, const Variant &p_value) {
@@ -576,7 +576,7 @@ Variant Array::pop_back() {
Variant Array::pop_front() {
if (!_p->array.is_empty()) {
const Variant ret = _p->array.get(0);
- _p->array.remove(0);
+ _p->array.remove_at(0);
return ret;
}
return Variant();
@@ -603,7 +603,7 @@ Variant Array::pop_at(int p_pos) {
_p->array.size()));
const Variant ret = _p->array.get(p_pos);
- _p->array.remove(p_pos);
+ _p->array.remove_at(p_pos);
return ret;
}