3 files changed, 7 insertions, 11 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index 20b3435911..9dbb2952f7 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -234,7 +234,7 @@ double FileAccess::get_double() const {
 String FileAccess::get_token() const {
 	CharString token;
 
-	CharType c = get_8();
+	char32_t c = get_8();
 
 	while (!eof_reached()) {
 		if (c <= ' ') {
@@ -299,7 +299,7 @@ public:
 String FileAccess::get_line() const {
 	CharBuffer line;
 
-	CharType c = get_8();
+	char32_t c = get_8();
 
 	while (!eof_reached()) {
 		if (c == '\n' || c == '\0') {
@@ -342,8 +342,8 @@ Vector<String> FileAccess::get_csv_line(const String &p_delim) const {
 	bool in_quote = false;
 	String current;
 	for (int i = 0; i < l.length(); i++) {
-		CharType c = l[i];
-		CharType s[2] = { 0, 0 };
+		char32_t c = l[i];
+		char32_t s[2] = { 0, 0 };
 
 		if (!in_quote && c == p_delim[0]) {
 			strings.push_back(current);
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 48dae99188..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;
@@ -86,11 +85,13 @@ public:
 
 protected:
 	friend class Main;
+	// Needed by tests to setup command-line args.
+	friend int test_main(int argc, char *argv[]);
 
 	HasServerFeatureCallback has_server_feature_callback = nullptr;
 	RenderThreadMode _render_thread_mode = RENDER_THREAD_SAFE;
 
-	// functions used by main to initialize/deinitialize the OS
+	// Functions used by Main to initialize/deinitialize the OS.
 	void add_logger(Logger *p_logger);
 
 	virtual void initialize() = 0;
@@ -218,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; }