From 1877ecd37963c72046c13e0962bc80b59e82379b Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 10 Sep 2023 09:59:50 +0200 Subject: [PATCH] Fix warning. --- platform/frt/os_frt.cpp | 2 +- platform/frt_sdl/frt_godot3.cc | 2 +- platform/osx/os_osx.h | 2 +- platform/osx/os_osx.mm | 2 +- platform/server/os_server.cpp | 2 +- platform/server/os_server.h | 2 +- platform/server/pandemonium_server.cpp | 2 +- platform/windows/os_windows.cpp | 2 +- platform/windows/os_windows.h | 2 +- platform/windows/pandemonium_windows.cpp | 2 +- platform/x11/os_x11.cpp | 2 +- platform/x11/os_x11.h | 2 +- platform/x11/pandemonium_x11.cpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index 7329bdf60..860fca91a 100644 --- a/platform/frt/os_frt.cpp +++ b/platform/frt/os_frt.cpp @@ -617,7 +617,7 @@ public: fatal("no video module available."); screen_size = env->video->get_screen_size(); } - void run_() { run(); } + void run_() { main_run(); } int get_exit_code_() { return get_exit_code(); } }; diff --git a/platform/frt_sdl/frt_godot3.cc b/platform/frt_sdl/frt_godot3.cc index 213c2f769..a127653a6 100644 --- a/platform/frt_sdl/frt_godot3.cc +++ b/platform/frt_sdl/frt_godot3.cc @@ -399,7 +399,7 @@ extern "C" int frt_godot_main(int argc, char *argv[]) { if (err != OK) return 255; if (Main::start()) - os.run(); + os.main_run(); Main::cleanup(); return os.get_exit_code(); } diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 2456d292f..47fbe00ad 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -323,7 +323,7 @@ public: virtual void _set_use_vsync(bool p_enable); //virtual bool is_vsync_enabled() const; - void run(); + void main_run(); void set_mouse_mode(MouseMode p_mode); MouseMode get_mouse_mode() const; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index ce8435c24..f393d6d61 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -3402,7 +3402,7 @@ void OS_OSX::pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActi CFRunLoopWakeUp(CFRunLoopGetCurrent()); // Prevent main loop from sleeping. } -void OS_OSX::run() { +void OS_OSX::main_run() { force_quit = false; if (!main_loop) { diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 7a8e50e66..986f0de84 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -190,7 +190,7 @@ bool OS_Server::_check_internal_feature_support(const String &p_feature) { return p_feature == "pc"; } -void OS_Server::run() { +void OS_Server::main_run() { force_quit = false; if (!main_loop) diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 131889e05..d30175ed2 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -107,7 +107,7 @@ public: virtual void move_window_to_foreground(); - void run(); + void main_run(); virtual OS::PowerState get_power_state(); virtual int get_power_seconds_left(); diff --git a/platform/server/pandemonium_server.cpp b/platform/server/pandemonium_server.cpp index 4e12e67c7..35c18a742 100644 --- a/platform/server/pandemonium_server.cpp +++ b/platform/server/pandemonium_server.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { return 255; if (Main::start()) - os.run(); // it is actually the OS that decides how to run + os.main_run(); // it is actually the OS that decides how to run Main::cleanup(); return os.get_exit_code(); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 3d38571a2..525f4cab0 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -3491,7 +3491,7 @@ void OS_Windows::force_process_input() { process_events(); // get rid of pending events } -void OS_Windows::run() { +void OS_Windows::main_run() { if (!main_loop) return; diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 653f0bd1f..b54a4aeaa 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -571,7 +571,7 @@ public: virtual Error shell_open(String p_uri); - void run(); + void main_run(); virtual bool get_swap_ok_cancel() { return true; diff --git a/platform/windows/pandemonium_windows.cpp b/platform/windows/pandemonium_windows.cpp index 2c303da7f..9f72cb8c1 100644 --- a/platform/windows/pandemonium_windows.cpp +++ b/platform/windows/pandemonium_windows.cpp @@ -171,7 +171,7 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) { } if (Main::start()) - os.run(); + os.main_run(); Main::cleanup(); for (int i = 0; i < argc; ++i) { diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 37674453d..5846c9628 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -3898,7 +3898,7 @@ void OS_X11::force_process_input() { #endif } -void OS_X11::run() { +void OS_X11::main_run() { force_quit = false; if (!main_loop) { diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index d3e3542a5..e24346be0 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -354,7 +354,7 @@ public: virtual bool _check_internal_feature_support(const String &p_feature); virtual void force_process_input(); - void run(); + void main_run(); void disable_crash_handler(); bool is_disable_crash_handler() const; diff --git a/platform/x11/pandemonium_x11.cpp b/platform/x11/pandemonium_x11.cpp index e0e24e05e..f86263490 100644 --- a/platform/x11/pandemonium_x11.cpp +++ b/platform/x11/pandemonium_x11.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) { } if (Main::start()) { - os.run(); // it is actually the OS that decides how to run + os.main_run(); // it is actually the OS that decides how to run } Main::cleanup();