Convert _notification methods to switch - Chunk C

3 files changed, 16 insertions, 17 deletions

diff --git a/modules/gdnative/gdnative_library_singleton_editor.cpp b/modules/gdnative/gdnative_library_singleton_editor.cpp
index e0079f93ee..ce1f41bdf1 100644
--- a/modules/gdnative/gdnative_library_singleton_editor.cpp
+++ b/modules/gdnative/gdnative_library_singleton_editor.cpp
@@ -183,10 +183,12 @@ void GDNativeLibrarySingletonEditor::_item_edited() {
 }
 
 void GDNativeLibrarySingletonEditor::_notification(int p_what) {
-	if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
-		if (is_visible_in_tree()) {
-			_update_libraries();
-		}
+	switch (p_what) {
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			if (is_visible_in_tree()) {
+				_update_libraries();
+			}
+		} break;
 	}
 }
 
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp
index 5d5414c694..95976a8827 100644
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@@ -763,17 +763,19 @@ Variant NativeScriptInstance::call(const StringName &p_method, const Variant **p
 	return Variant();
 }
 
-void NativeScriptInstance::notification(int p_notification) {
+void NativeScriptInstance::notification(int p_what) {
 #ifdef DEBUG_ENABLED
-	if (p_notification == MainLoop::NOTIFICATION_CRASH) {
-		if (current_method_call != StringName()) {
-			ERR_PRINT("NativeScriptInstance detected crash on method: " + current_method_call);
-			current_method_call = "";
-		}
+	switch (p_what) {
+		case MainLoop::NOTIFICATION_CRASH: {
+			if (current_method_call != StringName()) {
+				ERR_PRINT("NativeScriptInstance detected crash on method: " + current_method_call);
+				current_method_call = "";
+			}
+		} break;
 	}
 #endif
 
-	Variant value = p_notification;
+	Variant value = p_what;
 	const Variant *args[1] = { &value };
 	Callable::CallError error;
 	call("_notification", args, 1, error);
@@ -1639,7 +1641,6 @@ void NativeReloadNode::_bind_methods() {
 
 void NativeReloadNode::_notification(int p_what) {
 #ifdef TOOLS_ENABLED
-
 	switch (p_what) {
 		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
 			if (unloaded) {
@@ -1672,7 +1673,6 @@ void NativeReloadNode::_notification(int p_what) {
 			}
 
 			unloaded = true;
-
 		} break;
 
 		case NOTIFICATION_APPLICATION_FOCUS_IN: {
@@ -1736,10 +1736,7 @@ void NativeReloadNode::_notification(int p_what) {
 			for (Set<StringName>::Element *R = libs_to_remove.front(); R; R = R->next()) {
 				NSL->library_gdnatives.erase(R->get());
 			}
-
 		} break;
-		default: {
-		};
 	}
 #endif
 }
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index 6c47d35abc..2d01de5832 100644
--- a/modules/gdnative/nativescript/nativescript.h
+++ b/modules/gdnative/nativescript/nativescript.h
@@ -209,7 +209,7 @@ public:
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
 	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
-	virtual void notification(int p_notification);
+	virtual void notification(int p_what);
 	String to_string(bool *r_valid);
 	virtual Ref<Script> get_script() const;