Fix some issues found by cppcheck.

4 files changed, 66 insertions, 66 deletions

diff --git a/core/variant/callable_bind.cpp b/core/variant/callable_bind.cpp
index 797e8afede..1a400b4360 100644
--- a/core/variant/callable_bind.cpp
+++ b/core/variant/callable_bind.cpp
@@ -40,8 +40,8 @@ String CallableCustomBind::get_as_text() const {
 }
 
 bool CallableCustomBind::_equal_func(const CallableCustom *p_a, const CallableCustom *p_b) {
-	const CallableCustomBind *a = (const CallableCustomBind *)p_a;
-	const CallableCustomBind *b = (const CallableCustomBind *)p_b;
+	const CallableCustomBind *a = static_cast<const CallableCustomBind *>(p_a);
+	const CallableCustomBind *b = static_cast<const CallableCustomBind *>(p_b);
 
 	if (!(a->callable != b->callable)) {
 		return false;
@@ -55,8 +55,8 @@ bool CallableCustomBind::_equal_func(const CallableCustom *p_a, const CallableCu
 }
 
 bool CallableCustomBind::_less_func(const CallableCustom *p_a, const CallableCustom *p_b) {
-	const CallableCustomBind *a = (const CallableCustomBind *)p_a;
-	const CallableCustomBind *b = (const CallableCustomBind *)p_b;
+	const CallableCustomBind *a = static_cast<const CallableCustomBind *>(p_a);
+	const CallableCustomBind *b = static_cast<const CallableCustomBind *>(p_b);
 
 	if (a->callable < b->callable) {
 		return true;
@@ -117,8 +117,8 @@ String CallableCustomUnbind::get_as_text() const {
 }
 
 bool CallableCustomUnbind::_equal_func(const CallableCustom *p_a, const CallableCustom *p_b) {
-	const CallableCustomUnbind *a = (const CallableCustomUnbind *)p_a;
-	const CallableCustomUnbind *b = (const CallableCustomUnbind *)p_b;
+	const CallableCustomUnbind *a = static_cast<const CallableCustomUnbind *>(p_a);
+	const CallableCustomUnbind *b = static_cast<const CallableCustomUnbind *>(p_b);
 
 	if (!(a->callable != b->callable)) {
 		return false;
@@ -132,8 +132,8 @@ bool CallableCustomUnbind::_equal_func(const CallableCustom *p_a, const Callable
 }
 
 bool CallableCustomUnbind::_less_func(const CallableCustom *p_a, const CallableCustom *p_b) {
-	const CallableCustomUnbind *a = (const CallableCustomUnbind *)p_a;
-	const CallableCustomUnbind *b = (const CallableCustomUnbind *)p_b;
+	const CallableCustomUnbind *a = static_cast<const CallableCustomUnbind *>(p_a);
+	const CallableCustomUnbind *b = static_cast<const CallableCustomUnbind *>(p_b);
 
 	if (a->callable < b->callable) {
 		return true;
diff --git a/core/variant/callable_bind.h b/core/variant/callable_bind.h
index 4f79a29629..a5c830e109 100644
--- a/core/variant/callable_bind.h
+++ b/core/variant/callable_bind.h
@@ -43,14 +43,14 @@ class CallableCustomBind : public CallableCustom {
 
 public:
 	//for every type that inherits, these must always be the same for this type
-	virtual uint32_t hash() const;
-	virtual String get_as_text() const;
-	virtual CompareEqualFunc get_compare_equal_func() const;
-	virtual CompareLessFunc get_compare_less_func() const;
-	virtual StringName get_method() const;
-	virtual ObjectID get_object() const; //must always be able to provide an object
-	virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const;
-	virtual const Callable *get_base_comparator() const;
+	virtual uint32_t hash() const override;
+	virtual String get_as_text() const override;
+	virtual CompareEqualFunc get_compare_equal_func() const override;
+	virtual CompareLessFunc get_compare_less_func() const override;
+	virtual StringName get_method() const override;
+	virtual ObjectID get_object() const override; //must always be able to provide an object
+	virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const override;
+	virtual const Callable *get_base_comparator() const override;
 
 	Callable get_callable() { return callable; }
 	Vector<Variant> get_binds() { return binds; }
@@ -68,14 +68,14 @@ class CallableCustomUnbind : public CallableCustom {
 
 public:
 	//for every type that inherits, these must always be the same for this type
-	virtual uint32_t hash() const;
-	virtual String get_as_text() const;
-	virtual CompareEqualFunc get_compare_equal_func() const;
-	virtual CompareLessFunc get_compare_less_func() const;
-	virtual StringName get_method() const;
-	virtual ObjectID get_object() const; //must always be able to provide an object
-	virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const;
-	virtual const Callable *get_base_comparator() const;
+	virtual uint32_t hash() const override;
+	virtual String get_as_text() const override;
+	virtual CompareEqualFunc get_compare_equal_func() const override;
+	virtual CompareLessFunc get_compare_less_func() const override;
+	virtual StringName get_method() const override;
+	virtual ObjectID get_object() const override; //must always be able to provide an object
+	virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const override;
+	virtual const Callable *get_base_comparator() const override;
 
 	Callable get_callable() { return callable; }
 	int get_unbinds() { return argcount; }
diff --git a/core/variant/variant_parser.h b/core/variant/variant_parser.h
index e5585076c2..b297babd6f 100644
--- a/core/variant/variant_parser.h
+++ b/core/variant/variant_parser.h
@@ -51,9 +51,9 @@ public:
 	struct StreamFile : public Stream {
 		FileAccess *f = nullptr;
 
-		virtual char32_t get_char();
-		virtual bool is_utf8() const;
-		virtual bool is_eof() const;
+		virtual char32_t get_char() override;
+		virtual bool is_utf8() const override;
+		virtual bool is_eof() const override;
 
 		StreamFile() {}
 	};
@@ -62,9 +62,9 @@ public:
 		String s;
 		int pos = 0;
 
-		virtual char32_t get_char();
-		virtual bool is_utf8() const;
-		virtual bool is_eof() const;
+		virtual char32_t get_char() override;
+		virtual bool is_utf8() const override;
+		virtual bool is_eof() const override;
 
 		StreamString() {}
 	};
diff --git a/core/variant/variant_utility.cpp b/core/variant/variant_utility.cpp
index 05fb577e2c..6ed85815be 100644
--- a/core/variant/variant_utility.cpp
+++ b/core/variant/variant_utility.cpp
@@ -470,20 +470,20 @@ struct VariantUtilityFunctions {
 			r_error.argument = 1;
 			return String();
 		}
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			String os = p_args[i]->operator String();
 
 			if (i == 0) {
-				str = os;
+				s = os;
 			} else {
-				str += os;
+				s += os;
 			}
 		}
 
 		r_error.error = Callable::CallError::CALL_OK;
 
-		return str;
+		return s;
 	}
 
 	static inline String error_string(Error error) {
@@ -495,98 +495,98 @@ struct VariantUtilityFunctions {
 	}
 
 	static inline void print(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			String os = p_args[i]->operator String();
 
 			if (i == 0) {
-				str = os;
+				s = os;
 			} else {
-				str += os;
+				s += os;
 			}
 		}
 
-		print_line(str);
+		print_line(s);
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
 	static inline void print_verbose(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
 		if (OS::get_singleton()->is_stdout_verbose()) {
-			String str;
+			String s;
 			for (int i = 0; i < p_arg_count; i++) {
 				String os = p_args[i]->operator String();
 
 				if (i == 0) {
-					str = os;
+					s = os;
 				} else {
-					str += os;
+					s += os;
 				}
 			}
 
 			// No need to use `print_verbose()` as this call already only happens
 			// when verbose mode is enabled. This avoids performing string argument concatenation
 			// when not needed.
-			print_line(str);
+			print_line(s);
 		}
 
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
 	static inline void printerr(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			String os = p_args[i]->operator String();
 
 			if (i == 0) {
-				str = os;
+				s = os;
 			} else {
-				str += os;
+				s += os;
 			}
 		}
 
-		print_error(str);
+		print_error(s);
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
 	static inline void printt(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			if (i) {
-				str += "\t";
+				s += "\t";
 			}
-			str += p_args[i]->operator String();
+			s += p_args[i]->operator String();
 		}
 
-		print_line(str);
+		print_line(s);
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
 	static inline void prints(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			if (i) {
-				str += " ";
+				s += " ";
 			}
-			str += p_args[i]->operator String();
+			s += p_args[i]->operator String();
 		}
 
-		print_line(str);
+		print_line(s);
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
 	static inline void printraw(const Variant **p_args, int p_arg_count, Callable::CallError &r_error) {
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			String os = p_args[i]->operator String();
 
 			if (i == 0) {
-				str = os;
+				s = os;
 			} else {
-				str += os;
+				s += os;
 			}
 		}
 
-		OS::get_singleton()->print("%s", str.utf8().get_data());
+		OS::get_singleton()->print("%s", s.utf8().get_data());
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
@@ -595,18 +595,18 @@ struct VariantUtilityFunctions {
 			r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 			r_error.argument = 1;
 		}
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			String os = p_args[i]->operator String();
 
 			if (i == 0) {
-				str = os;
+				s = os;
 			} else {
-				str += os;
+				s += os;
 			}
 		}
 
-		ERR_PRINT(str);
+		ERR_PRINT(s);
 		r_error.error = Callable::CallError::CALL_OK;
 	}
 
@@ -615,18 +615,18 @@ struct VariantUtilityFunctions {
 			r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 			r_error.argument = 1;
 		}
-		String str;
+		String s;
 		for (int i = 0; i < p_arg_count; i++) {
 			String os = p_args[i]->operator String();
 
 			if (i == 0) {
-				str = os;
+				s = os;
 			} else {
-				str += os;
+				s += os;
 			}
 		}
 
-		WARN_PRINT(str);
+		WARN_PRINT(s);
 		r_error.error = Callable::CallError::CALL_OK;
 	}