4 files changed, 19 insertions, 19 deletions

diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index a2c9bae852..1754b47c85 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -71,7 +71,7 @@ Error DirAccessUnix::list_dir_begin() {
 bool DirAccessUnix::file_exists(String p_file) {
 	GLOBAL_LOCK_FUNCTION
 
-	if (p_file.is_rel_path()) {
+	if (p_file.is_relative_path()) {
 		p_file = current_dir.plus_file(p_file);
 	}
 
@@ -90,7 +90,7 @@ bool DirAccessUnix::file_exists(String p_file) {
 bool DirAccessUnix::dir_exists(String p_dir) {
 	GLOBAL_LOCK_FUNCTION
 
-	if (p_dir.is_rel_path()) {
+	if (p_dir.is_relative_path()) {
 		p_dir = get_current_dir().plus_file(p_dir);
 	}
 
@@ -105,7 +105,7 @@ bool DirAccessUnix::dir_exists(String p_dir) {
 bool DirAccessUnix::is_readable(String p_dir) {
 	GLOBAL_LOCK_FUNCTION
 
-	if (p_dir.is_rel_path()) {
+	if (p_dir.is_relative_path()) {
 		p_dir = get_current_dir().plus_file(p_dir);
 	}
 
@@ -116,7 +116,7 @@ bool DirAccessUnix::is_readable(String p_dir) {
 bool DirAccessUnix::is_writable(String p_dir) {
 	GLOBAL_LOCK_FUNCTION
 
-	if (p_dir.is_rel_path()) {
+	if (p_dir.is_relative_path()) {
 		p_dir = get_current_dir().plus_file(p_dir);
 	}
 
@@ -125,7 +125,7 @@ bool DirAccessUnix::is_writable(String p_dir) {
 }
 
 uint64_t DirAccessUnix::get_modified_time(String p_file) {
-	if (p_file.is_rel_path()) {
+	if (p_file.is_relative_path()) {
 		p_file = current_dir.plus_file(p_file);
 	}
 
@@ -293,7 +293,7 @@ bool DirAccessUnix::drives_are_shortcuts() {
 Error DirAccessUnix::make_dir(String p_dir) {
 	GLOBAL_LOCK_FUNCTION
 
-	if (p_dir.is_rel_path()) {
+	if (p_dir.is_relative_path()) {
 		p_dir = get_current_dir().plus_file(p_dir);
 	}
 
@@ -328,7 +328,7 @@ Error DirAccessUnix::change_dir(String p_dir) {
 
 	// try_dir is the directory we are trying to change into
 	String try_dir = "";
-	if (p_dir.is_rel_path()) {
+	if (p_dir.is_relative_path()) {
 		String next_dir = current_dir.plus_file(p_dir);
 		next_dir = next_dir.simplify_path();
 		try_dir = next_dir;
@@ -372,13 +372,13 @@ String DirAccessUnix::get_current_dir(bool p_include_drive) {
 }
 
 Error DirAccessUnix::rename(String p_path, String p_new_path) {
-	if (p_path.is_rel_path()) {
+	if (p_path.is_relative_path()) {
 		p_path = get_current_dir().plus_file(p_path);
 	}
 
 	p_path = fix_path(p_path);
 
-	if (p_new_path.is_rel_path()) {
+	if (p_new_path.is_relative_path()) {
 		p_new_path = get_current_dir().plus_file(p_new_path);
 	}
 
@@ -388,7 +388,7 @@ Error DirAccessUnix::rename(String p_path, String p_new_path) {
 }
 
 Error DirAccessUnix::remove(String p_path) {
-	if (p_path.is_rel_path()) {
+	if (p_path.is_relative_path()) {
 		p_path = get_current_dir().plus_file(p_path);
 	}
 
@@ -407,7 +407,7 @@ Error DirAccessUnix::remove(String p_path) {
 }
 
 bool DirAccessUnix::is_link(String p_file) {
-	if (p_file.is_rel_path()) {
+	if (p_file.is_relative_path()) {
 		p_file = get_current_dir().plus_file(p_file);
 	}
 
@@ -422,7 +422,7 @@ bool DirAccessUnix::is_link(String p_file) {
 }
 
 String DirAccessUnix::read_link(String p_file) {
-	if (p_file.is_rel_path()) {
+	if (p_file.is_relative_path()) {
 		p_file = get_current_dir().plus_file(p_file);
 	}
 
@@ -439,7 +439,7 @@ String DirAccessUnix::read_link(String p_file) {
 }
 
 Error DirAccessUnix::create_link(String p_source, String p_target) {
-	if (p_target.is_rel_path()) {
+	if (p_target.is_relative_path()) {
 		p_target = get_current_dir().plus_file(p_target);
 	}
 
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index 8a880ab9c8..42b5bbfaf2 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -36,9 +36,9 @@
 
 #ifdef WINDOWS_ENABLED
 #include <stdio.h>
-#include <winsock2.h>
-// Needs to be included after winsocks2.h
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <winsock2.h>
 #include <ws2tcpip.h>
 #ifndef UWP_ENABLED
 #include <iphlpapi.h>
@@ -110,7 +110,7 @@ void IPUnix::_resolve_hostname(List<IPAddress> &r_addresses, const String &p_hos
 	struct addrinfo *next = result;
 
 	do {
-		if (next->ai_addr == NULL) {
+		if (next->ai_addr == nullptr) {
 			next = next->ai_next;
 			continue;
 		}
diff --git a/drivers/unix/net_socket_posix.cpp b/drivers/unix/net_socket_posix.cpp
index e01c6a0e0f..768b819650 100644
--- a/drivers/unix/net_socket_posix.cpp
+++ b/drivers/unix/net_socket_posix.cpp
@@ -258,8 +258,8 @@ _FORCE_INLINE_ Error NetSocketPosix::_change_multicast_group(IPAddress p_ip, Str
 	uint32_t if_v6id = 0;
 	Map<String, IP::Interface_Info> if_info;
 	IP::get_singleton()->get_local_interfaces(&if_info);
-	for (Map<String, IP::Interface_Info>::Element *E = if_info.front(); E; E = E->next()) {
-		IP::Interface_Info &c = E->get();
+	for (KeyValue<String, IP::Interface_Info> &E : if_info) {
+		IP::Interface_Info &c = E.value;
 		if (c.name != p_if_name) {
 			continue;
 		}
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index f6a3e93b55..3032c31629 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -392,7 +392,7 @@ String OS_Unix::get_locale() const {
 Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) {
 	String path = p_path;
 
-	if (FileAccess::exists(path) && path.is_rel_path()) {
+	if (FileAccess::exists(path) && path.is_relative_path()) {
 		// dlopen expects a slash, in this case a leading ./ for it to be interpreted as a relative path,
 		//  otherwise it will end up searching various system directories for the lib instead and finally failing.
 		path = "./" + path;