Capitalize PRINT_VERBOSE macro to match other macros

Author: aaronfranke

core/debugger/remote_debugger_peer.cpp

@@ -168,12 +168,12 @@ Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_po
 	for (int i = 0; i < tries; i++) {
 		tcp_client->poll();
 		if (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED) {
-			print_verbose("Remote Debugger: Connected!");
+			PRINT_VERBOSE("Remote Debugger: Connected!");
 			break;
 		} else {
 			const int ms = waits[i];
 			OS::get_singleton()->delay_usec(ms * 1000);
-			print_verbose("Remote Debugger: Connection failed with status: '" + String::num_int64(tcp_client->get_status()) + "', retrying in " + String::num_int64(ms) + " msec.");
+			PRINT_VERBOSE("Remote Debugger: Connection failed with status: '" + String::num_int64(tcp_client->get_status()) + "', retrying in " + String::num_int64(ms) + " msec.");
 		}
 	}
 

core/input/input.cpp

@@ -1631,7 +1631,7 @@ void Input::parse_mapping(const String &p_mapping) {
 		JoyButton output_button = _get_output_button(output);
 		JoyAxis output_axis = _get_output_axis(output);
 		if (output_button == JoyButton::INVALID && output_axis == JoyAxis::INVALID) {
-			print_verbose(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping));
+			PRINT_VERBOSE(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping));
 			continue;
 		}
 		ERR_CONTINUE_MSG(output_button != JoyButton::INVALID && output_axis != JoyAxis::INVALID,
@@ -1868,7 +1868,7 @@ Input::Input() {
 				continue;
 			}
 
-			print_verbose(vformat("Device Ignored -- Vendor: %s Product: %s", vid_pid[0], vid_pid[1]));
+			PRINT_VERBOSE(vformat("Device Ignored -- Vendor: %s Product: %s", vid_pid[0], vid_pid[1]));
 			const uint16_t vid_unswapped = vid_pid[0].hex_to_int();
 			const uint16_t pid_unswapped = vid_pid[1].hex_to_int();
 			const uint16_t vid = BSWAP16(vid_unswapped);

core/io/file_access_pack.cpp

@@ -215,7 +215,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 				magic = f->get_32();
 				if (magic == PACK_HEADER_MAGIC) {
 #ifdef DEBUG_ENABLED
-					print_verbose("PCK header found in executable pck section, loading from offset 0x" + String::num_int64(pck_off - 4, 16));
+					PRINT_VERBOSE("PCK header found in executable pck section, loading from offset 0x" + String::num_int64(pck_off - 4, 16));
 #endif
 					pck_header_found = true;
 					break;
@@ -243,7 +243,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 			magic = f->get_32();
 			if (magic == PACK_HEADER_MAGIC) {
 #ifdef DEBUG_ENABLED
-				print_verbose("PCK header found at the end of executable, loading from offset 0x" + String::num_int64(f->get_position() - 4, 16));
+				PRINT_VERBOSE("PCK header found at the end of executable, loading from offset 0x" + String::num_int64(f->get_position() - 4, 16));
 #endif
 				pck_header_found = true;
 			}

core/io/remote_filesystem_client.cpp

@@ -152,7 +152,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
 
 	IPAddress ip = p_host.is_valid_ip_address() ? IPAddress(p_host) : IP::get_singleton()->resolve_hostname(p_host);
 	ERR_FAIL_COND_V_MSG(!ip.is_valid(), ERR_INVALID_PARAMETER, vformat("Unable to resolve remote filesystem server hostname: '%s'.", p_host));
-	print_verbose(vformat("Remote Filesystem: Connecting to host %s, port %d.", ip, p_port));
+	PRINT_VERBOSE(vformat("Remote Filesystem: Connecting to host %s, port %d.", ip, p_port));
 	Error err = tcp_client->connect_to_host(ip, p_port);
 	ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Unable to open connection to remote file server (%s, port %d) failed.", String(p_host), p_port));
 
@@ -166,17 +166,17 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
 	}
 
 	// Connection OK, now send the current file state.
-	print_verbose("Remote Filesystem: Connection OK.");
+	PRINT_VERBOSE("Remote Filesystem: Connection OK.");
 
 	// Header (GRFS) - Godot Remote File System
-	print_verbose("Remote Filesystem: Sending header");
+	PRINT_VERBOSE("Remote Filesystem: Sending header");
 	tcp_client->put_u8('G');
 	tcp_client->put_u8('R');
 	tcp_client->put_u8('F');
 	tcp_client->put_u8('S');
 	// Protocol version
 	tcp_client->put_32(FILESYSTEM_PROTOCOL_VERSION);
-	print_verbose("Remote Filesystem: Sending password");
+	PRINT_VERBOSE("Remote Filesystem: Sending password");
 	uint8_t password[PASSWORD_LENGTH]; // Send fixed size password, since it's easier and safe to validate.
 	for (int i = 0; i < PASSWORD_LENGTH; i++) {
 		if (i < p_password.length()) {
@@ -186,7 +186,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
 		}
 	}
 	tcp_client->put_data(password, PASSWORD_LENGTH);
-	print_verbose("Remote Filesystem: Tags.");
+	PRINT_VERBOSE("Remote Filesystem: Tags.");
 	Vector<String> tags;
 	{
 		tags.push_back(OS::get_singleton()->get_identifier());
@@ -207,7 +207,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
 		tcp_client->put_utf8_string(tags[i]);
 	}
 	// Size of compressed list of files
-	print_verbose("Remote Filesystem: Sending file list");
+	PRINT_VERBOSE("Remote Filesystem: Sending file list");
 
 	Vector<FileCache> file_cache = _load_cache_file();
 
@@ -306,7 +306,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
 		new_file_cache.push_back(fc);
 	}
 
-	print_verbose("Remote Filesystem: Updating the cache file.");
+	PRINT_VERBOSE("Remote Filesystem: Updating the cache file.");
 
 	// Go through the list of local files read initially (file_cache) and see which ones are
 	// unchanged (not sent again from the server).
@@ -322,7 +322,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
 	err = _store_cache_file(new_file_cache);
 	ERR_FAIL_COND_V_MSG(err != OK, ERR_FILE_CANT_OPEN, "Error writing the remote filesystem file cache.");
 
-	print_verbose("Remote Filesystem: Update success.");
+	PRINT_VERBOSE("Remote Filesystem: Update success.");
 
 	_update_cache_path(r_cache_path);
 	return OK;

core/io/resource_importer.cpp

@@ -76,7 +76,7 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
 		err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, nullptr, true);
 		if (err == ERR_FILE_EOF) {
 			if (p_load && !path_found && decomp_path_found) {
-				print_verbose(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
+				PRINT_VERBOSE(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
 				r_path_and_type.path = decomp_path;
 			}
 
@@ -122,7 +122,7 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
 	}
 
 	if (p_load && !path_found && decomp_path_found) {
-		print_verbose(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
+		PRINT_VERBOSE(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
 		r_path_and_type.path = decomp_path;
 		return OK;
 	}

core/io/resource_loader.cpp

@@ -301,7 +301,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
 	}
 	load_paths_stack.push_back(original_path);
 
-	print_verbose(vformat("Loading resource: %s", p_path));
+	PRINT_VERBOSE(vformat("Loading resource: %s", p_path));
 
 	// Try all loaders and pick the first match for the type hint
 	bool found = false;
@@ -324,7 +324,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
 	if (res.is_valid()) {
 		return res;
 	} else {
-		print_verbose(vformat("Failed loading resource: %s", p_path));
+		PRINT_VERBOSE(vformat("Failed loading resource: %s", p_path));
 	}
 
 #ifdef TOOLS_ENABLED
@@ -521,7 +521,7 @@ Error ResourceLoader::load_threaded_request(const String &p_path, const String &
 ResourceLoader::LoadToken *ResourceLoader::_load_threaded_request_reuse_user_token(const String &p_path) {
 	HashMap<String, LoadToken *>::Iterator E = user_load_tokens.find(p_path);
 	if (E) {
-		print_verbose("load_threaded_request(): Another threaded load for resource path '" + p_path + "' has been initiated. Not an error.");
+		PRINT_VERBOSE("load_threaded_request(): Another threaded load for resource path '" + p_path + "' has been initiated. Not an error.");
 		LoadToken *token = E->value;
 		token->user_rc++;
 		return token;
@@ -691,7 +691,7 @@ ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const
 		MutexLock thread_load_lock(thread_load_mutex);
 
 		if (!user_load_tokens.has(p_path)) {
-			print_verbose("load_threaded_get_status(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
+			PRINT_VERBOSE("load_threaded_get_status(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
 			return THREAD_LOAD_INVALID_RESOURCE;
 		}
 
@@ -732,7 +732,7 @@ Ref<Resource> ResourceLoader::load_threaded_get(const String &p_path, Error *r_e
 		MutexLock thread_load_lock(thread_load_mutex);
 
 		if (!user_load_tokens.has(p_path)) {
-			print_verbose("load_threaded_get(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
+			PRINT_VERBOSE("load_threaded_get(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
 			if (r_error) {
 				*r_error = ERR_INVALID_PARAMETER;
 			}

core/object/worker_thread_pool.cpp

@@ -777,7 +777,7 @@ void WorkerThreadPool::init(int p_thread_count, float p_low_priority_task_ratio)
 
 	max_low_priority_threads = CLAMP(p_thread_count * p_low_priority_task_ratio, 1, p_thread_count - 1);
 
-	print_verbose(vformat("WorkerThreadPool: %d threads, %d max low-priority.", p_thread_count, max_low_priority_threads));
+	PRINT_VERBOSE(vformat("WorkerThreadPool: %d threads, %d max low-priority.", p_thread_count, max_low_priority_threads));
 
 	threads.resize(p_thread_count);
 

core/string/print_string.h

@@ -61,7 +61,7 @@ extern void print_error(const String &p_string);
 extern bool is_print_verbose_enabled();
 
 // This version avoids processing the text to be printed until it actually has to be printed, saving some CPU usage.
-#define print_verbose(m_text)             \
+#define PRINT_VERBOSE(m_text)             \
 	{                                     \
 		if (is_print_verbose_enabled()) { \
 			print_line(m_text);           \

core/string/string_name.cpp

@@ -101,7 +101,7 @@ void StringName::cleanup() {
 		}
 	}
 	if (lost_strings) {
-		print_verbose(vformat("StringName: %d unclaimed string names at exit.", lost_strings));
+		PRINT_VERBOSE(vformat("StringName: %d unclaimed string names at exit.", lost_strings));
 	}
 	configured = false;
 }

core/variant/variant_utility.cpp

@@ -1013,7 +1013,7 @@ void VariantUtilityFunctions::_print_verbose(const Variant **p_args, int p_arg_c
 			}
 		}
 
-		// No need to use `print_verbose()` as this call already only happens
+		// No need to use `PRINT_VERBOSE()` as this call already only happens
 		// when verbose mode is enabled. This avoids performing string argument concatenation
 		// when not needed.
 		print_line(s);