Skip to content

Commit 8552ea9

Browse files
aaronfrankeaaronfranke
committed
Capitalize PRINT_VERBOSE macro to match other macros
1 parent f58f5a2 commit 8552ea9

File tree

122 files changed

+645
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+645
-645
lines changed

‎core/debugger/remote_debugger_peer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_po
168168
for (int i = 0; i < tries; i++) {
169169
tcp_client->poll();
170170
if (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED) {
171-
print_verbose("Remote Debugger: Connected!");
171+
PRINT_VERBOSE("Remote Debugger: Connected!");
172172
break;
173173
} else {
174174
const int ms = waits[i];
175175
OS::get_singleton()->delay_usec(ms * 1000);
176-
print_verbose("Remote Debugger: Connection failed with status: '" + String::num_int64(tcp_client->get_status()) + "', retrying in " + String::num_int64(ms) + " msec.");
176+
PRINT_VERBOSE("Remote Debugger: Connection failed with status: '" + String::num_int64(tcp_client->get_status()) + "', retrying in " + String::num_int64(ms) + " msec.");
177177
}
178178
}
179179

‎core/input/input.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@ void Input::parse_mapping(const String &p_mapping) {
16311631
JoyButton output_button = _get_output_button(output);
16321632
JoyAxis output_axis = _get_output_axis(output);
16331633
if (output_button == JoyButton::INVALID && output_axis == JoyAxis::INVALID) {
1634-
print_verbose(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping));
1634+
PRINT_VERBOSE(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping));
16351635
continue;
16361636
}
16371637
ERR_CONTINUE_MSG(output_button != JoyButton::INVALID && output_axis != JoyAxis::INVALID,
@@ -1868,7 +1868,7 @@ Input::Input() {
18681868
continue;
18691869
}
18701870

1871-
print_verbose(vformat("Device Ignored -- Vendor: %s Product: %s", vid_pid[0], vid_pid[1]));
1871+
PRINT_VERBOSE(vformat("Device Ignored -- Vendor: %s Product: %s", vid_pid[0], vid_pid[1]));
18721872
const uint16_t vid_unswapped = vid_pid[0].hex_to_int();
18731873
const uint16_t pid_unswapped = vid_pid[1].hex_to_int();
18741874
const uint16_t vid = BSWAP16(vid_unswapped);

‎core/io/file_access_pack.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
215215
magic = f->get_32();
216216
if (magic == PACK_HEADER_MAGIC) {
217217
#ifdef DEBUG_ENABLED
218-
print_verbose("PCK header found in executable pck section, loading from offset 0x" + String::num_int64(pck_off - 4, 16));
218+
PRINT_VERBOSE("PCK header found in executable pck section, loading from offset 0x" + String::num_int64(pck_off - 4, 16));
219219
#endif
220220
pck_header_found = true;
221221
break;
@@ -243,7 +243,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
243243
magic = f->get_32();
244244
if (magic == PACK_HEADER_MAGIC) {
245245
#ifdef DEBUG_ENABLED
246-
print_verbose("PCK header found at the end of executable, loading from offset 0x" + String::num_int64(f->get_position() - 4, 16));
246+
PRINT_VERBOSE("PCK header found at the end of executable, loading from offset 0x" + String::num_int64(f->get_position() - 4, 16));
247247
#endif
248248
pck_header_found = true;
249249
}

‎core/io/remote_filesystem_client.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
152152

153153
IPAddress ip = p_host.is_valid_ip_address() ? IPAddress(p_host) : IP::get_singleton()->resolve_hostname(p_host);
154154
ERR_FAIL_COND_V_MSG(!ip.is_valid(), ERR_INVALID_PARAMETER, vformat("Unable to resolve remote filesystem server hostname: '%s'.", p_host));
155-
print_verbose(vformat("Remote Filesystem: Connecting to host %s, port %d.", ip, p_port));
155+
PRINT_VERBOSE(vformat("Remote Filesystem: Connecting to host %s, port %d.", ip, p_port));
156156
Error err = tcp_client->connect_to_host(ip, p_port);
157157
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));
158158

@@ -166,17 +166,17 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
166166
}
167167

168168
// Connection OK, now send the current file state.
169-
print_verbose("Remote Filesystem: Connection OK.");
169+
PRINT_VERBOSE("Remote Filesystem: Connection OK.");
170170

171171
// Header (GRFS) - Godot Remote File System
172-
print_verbose("Remote Filesystem: Sending header");
172+
PRINT_VERBOSE("Remote Filesystem: Sending header");
173173
tcp_client->put_u8('G');
174174
tcp_client->put_u8('R');
175175
tcp_client->put_u8('F');
176176
tcp_client->put_u8('S');
177177
// Protocol version
178178
tcp_client->put_32(FILESYSTEM_PROTOCOL_VERSION);
179-
print_verbose("Remote Filesystem: Sending password");
179+
PRINT_VERBOSE("Remote Filesystem: Sending password");
180180
uint8_t password[PASSWORD_LENGTH]; // Send fixed size password, since it's easier and safe to validate.
181181
for (int i = 0; i < PASSWORD_LENGTH; i++) {
182182
if (i < p_password.length()) {
@@ -186,7 +186,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
186186
}
187187
}
188188
tcp_client->put_data(password, PASSWORD_LENGTH);
189-
print_verbose("Remote Filesystem: Tags.");
189+
PRINT_VERBOSE("Remote Filesystem: Tags.");
190190
Vector<String> tags;
191191
{
192192
tags.push_back(OS::get_singleton()->get_identifier());
@@ -207,7 +207,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
207207
tcp_client->put_utf8_string(tags[i]);
208208
}
209209
// Size of compressed list of files
210-
print_verbose("Remote Filesystem: Sending file list");
210+
PRINT_VERBOSE("Remote Filesystem: Sending file list");
211211

212212
Vector<FileCache> file_cache = _load_cache_file();
213213

@@ -306,7 +306,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
306306
new_file_cache.push_back(fc);
307307
}
308308

309-
print_verbose("Remote Filesystem: Updating the cache file.");
309+
PRINT_VERBOSE("Remote Filesystem: Updating the cache file.");
310310

311311
// Go through the list of local files read initially (file_cache) and see which ones are
312312
// unchanged (not sent again from the server).
@@ -322,7 +322,7 @@ Error RemoteFilesystemClient::_synchronize_with_server(const String &p_host, int
322322
err = _store_cache_file(new_file_cache);
323323
ERR_FAIL_COND_V_MSG(err != OK, ERR_FILE_CANT_OPEN, "Error writing the remote filesystem file cache.");
324324

325-
print_verbose("Remote Filesystem: Update success.");
325+
PRINT_VERBOSE("Remote Filesystem: Update success.");
326326

327327
_update_cache_path(r_cache_path);
328328
return OK;

‎core/io/resource_importer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
7676
err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, nullptr, true);
7777
if (err == ERR_FILE_EOF) {
7878
if (p_load && !path_found && decomp_path_found) {
79-
print_verbose(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
79+
PRINT_VERBOSE(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
8080
r_path_and_type.path = decomp_path;
8181
}
8282

@@ -122,7 +122,7 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
122122
}
123123

124124
if (p_load && !path_found && decomp_path_found) {
125-
print_verbose(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
125+
PRINT_VERBOSE(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
126126
r_path_and_type.path = decomp_path;
127127
return OK;
128128
}

‎core/io/resource_loader.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
301301
}
302302
load_paths_stack.push_back(original_path);
303303

304-
print_verbose(vformat("Loading resource: %s", p_path));
304+
PRINT_VERBOSE(vformat("Loading resource: %s", p_path));
305305

306306
// Try all loaders and pick the first match for the type hint
307307
bool found = false;
@@ -324,7 +324,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
324324
if (res.is_valid()) {
325325
return res;
326326
} else {
327-
print_verbose(vformat("Failed loading resource: %s", p_path));
327+
PRINT_VERBOSE(vformat("Failed loading resource: %s", p_path));
328328
}
329329

330330
#ifdef TOOLS_ENABLED
@@ -521,7 +521,7 @@ Error ResourceLoader::load_threaded_request(const String &p_path, const String &
521521
ResourceLoader::LoadToken *ResourceLoader::_load_threaded_request_reuse_user_token(const String &p_path) {
522522
HashMap<String, LoadToken *>::Iterator E = user_load_tokens.find(p_path);
523523
if (E) {
524-
print_verbose("load_threaded_request(): Another threaded load for resource path '" + p_path + "' has been initiated. Not an error.");
524+
PRINT_VERBOSE("load_threaded_request(): Another threaded load for resource path '" + p_path + "' has been initiated. Not an error.");
525525
LoadToken *token = E->value;
526526
token->user_rc++;
527527
return token;
@@ -691,7 +691,7 @@ ResourceLoader::ThreadLoadStatus ResourceLoader::load_threaded_get_status(const
691691
MutexLock thread_load_lock(thread_load_mutex);
692692

693693
if (!user_load_tokens.has(p_path)) {
694-
print_verbose("load_threaded_get_status(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
694+
PRINT_VERBOSE("load_threaded_get_status(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
695695
return THREAD_LOAD_INVALID_RESOURCE;
696696
}
697697

@@ -732,7 +732,7 @@ Ref<Resource> ResourceLoader::load_threaded_get(const String &p_path, Error *r_e
732732
MutexLock thread_load_lock(thread_load_mutex);
733733

734734
if (!user_load_tokens.has(p_path)) {
735-
print_verbose("load_threaded_get(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
735+
PRINT_VERBOSE("load_threaded_get(): No threaded load for resource path '" + p_path + "' has been initiated or its result has already been collected.");
736736
if (r_error) {
737737
*r_error = ERR_INVALID_PARAMETER;
738738
}

‎core/object/worker_thread_pool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ void WorkerThreadPool::init(int p_thread_count, float p_low_priority_task_ratio)
777777

778778
max_low_priority_threads = CLAMP(p_thread_count * p_low_priority_task_ratio, 1, p_thread_count - 1);
779779

780-
print_verbose(vformat("WorkerThreadPool: %d threads, %d max low-priority.", p_thread_count, max_low_priority_threads));
780+
PRINT_VERBOSE(vformat("WorkerThreadPool: %d threads, %d max low-priority.", p_thread_count, max_low_priority_threads));
781781

782782
threads.resize(p_thread_count);
783783

‎core/string/string_name.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void StringName::cleanup() {
101101
}
102102
}
103103
if (lost_strings) {
104-
print_verbose(vformat("StringName: %d unclaimed string names at exit.", lost_strings));
104+
PRINT_VERBOSE(vformat("StringName: %d unclaimed string names at exit.", lost_strings));
105105
}
106106
configured = false;
107107
}

‎drivers/accesskit/accessibility_driver_accesskit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,7 @@ Error AccessibilityDriverAccessKit::init() {
15471547

15481548
Error err = OS::get_singleton()->open_dynamic_library(path, library_handle);
15491549
if (err == OK && initialize_libaccesskit(dylibloader_verbose, library_handle) == 0) {
1550-
print_verbose("AccessKit loaded.");
1550+
PRINT_VERBOSE("AccessKit loaded.");
15511551
} else {
15521552
return ERR_CANT_CREATE;
15531553
}

‎drivers/alsa/audio_driver_alsa.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Error AudioDriverALSA::init_output_device() {
123123
status = snd_pcm_hw_params_set_period_size_near(pcm_handle, hwparams, &period_size, nullptr);
124124
CHECK_FAIL(status < 0);
125125

126-
print_verbose("Audio buffer frames: " + itos(period_size) + " calculated latency: " + itos(period_size * 1000 / mix_rate) + "ms");
126+
PRINT_VERBOSE("Audio buffer frames: " + itos(period_size) + " calculated latency: " + itos(period_size * 1000 / mix_rate) + "ms");
127127

128128
status = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &periods, nullptr);
129129
CHECK_FAIL(status < 0);
@@ -176,9 +176,9 @@ Error AudioDriverALSA::init() {
176176
if (ver_parts.size() >= 2) {
177177
ver_ok = ((ver_parts[0].to_int() == 1 && ver_parts[1].to_int() >= 1)) || (ver_parts[0].to_int() > 1); // 1.1.0
178178
}
179-
print_verbose(vformat("ALSA %s detected.", version));
179+
PRINT_VERBOSE(vformat("ALSA %s detected.", version));
180180
if (!ver_ok) {
181-
print_verbose("Unsupported ALSA library version!");
181+
PRINT_VERBOSE("Unsupported ALSA library version!");
182182
return ERR_CANT_OPEN;
183183
}
184184

0 commit comments

Comments
 (0)