From 819c3524a54fb4ba66aece2401b1d28fd14b6608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 24 Sep 2020 15:40:26 +0200
Subject: [PATCH] OS: Remove unused get_splash_tick_msec

It was added in 3e20391bf607dc7c452b056854aed4a8c99ba0f6 but it doesn't seem
particularly useful, and it was only implemented for the custom splash branch
and not the default one, so it could return an uninitialized int.
---
 core/bind/core_bind.cpp | 5 -----
 core/bind/core_bind.h   | 1 -
 core/os/os.cpp          | 4 ----
 core/os/os.h            | 2 --
 doc/classes/OS.xml      | 7 -------
 main/main.cpp           | 1 -
 6 files changed, 20 deletions(-)

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 489ff762c95..c68222c767f 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 a59fcda60c5..5c9520d7fee 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 dc8bd5ee697..3a398316bde 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 8e5c0c26e02..4c1d9301073 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 26110df3356..a1f12e1a319 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 a0392832352..a2ea0856180 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);