Remove EBUS macros from GEMS (#14419)

* ebus changes

Signed-off-by: amzn-ahmadkrm <[email protected]>

* change ebus macros 2

Signed-off-by: amzn-ahmadkrm <[email protected]>

* Delete sphere.fbx.assetinfo

Signed-off-by: amzn-ahmadkrm <[email protected]>

* remove prefab changes

Signed-off-by: amzn-ahmadkrm <[email protected]>

* correct queue bus call

Signed-off-by: amzn-ahmadkrm <[email protected]>

* incorrect bus call fix

Signed-off-by: amzn-ahmadkrm <[email protected]>

* batch like calls

Signed-off-by: amzn-ahmadkrm <[email protected]>

---------

Signed-off-by: amzn-ahmadkrm <[email protected]>
Signed-off-by: amzn-ahmadkrm <[email protected]>
Co-authored-by: amzn-ahmadkrm <[email protected]>

Gems/AWSCore/Code/Source/Framework/HttpRequestJob.cpp

@@ -418,7 +418,7 @@ namespace AWSCore
                 {
                     auto callback = AZStd::make_shared<SuccessFn>(AZStd::move(m_successCallback));
                     auto fn = AZStd::function<void()>([callbackResponse, callback]() { (*callback)(callbackResponse); });
-                    EBUS_QUEUE_FUNCTION(AZ::TickBus, fn);
+                    AZ::TickBus::QueueFunction(fn);
                 }
             }
         }
@@ -427,7 +427,7 @@ namespace AWSCore
         {
             auto callback = AZStd::make_shared<SuccessFn>(AZStd::move(m_failureCallback));
             auto fn = AZStd::function<void()>([callbackResponse, callback]() { (*callback)(callbackResponse); });
-            EBUS_QUEUE_FUNCTION(AZ::TickBus, fn);
+            AZ::TickBus::QueueFunction(fn);
         }
     }
 

Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp

@@ -29,7 +29,7 @@ namespace ImageProcessingAtomEditor
 
 
         AZ::SerializeContext* serializeContext = nullptr;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(serializeContext, "Serialization context not available");
 
         m_ui->propertyEditor->SetAutoResizeLabels(true);

Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp

@@ -172,7 +172,7 @@ void FlyCameraInputComponent::OnTick(float deltaTime, AZ::ScriptTimePoint /*time
     }
 
     AZ::Transform worldTransform = AZ::Transform::Identity();
-    EBUS_EVENT_ID_RESULT(worldTransform, GetEntityId(), AZ::TransformBus, GetWorldTM);
+    AZ::TransformBus::EventResult(worldTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
 
     // Update movement
     const float moveSpeed = m_moveSpeed * deltaTime;
@@ -192,7 +192,7 @@ void FlyCameraInputComponent::OnTick(float deltaTime, AZ::ScriptTimePoint /*time
     const AZ::Quaternion newOrientation = LYQuaternionToAZQuaternion(Quat(newRotation));
     worldTransform.SetRotation(newOrientation);
 
-    EBUS_EVENT_ID(GetEntityId(), AZ::TransformBus, SetWorldTM, worldTransform);
+    AZ::TransformBus::Event(GetEntityId(), &AZ::TransformBus::Events::SetWorldTM, worldTransform);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp

@@ -641,7 +641,7 @@ void AZ::AtomFont::OnLanguageChanged()
 {
     ReloadAllFonts();
 
-    EBUS_EVENT(LanguageChangeNotificationBus, LanguageChanged);
+    LanguageChangeNotificationBus::Broadcast(&LanguageChangeNotificationBus::Events::LanguageChanged);
 }
 
 void AZ::AtomFont::ReloadAllFonts()
@@ -673,7 +673,7 @@ void AZ::AtomFont::ReloadAllFonts()
 
     // All UI text components need to reload their font assets (both in-game
     // and in-editor).
-    EBUS_EVENT(FontNotificationBus, OnFontsReloaded);
+    FontNotificationBus::Broadcast(&FontNotificationBus::Events::OnFontsReloaded);
 }
 
 void AZ::AtomFont::UnregisterFont(const char* fontName)

Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp

@@ -1537,7 +1537,7 @@ void AZ::FFont::Prepare(const char* str, bool updateTexture, const AtomFont::Gly
 
         // Let any listeners know that the font texture has changed
         // TODO Update to an AZ::Event when Cry use of this bus is cleaned out.
-        EBUS_EVENT(FontNotificationBus, OnFontTextureUpdated, this);
+        FontNotificationBus::Broadcast(&FontNotificationBus::Events::OnFontTextureUpdated, this);
     }
     else
     {

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp

@@ -94,8 +94,7 @@ namespace AZ
             m_scaleSource = configuration.m_scaleSource;
 
             m_cachedOwnerTransform = AZ::Transform::CreateIdentity();
-            EBUS_EVENT_ID_RESULT(m_cachedOwnerTransform, m_ownerId, AZ::TransformBus, GetWorldTM);
-
+            AZ::TransformBus::EventResult(m_cachedOwnerTransform, m_ownerId, &AZ::TransformBus::Events::GetWorldTM);
             if (configuration.m_attachedInitially)
             {
                 Attach(configuration.m_targetId, configuration.m_targetBoneName.c_str(), configuration.m_targetOffset);
@@ -180,7 +179,8 @@ namespace AZ
             if (m_targetId.IsValid())
             {
                 // alert others that we're detaching
-                EBUS_EVENT_ID(m_targetId, LmbrCentral::AttachmentComponentNotificationBus, OnDetached, m_ownerId);
+                LmbrCentral::AttachmentComponentNotificationBus::Event(
+                    m_targetId, &LmbrCentral::AttachmentComponentNotificationBus::Events::OnDetached, m_ownerId);
 
                 MeshComponentNotificationBus::Handler::BusDisconnect();
                 AZ::TransformNotificationBus::Handler::BusDisconnect(m_targetId);
@@ -268,7 +268,7 @@ namespace AZ
                 {
                     m_cachedOwnerTransform = finalTransform;
                     m_isUpdatingOwnerTransform = true;
-                    EBUS_EVENT_ID(m_ownerId, AZ::TransformBus, SetWorldTM, finalTransform);
+                    AZ::TransformBus::Event(m_ownerId, &AZ::TransformBus::Events::SetWorldTM, finalTransform);
                     m_isUpdatingOwnerTransform = false;
                 }
             }

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp

@@ -229,7 +229,8 @@ namespace AZ
 
         AZ::u32 EditorAttachmentComponent::OnTargetOffsetChanged()
         {
-            EBUS_EVENT_ID(GetEntityId(), LmbrCentral::AttachmentComponentRequestBus, SetAttachmentOffset, GetTargetOffset());
+            LmbrCentral::AttachmentComponentRequestBus::Event(
+                GetEntityId(), &LmbrCentral::AttachmentComponentRequestBus::Events::SetAttachmentOffset, GetTargetOffset());
             return AZ::Edit::PropertyRefreshLevels::None;
         }
 
@@ -250,12 +251,17 @@ namespace AZ
         {
             if (m_attachedInitially && m_targetId.IsValid())
             {
-                EBUS_EVENT_ID(
-                    GetEntityId(), LmbrCentral::AttachmentComponentRequestBus, Attach, m_targetId, m_targetBoneName.c_str(), GetTargetOffset());
+                LmbrCentral::AttachmentComponentRequestBus::Event(
+                    GetEntityId(),
+                    &LmbrCentral::AttachmentComponentRequestBus::Events::Attach,
+                    m_targetId,
+                    m_targetBoneName.c_str(),
+                    GetTargetOffset());
             }
             else
             {
-                EBUS_EVENT_ID(GetEntityId(), LmbrCentral::AttachmentComponentRequestBus, Detach);
+                LmbrCentral::AttachmentComponentRequestBus::Event(
+                    GetEntityId(), &LmbrCentral::AttachmentComponentRequestBus::Events::Detach);
             }
         }
     } // namespace Render

Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp

@@ -304,7 +304,8 @@ namespace AZ
             {
                 ComponentDescriptor::DependencyArrayType provided;
                 ComponentDescriptor* componentDescriptor = nullptr;
-                EBUS_EVENT_ID_RESULT(componentDescriptor, component->RTTI_GetType(), ComponentDescriptorBus, GetDescriptor);
+                ComponentDescriptorBus::EventResult(
+                    componentDescriptor, component->RTTI_GetType(), &ComponentDescriptorBus::Events::GetDescriptor);
                 AZ_Assert(componentDescriptor, "Component class %s descriptor is not created! It must be before you can use it!", component->RTTI_GetTypeName());
                 componentDescriptor->GetProvidedServices(provided, component);
                 auto providedItr = AZStd::find(provided.begin(), provided.end(), AZ_CRC_CE("ShapeService"));

Gems/Camera/Code/Source/CameraGem.cpp

@@ -50,7 +50,8 @@ namespace Camera
             {
                 typeIds.emplace_back(descriptor->GetUuid());
             }
-            EBUS_EVENT(AzFramework::MetricsPlainTextNameRegistrationBus, RegisterForNameSending, typeIds);
+            AzFramework::MetricsPlainTextNameRegistrationBus::Broadcast(
+                &AzFramework::MetricsPlainTextNameRegistrationBus::Events::RegisterForNameSending, typeIds);
         }
 
         AZ::ComponentTypeList GetRequiredSystemComponents() const override

Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp

@@ -38,7 +38,8 @@ namespace CameraFramework
             {
                 typeIds.emplace_back(descriptor->GetUuid());
             }
-            EBUS_EVENT(AzFramework::MetricsPlainTextNameRegistrationBus, RegisterForNameSending, typeIds);
+            AzFramework::MetricsPlainTextNameRegistrationBus::Broadcast(
+                &AzFramework::MetricsPlainTextNameRegistrationBus::Events::RegisterForNameSending, typeIds);
         }
     };
 }

Gems/CameraFramework/Code/Source/CameraRigComponent.cpp

@@ -73,7 +73,8 @@ namespace Camera
         }
 
         m_initialTransform = AZ::Transform::CreateIdentity();
-        EBUS_EVENT_ID_RESULT(m_initialTransform, GetEntityId(), AZ::TransformBus, GetWorldTM);
+        AZ::TransformBus::EventResult(m_initialTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
+
         AZ::TickBus::Handler::BusConnect();
     }
 
@@ -159,7 +160,7 @@ namespace Camera
     {
         // Step 1 Acquire a target
         AZ::Transform initialCameraTransform = AZ::Transform::Identity();
-        EBUS_EVENT_ID_RESULT(initialCameraTransform, GetEntityId(), AZ::TransformBus, GetWorldTM);
+        AZ::TransformBus::EventResult(initialCameraTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
         AZ::Transform targetTransform(m_initialTransform);
         for (ICameraTargetAcquirer* targetAcquirer : m_targetAcquirers)
         {
@@ -184,6 +185,6 @@ namespace Camera
         }
 
         // Step 4 Alert the camera component of the new desired transform
-        EBUS_EVENT_ID(GetEntityId(), AZ::TransformBus, SetWorldTM, finalTransform);
+        AZ::TransformBus::Event(GetEntityId(), &AZ::TransformBus::Events::SetWorldTM, finalTransform);
     }
 } //namespace Camera

Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/AnimGraphCommands.cpp

@@ -68,7 +68,8 @@ namespace CommandSystem
         {
             m_relocateFilenameFunction(filename);
         }
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
         // Resolve the filename if it starts with a path alias
         if (filename.starts_with('@'))
         {

Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/ImporterCommands.cpp

@@ -59,7 +59,9 @@ namespace CommandSystem
         AZStd::string filename;
         parameters.GetValue("filename", "", filename);
         
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
+
         // Resolve the filename if it starts with a path alias
         if (filename.starts_with('@'))
         {
@@ -67,8 +69,12 @@ namespace CommandSystem
         }
 
         AZ::Data::AssetId actorAssetId;
-        EBUS_EVENT_RESULT(
-            actorAssetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, filename.c_str(), AZ::Data::s_invalidAssetType, false);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            actorAssetId,
+            &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+            filename.c_str(),
+            AZ::Data::s_invalidAssetType,
+            false);
         if (!actorAssetId.IsValid())
         {
             outResult = AZStd::string::format("Cannot import actor. Cannot find asset at path %s.", filename.c_str());
@@ -227,7 +233,8 @@ namespace CommandSystem
         AZStd::string filename;
         parameters.GetValue("filename", "", &filename);
         
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         // Resolve any path aliases as part of the filename parameter
         if (filename.starts_with('@'))

Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionCommands.cpp

@@ -212,7 +212,8 @@ namespace CommandSystem
         AZStd::string filename;
         parameters.GetValue("filename", this, &filename);
 
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
         // Resolve the filename if it starts with a path alias
         if (auto fileIoBase{ AZ::IO::FileIOBase::GetInstance() }; fileIoBase && filename.starts_with('@'))
         {
@@ -521,7 +522,8 @@ namespace CommandSystem
     {
         AZStd::string filename = parameters.GetValue("filename", command);
 
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
         // Resolve the filename if it starts with a path alias
         if (filename.starts_with('@'))
         {
@@ -830,7 +832,8 @@ namespace CommandSystem
     {
         AZStd::string filename;
         parameters.GetValue("filename", "", filename);
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
         // Resolve the filename if it starts with a path alias
         if (filename.starts_with('@'))
         {

Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/MotionSetCommands.cpp

@@ -139,7 +139,8 @@ namespace CommandSystem
         {
             AZStd::string filename;
             parameters.GetValue("fileName", this, filename);
-            EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+            AzFramework::ApplicationRequests::Bus::Broadcast(
+                &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
             motionSet->SetFilename(filename.c_str());
         }
 
@@ -885,7 +886,8 @@ namespace CommandSystem
         {
             m_relocateFilenameFunction(filename);
         }
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         // Get the old log levels.
         MCore::LogCallback::ELogLevel oldLogLevels = MCore::GetLogManager().GetLogLevels();

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp

@@ -188,7 +188,8 @@ namespace EMotionFX
                 // in the same way again. To guarantee the same uuid, generate a stable one instead.
                 group->OverrideId(AZ::SceneAPI::DataTypes::Utilities::CreateStableUuid(scene, Group::ActorGroup::TYPEINFO_Uuid()));
 
-                EBUS_EVENT(AZ::SceneAPI::Events::ManifestMetaInfoBus, InitializeObject, scene, *group);
+                AZ::SceneAPI::Events::ManifestMetaInfoBus::Broadcast(
+                    &AZ::SceneAPI::Events::ManifestMetaInfoBus::Events::InitializeObject, scene, *group);
                 scene.GetManifest().AddEntry(AZStd::move(group));
 
                 return AZ::SceneAPI::Events::ProcessingResult::Success;

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/MotionGroupBehavior.cpp

@@ -177,7 +177,8 @@ namespace EMotionFX
                 //      in the same way again. To guarantee the same uuid, generate a stable one instead.
                 group->OverrideId(AZ::SceneAPI::DataTypes::Utilities::CreateStableUuid(scene, Group::MotionGroup::TYPEINFO_Uuid()));
 
-                EBUS_EVENT(AZ::SceneAPI::Events::ManifestMetaInfoBus, InitializeObject, scene, *group);
+                AZ::SceneAPI::Events::ManifestMetaInfoBus::Broadcast(
+                    &AZ::SceneAPI::Events::ManifestMetaInfoBus::Events::InitializeObject, scene, *group);
                 scene.GetManifest().AddEntry(AZStd::move(group));
 
                 return AZ::SceneAPI::Events::ProcessingResult::Success;

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MorphTargetRule.cpp

@@ -86,7 +86,8 @@ namespace EMotionFX
                     AZStd::set<AZ::Crc32> types;
                     auto keyValueIterator = it.GetBaseIterator();
                     AZ::SceneAPI::Containers::SceneGraph::NodeIndex index = graph.ConvertToNodeIndex(keyValueIterator.GetFirstIterator());
-                    EBUS_EVENT(AZ::SceneAPI::Events::GraphMetaInfoBus, GetVirtualTypes, types, scene, index);
+                    AZ::SceneAPI::Events::GraphMetaInfoBus::Broadcast(
+                        &AZ::SceneAPI::Events::GraphMetaInfoBus::Events::GetVirtualTypes, types, scene, index);
                     if (types.find(AZ::SceneAPI::Events::GraphMetaInfo::GetIgnoreVirtualType()) == types.end())
                     {
                         selection.AddSelectedNode(it->first.GetPath());
@@ -169,7 +170,8 @@ namespace EMotionFX
                     AZStd::set<AZ::Crc32> types;
                     auto keyValueIterator = it.GetBaseIterator();
                     AZ::SceneAPI::Containers::SceneGraph::NodeIndex index = graph.ConvertToNodeIndex(keyValueIterator.GetFirstIterator());
-                    EBUS_EVENT(AZ::SceneAPI::Events::GraphMetaInfoBus, GetVirtualTypes, types, scene, index);
+                    AZ::SceneAPI::Events::GraphMetaInfoBus::Broadcast(
+                        &AZ::SceneAPI::Events::GraphMetaInfoBus::Events::GetVirtualTypes, types, scene, index);
                     if (types.find(AZ::SceneAPI::Events::GraphMetaInfo::GetIgnoreVirtualType()) == types.end())
                     {
                         morphTargetAnimations++;

Gems/EMotionFX/Code/EMotionFX/Source/EMotionFXManager.cpp

@@ -338,7 +338,8 @@ namespace EMotionFX
             }
         }
 
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, m_mediaRootFolder);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, m_mediaRootFolder);
     }
 
 
@@ -361,7 +362,8 @@ namespace EMotionFX
                 }
             }
 
-            EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, m_assetSourceFolder);
+            AzFramework::ApplicationRequests::Bus::Broadcast(
+                &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, m_assetSourceFolder);
         }
         else
         {
@@ -386,7 +388,8 @@ namespace EMotionFX
                 }
             }
 
-            EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, m_assetCacheFolder);
+            AzFramework::ApplicationRequests::Bus::Broadcast(
+                &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, m_assetCacheFolder);
         }
         else
         {
@@ -398,7 +401,8 @@ namespace EMotionFX
     void EMotionFXManager::ConstructAbsoluteFilename(const char* relativeFilename, AZStd::string& outAbsoluteFilename)
     {
         outAbsoluteFilename = relativeFilename;
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, outAbsoluteFilename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, outAbsoluteFilename);
         AzFramework::StringFunc::Replace(outAbsoluteFilename, EMFX_MEDIAROOTFOLDER_STRING, m_mediaRootFolder.c_str(), true);
     }
 
@@ -417,8 +421,10 @@ namespace EMotionFX
         AZStd::string filename = inOutFilename->c_str();
 
         // TODO: Add parameter to not lower case the path once it is in and working.
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, baseFolderPath);
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, baseFolderPath);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         // Remove the media root folder from the absolute motion filename so that we get the relative one to the media root folder.
         AzFramework::StringFunc::Replace(filename, baseFolderPath.c_str(), "", false /* case sensitive */, true /* replace first */);

Gems/EMotionFX/Code/EMotionFX/Source/Importer/Importer.cpp

@@ -191,7 +191,7 @@ namespace EMotionFX
     // try to load an actor from disk
     AZStd::unique_ptr<Actor> Importer::LoadActor(AZStd::string filename, ActorSettings* settings)
     {
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
         // Resolve the filename if it starts with a path alias
         if (filename.starts_with('@'))
         {
@@ -361,7 +361,7 @@ namespace EMotionFX
     // try to load a motion from disk
     Motion* Importer::LoadMotion(AZStd::string filename, MotionSettings* settings)
     {
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         // check if we want to load the motion even if a motion with the given filename is already inside the motion manager
         if (settings == nullptr || (settings && settings->m_forceLoading == false))
@@ -511,7 +511,7 @@ namespace EMotionFX
 
     MotionSet* Importer::LoadMotionSet(AZStd::string filename, MotionSetSettings* settings, const AZ::ObjectStream::FilterDescriptor& loadFilter)
     {
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         AZ::SerializeContext* context = nullptr;
         AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
@@ -556,7 +556,7 @@ namespace EMotionFX
     // load a node map by filename
     NodeMap* Importer::LoadNodeMap(AZStd::string filename, NodeMapSettings* settings)
     {
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         if (GetLogging())
         {
@@ -1010,7 +1010,7 @@ namespace EMotionFX
 
     AnimGraph* Importer::LoadAnimGraph(AZStd::string filename, const AZ::ObjectStream::FilterDescriptor& loadFilter)
     {
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         AZ::SerializeContext* context = nullptr;
         AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);

Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp

@@ -141,7 +141,11 @@ namespace EMStudio
         // Get the full file path for the asset source file based on the product filename.
         bool fullPathFound = false;
         AZStd::string sourceAssetFilename;
-        EBUS_EVENT_RESULT(fullPathFound, AzToolsFramework::AssetSystemRequestBus, GetFullSourcePathFromRelativeProductPath, productFilename, sourceAssetFilename);
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            fullPathFound,
+            &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+            productFilename,
+            sourceAssetFilename);
 
         // Generate meta data command for all changes being made to the actor.
         const AZStd::string metaDataString = CommandSystem::MetaData::GenerateActorMetaData(actor);
@@ -295,8 +299,11 @@ namespace EMStudio
         // Get the full file path for the asset source file based on the product filename.
         bool fullPathFound = false;
         AZStd::string sourceAssetFilename;
-        EBUS_EVENT_RESULT(fullPathFound, AzToolsFramework::AssetSystemRequestBus, GetFullSourcePathFromRelativeProductPath, productFilename, sourceAssetFilename);
-
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            fullPathFound,
+            &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+            productFilename,
+            sourceAssetFilename);
         // Load the manifest from disk.
         AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene> scene;
         AZ::SceneAPI::Events::SceneSerializationBus::BroadcastResult(scene, &AZ::SceneAPI::Events::SceneSerializationBus::Events::LoadScene, sourceAssetFilename, AZ::Uuid::CreateNull(), "");
@@ -462,7 +469,7 @@ namespace EMStudio
             outResult = AZStd::string::format("Motion set cannot be saved. Unable to find source asset path for (%s)", filename.c_str());
             return false;
         }
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         if (!CheckOutFile(parameters, filename.c_str(), outResult, false))
         {
@@ -568,7 +575,7 @@ namespace EMStudio
             outResult = AZStd::string::format("Animation graph cannot be saved. Unable to find source asset path for (%s)", filename.c_str());
             return false;
         }
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         AZStd::string companyName;
         parameters.GetValue("companyName", this, companyName);
@@ -675,7 +682,7 @@ namespace EMStudio
             outResult = AZStd::string::format("Workspace cannot be saved. Unable to find source asset path for (%s)", filename.c_str());
             return false;
         }
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         const bool fileExisted = AZ::IO::FileIOBase::GetInstance()->Exists(filename.c_str());
 

Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp

@@ -395,7 +395,8 @@ namespace EMStudio
         QDir dir(appDataFolder.c_str());
         dir.mkpath(appDataFolder.c_str());
 
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, appDataFolder);
+        AzFramework::ApplicationRequests::Bus::Broadcast(
+            &AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, appDataFolder);
         return appDataFolder.c_str();
     }
 

Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/FileManager.cpp

@@ -76,7 +76,8 @@ namespace EMStudio
         AzFramework::StringFunc::AssetDatabasePath::Normalize(assetCachePath);
 
         AZStd::string relativePath;
-        EBUS_EVENT_RESULT(relativePath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetId);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            relativePath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, assetId);
         AzFramework::StringFunc::AssetDatabasePath::Join(assetCachePath.c_str(), relativePath.c_str(), filename);
 
         return filename;
@@ -280,7 +281,11 @@ namespace EMStudio
             EMotionFX::GetEMotionFX().GetFilenameRelativeTo(&relativeFilename, assetCacheFolder.c_str());
 
             bool found = false;
-            EBUS_EVENT_RESULT(found, AzToolsFramework::AssetSystemRequestBus, GetFullSourcePathFromRelativeProductPath, relativeFilename.c_str(), filename);
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+                found,
+                &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+                relativeFilename.c_str(),
+                filename);
             return found;
         }
         return true;

Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/MainWindow.cpp

@@ -1298,16 +1298,23 @@ namespace EMStudio
         AzFramework::StringFunc::AssetDatabasePath::Normalize(cachePath);
 
         AZStd::string actorFilename;
-        EBUS_EVENT_RESULT(actorFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, actorAssetId);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            actorFilename, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, actorAssetId);
         AzFramework::StringFunc::AssetDatabasePath::Join(cachePath.c_str(), actorFilename.c_str(), filename);
         actorFilename = filename;
 
         AZStd::string animgraphFilename;
-        EBUS_EVENT_RESULT(animgraphFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, animgraphId);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            animgraphFilename, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, animgraphId);
         bool found;
         if (!animgraphFilename.empty())
         {
-            EBUS_EVENT_RESULT(found, AzToolsFramework::AssetSystemRequestBus, GetFullSourcePathFromRelativeProductPath, animgraphFilename.c_str(), filename);
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+                found,
+                &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+                animgraphFilename.c_str(),
+                filename);
+
             if (found)
             {
                 animgraphFilename = filename;
@@ -1315,10 +1322,16 @@ namespace EMStudio
         }
 
         AZStd::string motionSetFilename;
-        EBUS_EVENT_RESULT(motionSetFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, motionSetId);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            motionSetFilename, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, motionSetId);
         if (!motionSetFilename.empty())
         {
-            EBUS_EVENT_RESULT(found, AzToolsFramework::AssetSystemRequestBus, GetFullSourcePathFromRelativeProductPath, motionSetFilename.c_str(), filename);
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+                found,
+                &AzToolsFramework::AssetSystemRequestBus::Events::GetFullSourcePathFromRelativeProductPath,
+                motionSetFilename.c_str(),
+                filename);
+
             if (found)
             {
                 motionSetFilename = filename;
@@ -2250,7 +2263,8 @@ namespace EMStudio
         AzFramework::StringFunc::AssetDatabasePath::Normalize(cachePath);
 
         AZStd::string actorFilename;
-        EBUS_EVENT_RESULT(actorFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, actorAssetId);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            actorFilename, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, actorAssetId);
         AzFramework::StringFunc::AssetDatabasePath::Join(cachePath.c_str(), actorFilename.c_str(), filename);
         actorFilename = filename;
 

Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp

@@ -446,7 +446,7 @@ namespace EMStudio
 
         AZStd::string filename;
         commandLine.GetValue("filename", command, filename);
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         CommandEditorLoadAnimGraph::RelocateFilename(filename);
 

Gems/EMotionFX/Code/MysticQt/Source/RecentFiles.cpp

@@ -226,7 +226,7 @@ namespace MysticQt
 
     void RecentFiles::AddRecentFile(AZStd::string filename)
     {
-        EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, filename);
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, filename);
 
         // Remove filename duplicates and add the new filename to the top of the recent files.
         if (!filename.empty())

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorGoalNodeHandler.cpp

@@ -158,7 +158,8 @@ namespace EMotionFX
 
         connect(picker, &ActorGoalNodePicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorJointHandler.cpp

@@ -225,8 +225,12 @@ namespace EMotionFX
 
         connect(picker, &ActorJointPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    [picker](AzToolsFramework::PropertyEditorGUIMessages* handler)
+                    {
+                        handler->RequestWrite(picker);
+                        handler->OnEditingFinished(picker);
+                    });
         });
 
         return picker;
@@ -269,9 +273,13 @@ namespace EMotionFX
 
         connect(picker, &ActorJointPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, picker);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh, AzToolsFramework::Refresh_EntireTree);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    [picker](AzToolsFramework::PropertyEditorGUIMessages* handler)
+                    {
+                        handler->RequestWrite(picker);
+                        handler->OnEditingFinished(picker);
+                        handler->RequestRefresh(AzToolsFramework::Refresh_EntireTree);
+                    });
         });
 
         return picker;
@@ -314,9 +322,13 @@ namespace EMotionFX
 
         connect(picker, &ActorJointPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, picker);
-            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh, AzToolsFramework::Refresh_EntireTree);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                [picker](AzToolsFramework::PropertyEditorGUIMessages* handler)
+                {
+                    handler->RequestWrite(picker);
+                    handler->OnEditingFinished(picker);
+                    handler->RequestRefresh(AzToolsFramework::Refresh_EntireTree);
+                });
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/ActorMorphTargetHandler.cpp

@@ -172,7 +172,8 @@ namespace EMotionFX
 
         connect(picker, &ActorMorphTargetPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeHandler.cpp

@@ -149,7 +149,8 @@ namespace EMotionFX
 
         connect(picker, &AnimGraphNodeIdPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphNodeNameHandler.cpp

@@ -65,7 +65,8 @@ namespace EMotionFX
 
         connect(lineEdit, &AnimGraphNodeNameLineEdit::TextEditingFinished, this, [lineEdit]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, lineEdit);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, lineEdit);
         });
 
         return lineEdit;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterHandler.cpp

@@ -251,7 +251,8 @@ namespace EMotionFX
 
         connect(picker, &AnimGraphParameterPicker::ParametersChanged, this, [picker]([[maybe_unused]] const AZStd::vector<AZStd::string>& newParameters)
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;
@@ -317,7 +318,8 @@ namespace EMotionFX
 
         connect(picker, &AnimGraphParameterPicker::ParametersChanged, this, [picker]([[maybe_unused]] const AZStd::vector<AZStd::string>& newParameters)
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
             });
 
         return picker;
@@ -343,7 +345,8 @@ namespace EMotionFX
         picker->SetFilterTypes({azrtti_typeid<Vector2Parameter>()});
 
         connect(picker, &AnimGraphParameterPicker::ParametersChanged, this, [picker]([[maybe_unused]] const AZStd::vector<AZStd::string>& newParameters) {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;
@@ -370,7 +373,8 @@ namespace EMotionFX
 
         connect(picker, &AnimGraphParameterPicker::ParametersChanged, this, [picker]([[maybe_unused]] const AZStd::vector<AZStd::string>& newParameters)
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphParameterMaskHandler.cpp

@@ -36,7 +36,8 @@ namespace EMotionFX
 
         connect(picker, &AnimGraphParameterPicker::ParametersChanged, this, [picker]([[maybe_unused]] const AZStd::vector<AZStd::string>& newParameters)
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
         return picker;
     }

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTagHandler.cpp

@@ -26,7 +26,8 @@ namespace EMotionFX
     {
         connect(this, &AnimGraphTagSelector::TagsChanged, this, [this]()
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, this);
                 AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, this);
             });
     }

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/AnimGraphTransitionHandler.cpp

@@ -362,7 +362,8 @@ namespace EMotionFX
 
         connect(picker, &AnimGraphTransitionIdPicker::SelectionChanged, this, [picker]()
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
             });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceEvaluatorHandler.cpp

@@ -96,7 +96,8 @@ namespace EMotionFX
 
         connect(picker, &BlendSpaceEvaluatorPicker::EvaluatorChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionContainerHandler.cpp

@@ -546,7 +546,8 @@ namespace EMotionFX
 
         connect(picker, &BlendSpaceMotionContainerWidget::MotionsChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/BlendSpaceMotionHandler.cpp

@@ -89,7 +89,8 @@ namespace EMotionFX
 
         connect(picker, &BlendSpaceMotionPicker::MotionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/LODTreeSelectionHandler.cpp

@@ -26,7 +26,8 @@ namespace EMotionFX
                 connect(instance, &LODTreeSelectionWidget::valueChanged, this,
                     [instance]()
                     {
-                        EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, instance);
+                        AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                            &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, instance);
                     });
                 return instance;
             }

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.cpp

@@ -29,7 +29,8 @@ namespace EMotionFX
 
         connect(picker, &QComboBox::currentTextChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetMotionIdHandler.cpp

@@ -446,7 +446,8 @@ namespace EMotionFX
 
         connect(picker, &MotionSetMotionIdPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;
@@ -506,7 +507,8 @@ namespace EMotionFX
 
         connect(picker, &MotionSetMotionIdPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionSetNameHandler.cpp

@@ -27,7 +27,8 @@ namespace EMotionFX
 
         connect(picker, &QComboBox::currentTextChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/RagdollJointHandler.cpp

@@ -28,7 +28,8 @@ namespace EMotionFX
 
         connect(picker, &ActorJointPicker::SelectionChanged, this, [picker]()
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
             });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectColliderTagHandler.cpp

@@ -25,7 +25,8 @@ namespace EMotionFX
     {
         connect(this, &SimulatedObjectColliderTagSelector::TagsChanged, this, [this]()
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, this);
                 AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, this);
             });
     }
@@ -123,7 +124,8 @@ namespace EMotionFX
     {
         connect(this, &SimulatedJointColliderExclusionTagSelector::TagsChanged, this, [this]()
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, this);
                 AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, this);
             });
     }

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectNameHandler.cpp

@@ -32,7 +32,8 @@ namespace EMotionFX
         });
 
         connect(this, &LineEditValidatable::TextEditingFinished, this, [this]() {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, this);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, this);
             AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, this);
         });
     }

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/SimulatedObjectSelectionHandler.cpp

@@ -128,7 +128,8 @@ namespace EMotionFX
 
         connect(picker, &SimulatedObjectPicker::SelectionChanged, this, [picker]([[maybe_unused]] const AZStd::vector<AZStd::string>& newSimulatedObjects)
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/TransitionStateFilterLocalHandler.cpp

@@ -143,7 +143,8 @@ namespace EMotionFX
 
         connect(picker, &TransitionStateFilterPicker::SelectionChanged, this, [picker]()
         {
-            EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+            AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
         });
 
         return picker;

Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp

@@ -67,7 +67,7 @@ namespace EMotionFX
                 // The following code is required to be set so the FileManager detects changes to the files loaded
                 // through this method. Once EMotionFX is integrated to the asset system this can go away.
                 AZStd::string assetFilename;
-                EBUS_EVENT_RESULT(assetFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, asset.GetId());
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetFilename, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
                 AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
                 if (!projectPath.empty())
                 {

Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp

@@ -46,7 +46,12 @@ namespace EMotionFX
                 // It should already be loaded through a motion set.
                 const char* motionFile = entry->GetFilename();
                 AZ::Data::AssetId motionAssetId;
-                EBUS_EVENT_RESULT(motionAssetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, motionFile, azrtti_typeid<MotionAsset>(), false);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    motionAssetId,
+                    &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                    motionFile,
+                    azrtti_typeid<MotionAsset>(),
+                    false);
 
                 // if it failed to find it, it might be still compiling - try forcing an immediate compile:
                 if (!motionAssetId.IsValid())
@@ -149,7 +154,8 @@ namespace EMotionFX
             // The following code is required to be set so the FileManager detects changes to the files loaded
             // through this method. Once EMotionFX is integrated to the asset system this can go away.
             AZStd::string assetFilename;
-            EBUS_EVENT_RESULT(assetFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, asset.GetId());
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                assetFilename, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
 
             AZ::IO::FixedMaxPath projectPath = AZ::Utils::GetProjectPath();
             if (!projectPath.empty())
@@ -187,7 +193,12 @@ namespace EMotionFX
                 // Find motion file in catalog and grab the asset.
                 // Jump on the AssetBus for the asset, and queue load.
                 AZ::Data::AssetId motionAssetId;
-                EBUS_EVENT_RESULT(motionAssetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, motionFilename, AZ::Data::s_invalidAssetType, false);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    motionAssetId,
+                    &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                    motionFilename,
+                    AZ::Data::s_invalidAssetType,
+                    false);
 
                 // if it failed to find it, it might be still compiling - try forcing an immediate compile.  CompileAssetSync
                 // will block until the compilation completes AND the catalog is up to date.

Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp

@@ -486,7 +486,7 @@ namespace EMotionFX
         {
             // call to open must be done before LoadCharacter
             const char* panelName = EMStudio::MainWindow::GetEMotionFXPaneName();
-            EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, OpenViewPane, panelName);
+            AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::Bus::Events::OpenViewPane, panelName);
 
             if (assetId.IsValid())
             {

Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp

@@ -120,7 +120,7 @@ namespace EMotionFX
         {
             // call to open must be done before LoadCharacter
             const char* panelName = EMStudio::MainWindow::GetEMotionFXPaneName();
-            EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, OpenViewPane, panelName);
+            AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::Bus::Events::OpenViewPane, panelName);
 
             if (assetId.IsValid())
             {
@@ -347,7 +347,7 @@ namespace EMotionFX
 
             // Force-refresh the property grid.
             using namespace AzToolsFramework;
-            EBUS_EVENT(ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, Refresh_EntireTree);
+            ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay, Refresh_EntireTree);
         }
 
 

Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp

@@ -748,7 +748,7 @@ namespace EMotionFX
             if (rootPath)
             {
                 AZStd::string mediaRootPath = rootPath;
-                EBUS_EVENT(AzFramework::ApplicationRequests::Bus, NormalizePathKeepCase, mediaRootPath);
+                AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::Bus::Events::NormalizePathKeepCase, mediaRootPath);
                 EMotionFX::GetEMotionFX().SetMediaRootFolder(mediaRootPath.c_str());
             }
             else

Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp

@@ -300,7 +300,7 @@ namespace InAppPurchases
         m_productInfoIndex++;
 
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr)
         {
@@ -323,7 +323,8 @@ namespace InAppPurchases
         m_productInfoIndex--;
 
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr)
         {
@@ -346,7 +347,8 @@ namespace InAppPurchases
         m_purchasedProductInfoIndex++;
 
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         if (purchasedProductDetails != nullptr)
         {
@@ -369,7 +371,8 @@ namespace InAppPurchases
         m_purchasedProductInfoIndex--;
 
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         if (purchasedProductDetails != nullptr)
         {
@@ -390,7 +393,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetProductId()
     {
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr && m_productInfoIndex >= 0 && m_productInfoIndex < productDetails->size())
         {
@@ -403,7 +407,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetProductTitle()
     {
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr && m_productInfoIndex >= 0 && m_productInfoIndex < productDetails->size())
         {
@@ -416,7 +421,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetProductDescription()
     {
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr && m_productInfoIndex >= 0 && m_productInfoIndex < productDetails->size())
         {
@@ -429,7 +435,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetProductPrice()
     {
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr && m_productInfoIndex >= 0 && m_productInfoIndex < productDetails->size())
         {
@@ -442,7 +449,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetProductCurrencyCode()
     {
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr && m_productInfoIndex >= 0 && m_productInfoIndex < productDetails->size())
         {
@@ -455,7 +463,8 @@ namespace InAppPurchases
     AZ::u64 SystemComponent::GetProductPriceMicro()
     {
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (productDetails != nullptr && m_productInfoIndex >= 0 && m_productInfoIndex < productDetails->size())
         {
@@ -468,7 +477,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetPurchasedProductId()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
@@ -481,7 +491,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetOrderId()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
@@ -494,7 +505,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetDeveloperPayload()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
@@ -507,7 +519,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetPurchaseTime()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         AZStd::string date;
 
@@ -528,7 +541,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetPurchaseSignature()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsAndroid* purchasedProductsAndroid = azrtti_cast<const PurchasedProductDetailsAndroid*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -544,7 +558,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetPackageName()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsAndroid* purchasedProductsAndroid = azrtti_cast<const PurchasedProductDetailsAndroid*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -560,7 +575,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetPurchaseToken()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsAndroid* purchasedProductsAndroid = azrtti_cast<const PurchasedProductDetailsAndroid*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -576,7 +592,8 @@ namespace InAppPurchases
     bool SystemComponent::IsAutoRenewing()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsAndroid* purchasedProductsAndroid = azrtti_cast<const PurchasedProductDetailsAndroid*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -592,7 +609,8 @@ namespace InAppPurchases
     AZStd::string SystemComponent::GetRestoredOrderId()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsApple* purchasedProductsApple = azrtti_cast<const PurchasedProductDetailsApple*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -608,7 +626,8 @@ namespace InAppPurchases
     AZ::u64 SystemComponent::GetSubscriptionExpirationTime()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsApple* purchasedProductsApple = azrtti_cast<const PurchasedProductDetailsApple*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -624,7 +643,8 @@ namespace InAppPurchases
     AZ::u64 SystemComponent::GetRestoredPurchaseTime()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsApple* purchasedProductsApple = azrtti_cast<const PurchasedProductDetailsApple*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -640,7 +660,8 @@ namespace InAppPurchases
     bool SystemComponent::HasDownloads()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
         if (purchasedProductDetails != nullptr && m_purchasedProductInfoIndex >= 0 && m_purchasedProductInfoIndex < purchasedProductDetails->size())
         {
             const PurchasedProductDetailsApple* purchasedProductsApple = azrtti_cast<const PurchasedProductDetailsApple*>(purchasedProductDetails->at(m_purchasedProductInfoIndex).get());
@@ -656,10 +677,12 @@ namespace InAppPurchases
     bool SystemComponent::IsProductOwned()
     {
         const AZStd::vector<AZStd::unique_ptr<PurchasedProductDetails const> >* purchasedProductDetails = nullptr;
-        EBUS_EVENT_RESULT(purchasedProductDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedPurchasedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            purchasedProductDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedPurchasedProductInfo);
 
         const AZStd::vector<AZStd::unique_ptr<ProductDetails const> >* productDetails = nullptr;
-        EBUS_EVENT_RESULT(productDetails, InAppPurchases::InAppPurchasesRequestBus, GetCachedProductInfo);
+        InAppPurchases::InAppPurchasesRequestBus::BroadcastResult(
+            productDetails, &InAppPurchases::InAppPurchasesRequestBus::Events::GetCachedProductInfo);
 
         if (purchasedProductDetails != nullptr && productDetails != nullptr)
         {

Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp

@@ -103,17 +103,17 @@ namespace MessagePopup
         if (actionName == "OnButton1")
         {
             MessagePopup::MessagePopupRequestBus::Broadcast(&MessagePopup::MessagePopupRequestBus::Events::HidePopup, popupId, 0);
-            EBUS_EVENT(MessagePopupNotificationsBus, OnHide, popupId, 0);
+            MessagePopupNotificationsBus::Broadcast(&MessagePopupNotificationsBus::Events::OnHide, popupId, 0);
         }
         else if (actionName == "OnButton2")
         {
             MessagePopup::MessagePopupRequestBus::Broadcast(&MessagePopup::MessagePopupRequestBus::Events::HidePopup, popupId, 1);
-            EBUS_EVENT(MessagePopupNotificationsBus, OnHide, popupId, 1);
+            MessagePopupNotificationsBus::Broadcast(&MessagePopupNotificationsBus::Events::OnHide, popupId, 1);
         }
         else if (actionName == "OnButton3")
         {
             MessagePopup::MessagePopupRequestBus::Broadcast(&MessagePopup::MessagePopupRequestBus::Events::HidePopup, popupId, 2);
-            EBUS_EVENT(MessagePopupNotificationsBus, OnHide, popupId, 2);
+            MessagePopupNotificationsBus::Broadcast(&MessagePopupNotificationsBus::Events::OnHide, popupId, 2);
         }
     }
 
@@ -148,20 +148,20 @@ namespace MessagePopup
         {
             // Get the canvasID to send to the MessagePopupManager
             LyShine::CanvasId canvasId = 0;
-            EBUS_EVENT_ID_RESULT(canvasId, canvasEntityId, UiCanvasBus, GetCanvasId);
+            UiCanvasBus::EventResult(canvasId, canvasEntityId, &UiCanvasBus::Events::GetCanvasId);
 
             *_popupClientID = (void*)(AZ::u64)canvasId;
 
             // Enable the popup
             AZ::Entity* instructionsTextElement = nullptr;
-            EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetEnabled, true);
-            EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetKeepLoadedOnLevelUnload, true);
+            UiCanvasBus::Event(canvasEntityId, &UiCanvasBus::Events::SetEnabled, true);
+            UiCanvasBus::Event(canvasEntityId, &UiCanvasBus::Events::SetKeepLoadedOnLevelUnload, true);
 
             // Set the text
-            EBUS_EVENT_ID_RESULT(instructionsTextElement, canvasEntityId, UiCanvasBus, FindElementByName, "Text");
+            UiCanvasBus::EventResult(instructionsTextElement, canvasEntityId, &UiCanvasBus::Events::FindElementByName, "Text");
             if (instructionsTextElement != nullptr && instructionsTextElement->GetId().IsValid())
             {
-                EBUS_EVENT_ID(instructionsTextElement->GetId(), UiTextBus, SetText, _message.c_str());
+                UiTextBus::Event(instructionsTextElement->GetId(), &UiTextBus::Events::SetText, _message.c_str());
             }
 
             // Set whether navigation is supported, and show the cursor if so
@@ -195,7 +195,7 @@ namespace MessagePopup
             }
 
             // Disable the popup
-            EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetEnabled, false);
+            UiCanvasBus::Event(canvasEntityId, &UiCanvasBus::Events::SetEnabled, false);
 
             AZ::Interface<ILyShine>::Get()->ReleaseCanvas(canvasEntityId, false);
 

Gems/Metastream/Code/Source/MetastreamGem.cpp

@@ -357,12 +357,12 @@ namespace Metastream
 
     void Metastream::MetastreamGem::StartHTTPServerCmd(IConsoleCmdArgs* /*args*/)
     {
-        EBUS_EVENT(Metastream::MetastreamRequestBus, StartHTTPServer);
+        Metastream::MetastreamRequestBus::Broadcast(&Metastream::MetastreamRequestBus::Events::StartHTTPServer);
     }
 
     void Metastream::MetastreamGem::StopHTTPServerCmd(IConsoleCmdArgs* /*args*/)
     {
-        EBUS_EVENT(Metastream::MetastreamRequestBus, StopHTTPServer);
+        Metastream::MetastreamRequestBus::Broadcast(&Metastream::MetastreamRequestBus::Events::StopHTTPServer);
     }
 
     // Unit test methods to get at m_cache and status

Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp

@@ -36,10 +36,11 @@ namespace PhysX
             picker->GetEditButton()->setVisible(true);
             picker->GetEditButton()->setToolTip("Edit Collision Groups");
 
-            connect(picker, &widget_t::valueChanged, this, [picker]()
-                {
-                    EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
-                });
+            connect(picker->GetComboBox(), &QComboBox::currentTextChanged, this, [picker]()
+            {
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
+            });
 
             connect(picker->GetEditButton(), &QToolButton::clicked, this, &CollisionGroupWidget::OnEditButtonClicked);
 

Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp

@@ -34,7 +34,8 @@ namespace PhysX
 
             connect(picker->GetComboBox(), &QComboBox::currentTextChanged, this, [picker]()
             {
-                EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, picker);
+                AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+                    &AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
             });
 
             connect(picker->GetEditButton(), &QToolButton::clicked, this, &CollisionLayerWidget::OnEditButtonClicked);

Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp

@@ -129,7 +129,7 @@ namespace PhysX
 
             group->SetSceneGraph(&scene.GetGraph());
 
-            EBUS_EVENT(AZ::SceneAPI::Events::ManifestMetaInfoBus, InitializeObject, scene, *group);
+            AZ::SceneAPI::Events::ManifestMetaInfoBus::Broadcast(&AZ::SceneAPI::Events::ManifestMetaInfoBus::Events::InitializeObject, scene, *group);
             scene.GetManifest().AddEntry(AZStd::move(group));
 
             return AZ::SceneAPI::Events::ProcessingResult::Success;

Gems/RemoteTools/Code/Source/RemoteToolsSystemComponent.cpp

@@ -316,7 +316,7 @@ namespace RemoteTools
         const AzFramework::RemoteToolsEndpointInfo& target, const AzFramework::RemoteToolsMessage& msg)
     {
         AZ::SerializeContext* serializeContext;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
 
         // Messages targeted at our own application just transfer right over to the inbox.
         if (target.IsSelf())
@@ -461,7 +461,7 @@ namespace RemoteTools
         if (m_entryRegistry[key].m_tmpInboundBufferPos == totalBufferSize)
         {
             AZ::SerializeContext* serializeContext;
-            EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
 
             // Deserialize the complete buffer
             AZ::IO::MemoryStream msgBuffer(m_entryRegistry[key].m_tmpInboundBuffer.data(), totalBufferSize, totalBufferSize);

Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp

@@ -51,7 +51,7 @@ namespace ScriptedEntityTweener
                 bool inGame = wparam == 1;
                 if (!inGame)
                 {
-                    EBUS_EVENT(ScriptedEntityTweenerBus, Reset);
+                    ScriptedEntityTweenerBus::Broadcast(&ScriptedEntityTweenerBus::Events::Reset);
                 }
             } break;
             default:

Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp

@@ -207,7 +207,7 @@ namespace ScriptedEntityTweener
         m_virtualPropertyTypeId = AZ::Uuid::CreateNull();
 
         AZ::BehaviorContext* behaviorContext = nullptr;
-        EBUS_EVENT_RESULT(behaviorContext, AZ::ComponentApplicationBus, GetBehaviorContext);
+        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
         if (!behaviorContext)
         {
             AZ_Error("ScriptedEntityTweenerSubtask", false, "ScriptedEntityTweenerSubtask::CacheVirtualProperty - failed to get behavior context for caching [%s]", animParamData.m_virtualPropertyName.c_str());

Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp

@@ -81,7 +81,7 @@ namespace Camera
     void RotateCameraLookAt::OnEventUpdating(const AZStd::any& value)
     {
         float frameTime = 0.0f;
-        EBUS_EVENT_RESULT(frameTime, AZ::TickRequestBus, GetTickDeltaTime);
+        AZ::TickRequestBus::BroadcastResult(frameTime, &AZ::TickRequestBus::Events::GetTickDeltaTime);
 
         float floatValue = 0.0f;
         AZ_Warning("RotateCameraLookAt", AZStd::any_numeric_cast<float>(&value, floatValue), "Received bad value, expected type numerically convertable to float, got type %s", GetNameFromUuid(value.type()));

Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp

@@ -79,7 +79,8 @@ namespace StartingPointCamera
             {
                 typeIds.emplace_back(descriptor->GetUuid());
             }
-            EBUS_EVENT(AzFramework::MetricsPlainTextNameRegistrationBus, RegisterForNameSending, typeIds);
+            AzFramework::MetricsPlainTextNameRegistrationBus::Broadcast(
+                &AzFramework::MetricsPlainTextNameRegistrationBus::Events::RegisterForNameSending, typeIds);
         }
     };
 }

Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp

@@ -58,7 +58,8 @@ namespace StartingPointMovement
             {
                 typeIds.emplace_back(descriptor->GetUuid());
             }
-            EBUS_EVENT(AzFramework::MetricsPlainTextNameRegistrationBus, RegisterForNameSending, typeIds);
+            AzFramework::MetricsPlainTextNameRegistrationBus::Broadcast(
+                &AzFramework::MetricsPlainTextNameRegistrationBus::Events::RegisterForNameSending, typeIds);
         }
     };
 }

Gems/VideoPlaybackFramework/Code/Source/VideoPlaybackFrameworkSystemComponent.cpp

@@ -137,11 +137,15 @@ namespace VideoPlaybackFramework
     {
         VideoPlaybackFrameworkRequestBus::Handler::BusConnect();
 
-        EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, EnableCatalogForAsset, azrtti_typeid<VideoPlaybackAsset>());
-        EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, AddExtension, "mp4");
-        EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, AddExtension, "mkv");
-        EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, AddExtension, "webm");
-        EBUS_EVENT(AZ::Data::AssetCatalogRequestBus, AddExtension, "mov");
+        AZ::Data::AssetCatalogRequestBus::Broadcast(
+            [](AZ::Data::AssetCatalogRequests* handler)
+            {
+                handler->EnableCatalogForAsset(azrtti_typeid<VideoPlaybackAsset>());
+                handler->AddExtension("mp4");
+                handler->AddExtension("mkv");
+                handler->AddExtension("webm");
+                handler->AddExtension("mov");
+            });
     }
 
     void VideoPlaybackFrameworkSystemComponent::Deactivate()