diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-06 08:36:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-06 08:36:30 +0200 |
commit | 42b07f713fcbf9228dbc9145a07f706285a17a5f (patch) | |
tree | d43c43f71d524839293dc58a756c3f561ee2646b /core/variant/variant.cpp | |
parent | 4fee363d7df235d2b9275240a87474d9bd0de541 (diff) | |
parent | 3f078c99f6be160641b1c4782d2653b9d76a5ca8 (diff) |
Merge pull request #37700 from Calinou/rename-ip-unix-tcp-server
Rename `IP_Unix`, `IP_Address` and `TCP_Server` to remove underscores
Diffstat (limited to 'core/variant/variant.cpp')
-rw-r--r-- | core/variant/variant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp index 015cee09a7..333dd8e8d1 100644 --- a/core/variant/variant.cpp +++ b/core/variant/variant.cpp @@ -2346,15 +2346,15 @@ Variant::operator Orientation() const { return (Orientation) operator int(); } -Variant::operator IP_Address() const { +Variant::operator IPAddress() const { if (type == PACKED_FLOAT32_ARRAY || type == PACKED_INT32_ARRAY || type == PACKED_FLOAT64_ARRAY || type == PACKED_INT64_ARRAY || type == PACKED_BYTE_ARRAY) { Vector<int> addr = operator Vector<int>(); if (addr.size() == 4) { - return IP_Address(addr.get(0), addr.get(1), addr.get(2), addr.get(3)); + return IPAddress(addr.get(0), addr.get(1), addr.get(2), addr.get(3)); } } - return IP_Address(operator String()); + return IPAddress(operator String()); } Variant::Variant(bool p_bool) { @@ -2831,7 +2831,7 @@ void Variant::operator=(const Variant &p_variant) { } } -Variant::Variant(const IP_Address &p_address) { +Variant::Variant(const IPAddress &p_address) { type = STRING; memnew_placement(_data._mem, String(p_address)); } |