Added prefix to global delegates: FOnConnectDelegate, FOnDisconnectDelegate, FOnSubscriptionApplied, FOnSubscriptionError

Author: UmarM-Arvika

crates/codegen/src/unrealcpp.rs

@@ -855,7 +855,7 @@ impl Lang for UnrealCpp<'_> {
             includes.insert(format!("ModuleBindings/Procedures/{procedure_pascal}.g.h"));
         }
         // Collect includes for types used in delegates and contexts
-        // FSpacetimeDBIdentity is used in FOnConnectDelegate and context methods
+        // FSpacetimeDBIdentity is used in F{module_prefix}OnConnectDelegate and context methods
         collect_includes_for_type(
             self.module_prefix,
             module,
@@ -1296,13 +1296,13 @@ fn generate_delegates(output: &mut UnrealCppAutogen, module_prefix: &str) {
         "// U{module_prefix}DbConnection without manual casting in user code."
     );
     writeln!(output, "DECLARE_DYNAMIC_DELEGATE_ThreeParams(");
-    writeln!(output, "\tFOnConnectDelegate,");
+    writeln!(output, "\tF{module_prefix}OnConnectDelegate,");
     writeln!(output, "\tU{module_prefix}DbConnection*, Connection,");
     writeln!(output, "\tFSpacetimeDBIdentity, Identity,");
     writeln!(output, "\tconst FString&, Token);");
     writeln!(output);
     writeln!(output, "DECLARE_DYNAMIC_DELEGATE_TwoParams(");
-    writeln!(output, "\tFOnDisconnectDelegate,");
+    writeln!(output, "\tF{module_prefix}OnDisconnectDelegate,");
     writeln!(output, "\tU{module_prefix}DbConnection*, Connection,");
     writeln!(output, "\tconst FString&, Error);");
     writeln!(output);
@@ -1924,11 +1924,11 @@ fn generate_context_structs(
     writeln!(output, "}};");
     writeln!(output);
     writeln!(output, "DECLARE_DYNAMIC_DELEGATE_OneParam(");
-    writeln!(output, "\tFOnSubscriptionApplied,");
+    writeln!(output, "\tF{module_prefix}OnSubscriptionApplied,");
     writeln!(output, "\tF{module_prefix}SubscriptionEventContext, Context);");
     writeln!(output);
     writeln!(output, "DECLARE_DYNAMIC_DELEGATE_OneParam(");
-    writeln!(output, "\tFOnSubscriptionError,");
+    writeln!(output, "\tF{module_prefix}OnSubscriptionError,");
     writeln!(output, "\tF{module_prefix}ErrorContext, Context);");
     writeln!(output);
 }
@@ -2823,13 +2823,13 @@ fn generate_subscription_builder_class(output: &mut UnrealCppAutogen, module_pre
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category = \"SpacetimeDB\")");
     writeln!(
         output,
-        "    U{module_prefix}SubscriptionBuilder* OnApplied(FOnSubscriptionApplied Callback);"
+        "    U{module_prefix}SubscriptionBuilder* OnApplied(F{module_prefix}OnSubscriptionApplied Callback);"
     );
     writeln!(output);
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category = \"SpacetimeDB\")");
     writeln!(
         output,
-        "    U{module_prefix}SubscriptionBuilder* OnError(FOnSubscriptionError Callback);"
+        "    U{module_prefix}SubscriptionBuilder* OnError(F{module_prefix}OnSubscriptionError Callback);"
     );
     writeln!(output);
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category=\"SpacetimeDB\")");
@@ -2860,8 +2860,8 @@ fn generate_subscription_builder_class(output: &mut UnrealCppAutogen, module_pre
         output,
         "    // Delegates stored so Subscribe() can bind forwarding callbacks"
     );
-    writeln!(output, "    FOnSubscriptionApplied OnAppliedDelegateInternal;");
-    writeln!(output, "    FOnSubscriptionError OnErrorDelegateInternal;");
+    writeln!(output, "    F{module_prefix}OnSubscriptionApplied OnAppliedDelegateInternal;");
+    writeln!(output, "    F{module_prefix}OnSubscriptionError OnErrorDelegateInternal;");
     writeln!(output, "}};");
     writeln!(output);
 }
@@ -2895,8 +2895,8 @@ fn generate_subscription_handle_class(output: &mut UnrealCppAutogen, module_pref
         output,
         "    // Delegates that expose subscription events with connection aware contexts"
     );
-    writeln!(output, "    FOnSubscriptionApplied OnAppliedDelegate;");
-    writeln!(output, "    FOnSubscriptionError OnErrorDelegate;");
+    writeln!(output, "    F{module_prefix}OnSubscriptionApplied OnAppliedDelegate;");
+    writeln!(output, "    F{module_prefix}OnSubscriptionError OnErrorDelegate;");
     writeln!(output);
     writeln!(output, "    UFUNCTION()");
     writeln!(
@@ -2946,7 +2946,7 @@ fn generate_db_connection_builder_class(output: &mut UnrealCppAutogen, module_pr
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category = \"SpacetimeDB\")");
     writeln!(
         output,
-        "    U{module_prefix}DbConnectionBuilder* OnConnect(FOnConnectDelegate Callback);"
+        "    U{module_prefix}DbConnectionBuilder* OnConnect(F{module_prefix}OnConnectDelegate Callback);"
     );
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category = \"SpacetimeDB\")");
     writeln!(
@@ -2956,7 +2956,7 @@ fn generate_db_connection_builder_class(output: &mut UnrealCppAutogen, module_pr
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category = \"SpacetimeDB\")");
     writeln!(
         output,
-        "    U{module_prefix}DbConnectionBuilder* OnDisconnect(FOnDisconnectDelegate Callback);"
+        "    U{module_prefix}DbConnectionBuilder* OnDisconnect(F{module_prefix}OnDisconnectDelegate Callback);"
     );
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category = \"SpacetimeDB\")");
     writeln!(output, "    U{module_prefix}DbConnection* Build();");
@@ -2967,8 +2967,8 @@ fn generate_db_connection_builder_class(output: &mut UnrealCppAutogen, module_pr
         output,
         "    // Stored delegates which will be forwarded when the connection events occur."
     );
-    writeln!(output, "    FOnConnectDelegate OnConnectDelegateInternal;");
-    writeln!(output, "    FOnDisconnectDelegate OnDisconnectDelegateInternal;");
+    writeln!(output, "    F{module_prefix}OnConnectDelegate OnConnectDelegateInternal;");
+    writeln!(output, "    F{module_prefix}OnDisconnectDelegate OnDisconnectDelegateInternal;");
     writeln!(output, "}};");
     writeln!(output);
 }
@@ -3012,8 +3012,8 @@ fn generate_db_connection_class(
         output,
         "    // Delegates that allow users to bind with the concrete connection type."
     );
-    writeln!(output, "    FOnConnectDelegate OnConnectDelegate;");
-    writeln!(output, "    FOnDisconnectDelegate OnDisconnectDelegate;");
+    writeln!(output, "    F{module_prefix}OnConnectDelegate OnConnectDelegate;");
+    writeln!(output, "    F{module_prefix}OnDisconnectDelegate OnDisconnectDelegate;");
     writeln!(output);
     writeln!(output, "    UFUNCTION(BlueprintCallable, Category=\"SpacetimeDB\")");
     writeln!(
@@ -3488,15 +3488,15 @@ fn generate_client_implementation(
     writeln!(output, "}}");
     writeln!(
         output,
-        "U{module_prefix}SubscriptionBuilder* U{module_prefix}SubscriptionBuilder::OnApplied(FOnSubscriptionApplied Callback)"
+        "U{module_prefix}SubscriptionBuilder* U{module_prefix}SubscriptionBuilder::OnApplied(F{module_prefix}OnSubscriptionApplied Callback)"
     );
     writeln!(output, "{{");
     writeln!(output, "\tOnAppliedDelegateInternal = Callback;");
     writeln!(output, "\treturn this;");
     writeln!(output, "}}");
     writeln!(
         output,
-        "U{module_prefix}SubscriptionBuilder* U{module_prefix}SubscriptionBuilder::OnError(FOnSubscriptionError Callback)"
+        "U{module_prefix}SubscriptionBuilder* U{module_prefix}SubscriptionBuilder::OnError(F{module_prefix}OnSubscriptionError Callback)"
     );
     writeln!(output, "{{");
     writeln!(output, "\tOnErrorDelegateInternal = Callback;");
@@ -3620,7 +3620,7 @@ fn generate_client_implementation(
     writeln!(output, "}}");
     writeln!(
         output,
-        "U{module_prefix}DbConnectionBuilder* U{module_prefix}DbConnectionBuilder::OnConnect(FOnConnectDelegate Callback)"
+        "U{module_prefix}DbConnectionBuilder* U{module_prefix}DbConnectionBuilder::OnConnect(F{module_prefix}OnConnectDelegate Callback)"
     );
     writeln!(output, "{{");
     writeln!(output, "\tOnConnectDelegateInternal = Callback;");
@@ -3638,7 +3638,7 @@ fn generate_client_implementation(
     writeln!(output, "}}");
     writeln!(
         output,
-        "U{module_prefix}DbConnectionBuilder* U{module_prefix}DbConnectionBuilder::OnDisconnect(FOnDisconnectDelegate Callback)"
+        "U{module_prefix}DbConnectionBuilder* U{module_prefix}DbConnectionBuilder::OnDisconnect(F{module_prefix}OnDisconnectDelegate Callback)"
     );
     writeln!(output, "{{");
     writeln!(output, "\tOnDisconnectDelegateInternal = Callback;");