Skip to content

Commit 1498eb3

Browse files
committed
Make IPAddress to String conversion explicit.
1 parent 51b0379 commit 1498eb3

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

core/io/ip.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ PackedStringArray IP::_get_local_addresses() const {
259259
List<IPAddress> ip_addresses;
260260
get_local_addresses(&ip_addresses);
261261
for (const IPAddress &E : ip_addresses) {
262-
addresses.push_back(E);
262+
addresses.push_back(String(E));
263263
}
264264

265265
return addresses;

core/io/ip_address.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ struct [[nodiscard]] IPAddress {
8989
const uint8_t *get_ipv6() const;
9090
void set_ipv6(const uint8_t *p_buf);
9191

92-
operator String() const;
92+
explicit operator String() const;
9393
IPAddress(const String &p_string);
9494
IPAddress(uint32_t p_a, uint32_t p_b, uint32_t p_c, uint32_t p_d, bool is_v6 = false);
9595
IPAddress() { clear(); }

core/io/packet_peer_udp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Error PacketPeerUDP::leave_multicast_group(IPAddress p_multi_address, const Stri
6868
}
6969

7070
String PacketPeerUDP::_get_packet_ip() const {
71-
return get_packet_address();
71+
return String(get_packet_address());
7272
}
7373

7474
Error PacketPeerUDP::_set_dest_address(const String &p_address, int p_port) {

core/variant/variant_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ struct VariantInternalAccessor<const T *> {
821821
template <>
822822
struct VariantInternalAccessor<IPAddress> {
823823
static _FORCE_INLINE_ IPAddress get(const Variant *v) { return IPAddress(*VariantInternal::get_string(v)); }
824-
static _FORCE_INLINE_ void set(Variant *v, IPAddress p_value) { *VariantInternal::get_string(v) = p_value; }
824+
static _FORCE_INLINE_ void set(Variant *v, IPAddress p_value) { *VariantInternal::get_string(v) = String(p_value); }
825825
};
826826

827827
template <>

editor/editor_settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,12 +1386,12 @@ void EditorSettings::setup_network() {
13861386
}
13871387
// Select current IP (found)
13881388
if (ip == current) {
1389-
selected = ip;
1389+
selected = String(ip);
13901390
}
13911391
if (!hint.is_empty()) {
13921392
hint += ",";
13931393
}
1394-
hint += ip;
1394+
hint += String(ip);
13951395
}
13961396

13971397
// Add hints with valid IP addresses to remote_host property.

0 commit comments

Comments
 (0)