diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-09-28 10:13:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-28 10:13:37 +0200 |
commit | 1a8dfcd97b6d95d67aa00221196cdcc26b585e97 (patch) | |
tree | 5eea925701870cbeb9b3627b77495b8ef4f1b8e5 | |
parent | 0ba4a8ba7b0f54ac146bab3942bdd9ea60b8e18d (diff) | |
parent | 819c3524a54fb4ba66aece2401b1d28fd14b6608 (diff) |
Merge pull request #42304 from akien-mga/os-drop-get_splash_tick_msec
OS: Remove unused get_splash_tick_msec
-rw-r--r-- | core/bind/core_bind.cpp | 5 | ||||
-rw-r--r-- | core/bind/core_bind.h | 1 | ||||
-rw-r--r-- | core/os/os.cpp | 4 | ||||
-rw-r--r-- | core/os/os.h | 2 | ||||
-rw-r--r-- | doc/classes/OS.xml | 7 | ||||
-rw-r--r-- | main/main.cpp | 1 |
6 files changed, 0 insertions, 20 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 489ff762c9..c68222c767 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -519,10 +519,6 @@ uint64_t _OS::get_ticks_usec() const { return OS::get_singleton()->get_ticks_usec(); } -uint32_t _OS::get_splash_tick_msec() const { - return OS::get_singleton()->get_splash_tick_msec(); -} - bool _OS::can_use_threads() const { return OS::get_singleton()->can_use_threads(); } @@ -730,7 +726,6 @@ void _OS::_bind_methods() { ClassDB::bind_method(D_METHOD("delay_msec", "msec"), &_OS::delay_msec); ClassDB::bind_method(D_METHOD("get_ticks_msec"), &_OS::get_ticks_msec); ClassDB::bind_method(D_METHOD("get_ticks_usec"), &_OS::get_ticks_usec); - ClassDB::bind_method(D_METHOD("get_splash_tick_msec"), &_OS::get_splash_tick_msec); ClassDB::bind_method(D_METHOD("get_locale"), &_OS::get_locale); ClassDB::bind_method(D_METHOD("get_model_name"), &_OS::get_model_name); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index a59fcda60c..5c9520d7fe 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -208,7 +208,6 @@ public: void delay_msec(uint32_t p_msec) const; uint32_t get_ticks_msec() const; uint64_t get_ticks_usec() const; - uint32_t get_splash_tick_msec() const; bool can_use_threads() const; diff --git a/core/os/os.cpp b/core/os/os.cpp index dc8bd5ee69..3a398316bd 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -80,10 +80,6 @@ String OS::get_iso_date_time(bool local) const { timezone; } -uint64_t OS::get_splash_tick_msec() const { - return _msec_splash; -} - double OS::get_unix_time() const { return 0; } diff --git a/core/os/os.h b/core/os/os.h index 8e5c0c26e0..4c1d930107 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -52,7 +52,6 @@ class OS { bool _verbose_stdout = false; bool _debug_stdout = false; String _local_clipboard; - uint64_t _msec_splash; bool _no_window = false; int _exit_code = 0; int _orientation; @@ -220,7 +219,6 @@ public: virtual uint64_t get_ticks_usec() const = 0; uint32_t get_ticks_msec() const; - uint64_t get_splash_tick_msec() const; virtual bool is_userfs_persistent() const { return true; } diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 26110df335..a1f12e1a31 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -234,13 +234,6 @@ Returns the number of threads available on the host machine. </description> </method> - <method name="get_splash_tick_msec" qualifiers="const"> - <return type="int"> - </return> - <description> - Returns the amount of time in milliseconds it took for the boot logo to appear. - </description> - </method> <method name="get_static_memory_peak_usage" qualifiers="const"> <return type="int"> </return> diff --git a/main/main.cpp b/main/main.cpp index a039283235..a2ea085618 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1569,7 +1569,6 @@ Error Main::setup2(Thread::ID p_main_tid_override) { Color boot_bg_color = GLOBAL_DEF("application/boot_splash/bg_color", boot_splash_bg_color); if (boot_logo.is_valid()) { - OS::get_singleton()->_msec_splash = OS::get_singleton()->get_ticks_msec(); RenderingServer::get_singleton()->set_boot_image(boot_logo, boot_bg_color, boot_logo_scale, boot_logo_filter); |