replace EBUS_EVENT_RESULT

Signed-off-by: greerdv <[email protected]>

Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp

@@ -52,7 +52,7 @@ ReflectedPropertyControl::ReflectedPropertyControl(QWidget *parent /*= nullptr*/
     , m_initialized(false)
     , m_isTwoColumnSection(false)
 {
-    EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(m_serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(m_serializeContext, "Serialization context not available");
     qRegisterMetaType<IVariable*>("IVariablePtr");
 

Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp

@@ -473,7 +473,8 @@ void ReflectedVarMotionAdapter::SetVariable(IVariable *pVariable)
     m_reflectedVar->m_assetId = AZ::Data::AssetId(guid, subId);
 
     // Lookup Filename by assetId and get the filename part of the description
-    EBUS_EVENT_RESULT(m_reflectedVar->m_motion, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_reflectedVar->m_assetId);
+    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+        m_reflectedVar->m_motion, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, m_reflectedVar->m_assetId);
 }
 
 void ReflectedVarMotionAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
@@ -484,7 +485,8 @@ void ReflectedVarMotionAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
     m_reflectedVar->m_assetId = AZ::Data::AssetId(guid, subId);
 
     // Lookup Filename by assetId and get the filename part of the description
-    EBUS_EVENT_RESULT(m_reflectedVar->m_motion, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, m_reflectedVar->m_assetId);
+    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+        m_reflectedVar->m_motion, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, m_reflectedVar->m_assetId);
 }
 
 void ReflectedVarMotionAdapter::SyncIVarToReflectedVar(IVariable *pVariable)

Code/Editor/Core/QtEditorApplication.cpp

@@ -265,7 +265,7 @@ namespace Editor
     void EditorQtApplication::LoadSettings()
     {
         AZ::SerializeContext* context;
-        EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(context, "No serialize context");
         char resolvedPath[AZ_MAX_PATH_LEN];
         AZ::IO::FileIOBase::GetInstance()->ResolvePath("@user@/EditorUserSettings.xml", resolvedPath, AZ_MAX_PATH_LEN);
@@ -291,7 +291,7 @@ namespace Editor
         if (m_activatedLocalUserSettings)
         {
             AZ::SerializeContext* context;
-            EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
             AZ_Assert(context, "No serialize context");
 
             char resolvedPath[AZ_MAX_PATH_LEN];

Code/Editor/CryEdit.cpp

@@ -1168,7 +1168,8 @@ void CCryEditApp::InitLevel(const CEditCommandLineInfo& cmdInfo)
         const bool runningPythonScript = cmdInfo.m_bRunPythonScript || cmdInfo.m_bRunPythonTestScript;
 
         AZ::EBusLogicalResult<bool, AZStd::logical_or<bool> > skipStartupUIProcess(false);
-        EBUS_EVENT_RESULT(skipStartupUIProcess, AzToolsFramework::EditorEvents::Bus, SkipEditorStartupUI);
+        AzToolsFramework::EditorEvents::Bus::BroadcastResult(
+            skipStartupUIProcess, &AzToolsFramework::EditorEvents::Bus::Events::SkipEditorStartupUI);
 
         if (!skipStartupUIProcess.value)
         {

Code/Editor/CryEditDoc.cpp

@@ -881,7 +881,7 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
         // Don't allow saving in AI/Physics mode.
         // Prompt the user to exit Simulation Mode (aka AI/Phyics mode) before saving.
         QWidget* mainWindow = nullptr;
-        EBUS_EVENT_RESULT(mainWindow, AzToolsFramework::EditorRequests::Bus, GetMainWindow);
+        AzToolsFramework::EditorRequests::Bus::BroadcastResult(mainWindow, &AzToolsFramework::EditorRequests::Bus::Events::GetMainWindow);
 
         QMessageBox msgBox(mainWindow);
         msgBox.setText(tr("You must exit AI/Physics mode before saving."));

Code/Editor/EditorPreferencesDialog.cpp

@@ -51,7 +51,7 @@ EditorPreferencesDialog::EditorPreferencesDialog(QWidget* pParent)
     connect(ui->filter, &FilteredSearchWidget::TextFilterChanged, this, &EditorPreferencesDialog::SetFilter);
 
     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");
 
     static bool bAlreadyRegistered = false;

Code/Editor/EditorPreferencesTreeWidgetItem.cpp

@@ -46,7 +46,7 @@ void EditorPreferencesTreeWidgetItem::Setup(IPreferencesPage* page)
     setData(0, Qt::DisplayRole, m_preferencesPage->GetTitle());
 
     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");
 
     // Grab all property names on the page so we can filter by property text by recursing through the hierarchy

Code/Editor/GameEngine.cpp

@@ -787,7 +787,7 @@ void CGameEngine::Update()
     }
 
     AZ::ComponentApplication* componentApplication = nullptr;
-    EBUS_EVENT_RESULT(componentApplication, AZ::ComponentApplicationBus, GetApplication);
+    AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationBus::Events::GetApplication);
 
     if (m_bInGameMode)
     {

Code/Editor/GameExporter.cpp

@@ -291,7 +291,11 @@ void CGameExporter::ExportLevelData(const QString& path, bool /*bExportMission*/
     AZStd::vector<char> entitySaveBuffer;
     AZ::IO::ByteContainerStream<AZStd::vector<char> > entitySaveStream(&entitySaveBuffer);
     bool savedEntities = false;
-    EBUS_EVENT_RESULT(savedEntities, AzToolsFramework::EditorEntityContextRequestBus, SaveToStreamForGame, entitySaveStream, AZ::DataStream::ST_BINARY);
+    AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
+        savedEntities,
+        &AzToolsFramework::EditorEntityContextRequestBus::Events::SaveToStreamForGame,
+        entitySaveStream,
+        AZ::DataStream::ST_BINARY);
     if (savedEntities)
     {
         QString entitiesFile;

Code/Editor/MainWindow.cpp

@@ -359,7 +359,7 @@ MainWindow::MainWindow(QWidget* parent)
 void MainWindow::SystemTick()
 {
     AZ::ComponentApplication* componentApplication = nullptr;
-    EBUS_EVENT_RESULT(componentApplication, AZ::ComponentApplicationBus, GetApplication);
+    AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationBus::Events::GetApplication);
     if (componentApplication)
     {
         componentApplication->TickSystem();

Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp

@@ -36,7 +36,7 @@ namespace ComponentEntityEditorPluginInternal
         GetIEditor()->GetClassFactory()->RegisterClass(new CTemplateObjectClassDesc<CComponentEntityObject>("ComponentEntity", "", "", OBJTYPE_AZENTITY, 201, "*.entity"));
 
         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");
 
         if (serializeContext)

Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp

@@ -194,7 +194,7 @@ void CComponentEntityObject::SetName(const QString& name)
         EditorActionScope nameChange(m_nameReentryGuard);
 
         AZ::Entity* entity = nullptr;
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityId);
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, m_entityId);
 
         if (entity)
         {

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -430,7 +430,8 @@ DisplayContext* SandboxIntegrationManager::GetDC()
 void SandboxIntegrationManager::OnBeginUndo([[maybe_unused]] const char* label)
 {
     AzToolsFramework::UndoSystem::URSequencePoint* currentBatch = nullptr;
-    EBUS_EVENT_RESULT(currentBatch, AzToolsFramework::ToolsApplicationRequests::Bus, GetCurrentUndoBatch);
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        currentBatch, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetCurrentUndoBatch);
 
     AZ_Assert(currentBatch, "No undo batch is active.");
 
@@ -993,7 +994,8 @@ void SandboxIntegrationManager::SetupSliceContextMenu_Modify(QMenu* menu, const
 
     // Gather the set of relevant entities from the selected entities and all descendants
     AzToolsFramework::EntityIdSet relevantEntitiesSet;
-    EBUS_EVENT_RESULT(relevantEntitiesSet, AzToolsFramework::ToolsApplicationRequests::Bus, GatherEntitiesAndAllDescendents, selectedEntities);
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        relevantEntitiesSet, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GatherEntitiesAndAllDescendents, selectedEntities);
     AzToolsFramework::EntityIdList relevantEntities;
     relevantEntities.reserve(relevantEntitiesSet.size());
     for (AZ::EntityId& id : relevantEntitiesSet)
@@ -1763,7 +1765,7 @@ void SandboxIntegrationManager::ContextMenu_PushEntitiesToSlice(AzToolsFramework
     (void)affectEntireHierarchy;
 
     AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(serializeContext, "No serialize context");
 
     AzToolsFramework::SliceUtilities::PushEntitiesModal(GetMainWindow(), entities, serializeContext);
@@ -1843,7 +1845,7 @@ AZStd::string SandboxIntegrationManager::GetComponentIconPath(const AZ::Uuid& co
     AZStd::string iconPath;
 
     AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(serializeContext, "No serialize context");
 
     auto classData = serializeContext->FindClassData(componentType);

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp

@@ -135,7 +135,7 @@ AssetCatalogModel::AssetCatalogModel(QObject* parent)
     }
 
     AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(serializeContext, "Failed to acquire application serialize context.");
 
     serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool
@@ -214,7 +214,8 @@ AZ::Data::AssetType AssetCatalogModel::GetAssetType(const QString &filename) con
         AZStd::string azFilename = filename.toStdString().c_str();
         EBUS_EVENT(AzFramework::ApplicationRequests::Bus, MakePathAssetRootRelative, azFilename);
         AZ::Data::AssetId assetId;
-        EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, azFilename.c_str(), AZ::Data::s_invalidAssetType, false);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, azFilename.c_str(), AZ::Data::s_invalidAssetType, false);
 
         for (const AZ::Uuid& type : pair.second)
         {
@@ -507,7 +508,7 @@ void AssetCatalogModel::StopProcessingAssets()
 void AssetCatalogModel::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
 {
     AZ::Data::AssetInfo assetInfo;
-    EBUS_EVENT_RESULT(assetInfo, AZ::Data::AssetCatalogRequestBus, GetAssetInfoById, assetId);
+    AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
 
     // note that this will get called twice, once with the real assetId and once with legacy assetId.
     // we only want to add the real asset to the list, in which the assetId passed in is equal to the final assetId returned

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp

@@ -988,7 +988,8 @@ bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused
         if (createdNewEntity && &pair == &componentAssetPairs.front())
         {
             AZStd::string assetPath;
-            EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetId);
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                assetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, assetId);
             if (!assetPath.empty())
             {
                 AZStd::string entityName;
@@ -1068,7 +1069,8 @@ bool OutlinerListModel::CanReparentEntities(const AZ::EntityId& newParentId, con
         }
 
         bool isEntityEditable = true;
-        EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entityId);
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+            isEntityEditable, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsEntityEditable, entityId);
         if (!isEntityEditable)
         {
             return false;

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp

@@ -248,7 +248,7 @@ OutlinerWidget::OutlinerWidget(QWidget* pParent, Qt::WindowFlags flags)
     connect(m_gui->m_searchWidget, &AzQtComponents::FilteredSearchWidget::TypeFilterChanged, this, &OutlinerWidget::OnFilterChanged);
 
     AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
 
     if (serializeContext)
     {
@@ -533,7 +533,8 @@ void OutlinerWidget::contextMenuEvent(QContextMenuEvent* event)
     AZ_PROFILE_FUNCTION(Editor);
 
     bool isDocumentOpen = false;
-    EBUS_EVENT_RESULT(isDocumentOpen, AzToolsFramework::EditorRequests::Bus, IsLevelDocumentOpen);
+    AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+        isDocumentOpen, &AzToolsFramework::EditorRequests::Bus::Events::IsLevelDocumentOpen);
     if (!isDocumentOpen)
     {
         return;
@@ -672,7 +673,8 @@ QString OutlinerWidget::FindCommonSliceAssetName(const AZStd::vector<AZ::EntityI
 AzFramework::EntityContextId OutlinerWidget::GetPickModeEntityContextId()
 {
     AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
-    EBUS_EVENT_RESULT(editorEntityContextId, AzToolsFramework::EditorRequests::Bus, GetEntityContextId);
+    AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+        editorEntityContextId, &AzToolsFramework::EditorRequests::Bus::Events::GetEntityContextId);
 
     return editorEntityContextId;
 }
@@ -680,7 +682,8 @@ AzFramework::EntityContextId OutlinerWidget::GetPickModeEntityContextId()
 void OutlinerWidget::PrepareSelection()
 {
     m_selectedEntityIds.clear();
-    EBUS_EVENT_RESULT(m_selectedEntityIds, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
+    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+        m_selectedEntityIds, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
 }
 
 void OutlinerWidget::DoCreateEntity()
@@ -705,7 +708,8 @@ void OutlinerWidget::DoCreateEntityWithParent(const AZ::EntityId& parentId)
     PrepareSelection();
 
     AZ::EntityId entityId;
-    EBUS_EVENT_RESULT(entityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntity, parentId);
+    AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+        entityId, &AzToolsFramework::EditorRequests::Bus::Events::CreateNewEntity, parentId);
 }
 
 void OutlinerWidget::DoShowSlice()

Code/Editor/Plugins/EditorAssetImporter/AssetImporterWindow.cpp

@@ -142,7 +142,7 @@ void AssetImporterWindow::closeEvent(QCloseEvent* ev)
 void AssetImporterWindow::Init()
 {
     // Serialization and reflection framework setup
-    EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(m_serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(m_serializeContext, "Serialization context not available");
 
     // Load the style sheets
@@ -433,8 +433,12 @@ void AssetImporterWindow::OnSceneResetRequested()
             m_assetImporterDocument->GetScene()->GetManifest().Clear();
 
             AZ::SceneAPI::Events::ProcessingResultCombiner result;
-            EBUS_EVENT_RESULT(result, AssetImportRequestBus, UpdateManifest, *m_assetImporterDocument->GetScene(),
-                AssetImportRequest::ManifestAction::ConstructDefault, AssetImportRequest::RequestingApplication::Editor);
+            AssetImportRequestBus::BroadcastResult(
+                result,
+                &AssetImportRequestBus::Events::UpdateManifest,
+                *m_assetImporterDocument->GetScene(),
+                AssetImportRequest::ManifestAction::ConstructDefault,
+                AssetImportRequest::RequestingApplication::Editor);
 
             // Specifically using success, because ignore would be an invalid case.
             // Whenever we do construct default, it should always be done

Code/Editor/TrackView/AssetBlendKeyUIControls.cpp

@@ -111,7 +111,8 @@ void CAssetBlendKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle&
 
                     // Lookup Filename by assetId and get the filename part of the description
                     AZStd::string assetPath;
-                    EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetBlendKey.m_assetId);
+                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                        assetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, assetBlendKey.m_assetId);
 
                     assetBlendKey.m_description = "";
                     if (!assetPath.empty())

Code/Editor/TrackView/TrackViewNodes.cpp

@@ -402,7 +402,7 @@ CTrackViewNodesCtrl::CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog*
     ///////////////////////////////////////////////////////////////
     // Populate m_componentTypeToIconMap with all component icons
     AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(serializeContext, "Failed to acquire serialize context.");
 
     serializeContext->EnumerateDerived<AZ::Component>([this](const AZ::SerializeContext::ClassData* classData, const AZ::Uuid&) -> bool

Code/Editor/TrackView/TrackViewSequence.cpp

@@ -1569,7 +1569,7 @@ CTrackViewSequence* CTrackViewSequence::LookUpSequenceByEntityId(const AZ::Entit
     CTrackViewSequence* sequence = nullptr;
 
     IEditor* editor = nullptr;
-    EBUS_EVENT_RESULT(editor, AzToolsFramework::EditorRequests::Bus, GetEditor);
+    AzToolsFramework::EditorRequests::Bus::BroadcastResult(editor, &AzToolsFramework::EditorRequests::Bus::Events::GetEditor);
     if (editor)
     {
         ITrackViewSequenceManager* sequenceManager = editor->GetSequenceManager();

Code/Editor/TrackView/TrackViewSequenceManager.cpp

@@ -151,12 +151,13 @@ void CTrackViewSequenceManager::CreateSequence(QString name, [[maybe_unused]] Se
     AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
 
     AZ::EntityId newEntityId;   // initialized with InvalidEntityId
-    EBUS_EVENT_RESULT(newEntityId, AzToolsFramework::EditorRequests::Bus, CreateNewEntity, AZ::EntityId());
+    AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+        newEntityId, &AzToolsFramework::EditorRequests::Bus::Events::CreateNewEntity, AZ::EntityId());
     if (newEntityId.IsValid())
     {
         // set the entity name
         AZ::Entity* entity = nullptr;
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, newEntityId);
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, newEntityId);
         if (entity)
         {
             entity->SetName(static_cast<const char*>(name.toUtf8().data()));

Code/Editor/Util/PathUtil.cpp

@@ -307,7 +307,11 @@ namespace Path
         bool relPathFound = false;
         AZStd::string relativePath;
         AZStd::string fullAssetPath(fullPath.toUtf8().data());
-        EBUS_EVENT_RESULT(relPathFound, AzToolsFramework::AssetSystemRequestBus, GetRelativeProductPathFromFullSourceOrProductPath, fullAssetPath, relativePath);
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            relPathFound,
+            &AzToolsFramework::AssetSystemRequestBus::Events::GetRelativeProductPathFromFullSourceOrProductPath,
+            fullAssetPath,
+            relativePath);
 
         if (relPathFound)
         {

Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h

@@ -629,7 +629,9 @@ namespace AzToolsFramework
             {
                 AZ::EBusConnectionPolicy<Bus>::Connect(busPtr, context, handler, connectLock, id);
                 EntityIdList selectedEntities;
-                EBUS_EVENT_RESULT(selectedEntities, ToolsApplicationRequests::Bus, GetSelectedEntities);
+                ToolsApplicationRequests::Bus::BroadcastResult(
+                    selectedEntities,
+                    &ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
                 if (AZStd::find(selectedEntities.begin(), selectedEntities.end(), id) != selectedEntities.end())
                 {
                     handler->OnSelected();

Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp

@@ -127,8 +127,8 @@ namespace AzToolsFramework
 
             UndoSystem::UndoStack* undoStack = nullptr;
             PreemptiveUndoCache* preemptiveUndoCache = nullptr;
-            EBUS_EVENT_RESULT(undoStack, ToolsApplicationRequests::Bus, GetUndoStack);
-            EBUS_EVENT_RESULT(preemptiveUndoCache, ToolsApplicationRequests::Bus, GetUndoCache);
+            ToolsApplicationRequests::Bus::BroadcastResult(undoStack, &ToolsApplicationRequests::Bus::Events::GetUndoStack);
+            ToolsApplicationRequests::Bus::BroadcastResult(preemptiveUndoCache, &ToolsApplicationRequests::Bus::Events::GetUndoCache);
             AZ_Assert(undoStack, "Failed to retrieve undo stack.");
             AZ_Assert(preemptiveUndoCache, "Failed to retrieve preemptive undo cache.");
             if (undoStack && preemptiveUndoCache)
@@ -138,7 +138,7 @@ namespace AzToolsFramework
                 // Commands always execute themselves first and then their children (when going forwards)
                 // and do the opposite when going backwards.
                 AzToolsFramework::EntityIdList selection;
-                EBUS_EVENT_RESULT(selection, ToolsApplicationRequests::Bus, GetSelectedEntities);
+                ToolsApplicationRequests::Bus::BroadcastResult(selection, &ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
                 AzToolsFramework::SelectionCommand* selCommand = aznew AzToolsFramework::SelectionCommand(selection, "Delete Entities");
 
                 // We insert a "deselect all" command before we delete the entities. This ensures the delete operations aren't changing
@@ -155,7 +155,7 @@ namespace AzToolsFramework
                     for (const auto& entityId : entityIds)
                     {
                         AZ::Entity* entity = nullptr;
-                        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, entityId);
+                        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
 
                         if (entity)
                         {
@@ -523,7 +523,7 @@ namespace AzToolsFramework
     void ToolsApplication::PreExportEntity(AZ::Entity& source, AZ::Entity& target)
     {
         AZ::SerializeContext* serializeContext = nullptr;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(serializeContext, "No serialization context found");
 
         const AZ::Entity::ComponentArrayType& editorComponents = source.GetComponents();
@@ -1651,7 +1651,7 @@ namespace AzToolsFramework
             for (AZ::EntityId entityId : m_dirtyEntities)
             {
                 AZ::Entity* entity = nullptr;
-                EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, entityId);
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
 
                 if (entity)
                 {

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp

@@ -711,7 +711,7 @@ namespace AzToolsFramework
 
         // deserialize the manifest
         AZ::SerializeContext* serializeContext = nullptr;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(serializeContext, "Unable to retrieve serialize context.");
         if (nullptr == serializeContext->FindClassData(AZ::AzTypeInfo<AzFramework::AssetBundleManifest>::Uuid()))
         {

Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp

@@ -58,7 +58,8 @@ namespace AzToolsFramework
 
         m_entityID = pSourceEntity->GetId();
         EBUS_EVENT_ID_RESULT(m_entityContextId, m_entityID, AzFramework::EntityIdContextQueryBus, GetOwningContextId);
-        EBUS_EVENT_RESULT(m_isSelected, AzToolsFramework::ToolsApplicationRequests::Bus, IsSelected, m_entityID);
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(m_isSelected,
+            &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsSelected, m_entityID);
 
         AZ::SliceComponent::EntityRestoreInfo& sliceRestoreInfo = captureUndo ? m_undoSliceRestoreInfo : m_redoSliceRestoreInfo;
         sliceRestoreInfo = AZ::SliceComponent::EntityRestoreInfo();
@@ -67,7 +68,7 @@ namespace AzToolsFramework
         AZ_Assert(PreemptiveUndoCache::Get(), "You need a pre-emptive undo cache instance to exist for this to work.");
         AZ_Assert((!captureUndo) || (m_undoState.empty()), "You can't capture undo more than once");
         AZ::SerializeContext* sc = nullptr;
-        EBUS_EVENT_RESULT(sc, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(sc, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(sc, "Serialization context not found!");
 
         m_entityState = pSourceEntity->GetState();
@@ -120,7 +121,7 @@ namespace AzToolsFramework
         AZ_Assert(bufferSizeBytes, "Undo data is empty.");
 
         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 found!");
         AZ::IO::MemoryStream memoryStream(reinterpret_cast<const char*>(buffer), bufferSizeBytes);
 
@@ -134,11 +135,11 @@ namespace AzToolsFramework
 
         // We have to delete the entity. If it's currently selected, make sure we re-select after re-creating.
         AzToolsFramework::EntityIdList selectedEntities;
-        EBUS_EVENT_RESULT(selectedEntities, ToolsApplicationRequests::Bus, GetSelectedEntities);
+        ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
 
         AZ::Entity* entity = nullptr;
 
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityID);
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, m_entityID);
         EntityStateCommandNotificationBus::Event(m_entityID, &EntityStateCommandNotificationBus::Events::PreRestore);
 
         bool isSliceMetadataEntity = false;

Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp

@@ -91,7 +91,7 @@ namespace AzToolsFramework
         // capture it
 
         AZ::Entity* pEnt = nullptr;
-        EBUS_EVENT_RESULT(pEnt, AZ::ComponentApplicationBus, FindEntity, entityId);
+        AZ::ComponentApplicationBus::BroadcastResult(pEnt, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
         if (!pEnt)
         {
             AZ_Warning("Undo", false, "Preemptive Undo Cache was told to update the cache for a particular entity, but that entity is not available in FindEntity");
@@ -104,7 +104,7 @@ namespace AzToolsFramework
         AZ::IO::ByteContainerStream<CacheLineType> ms(&newData);
 
         AZ::SerializeContext* sc = nullptr;
-        EBUS_EVENT_RESULT(sc, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(sc, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(sc, "Serialization context not found!");
 
         // capture state.
@@ -147,7 +147,7 @@ namespace AzToolsFramework
         {
             // display a useful message
             AZ::Entity* pEnt = nullptr;
-            EBUS_EVENT_RESULT(pEnt, AZ::ComponentApplicationBus, FindEntity, entityId);
+            AZ::ComponentApplicationBus::BroadcastResult(pEnt, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
             if (!pEnt)
             {
                 AZ_Warning("Undo", false, "Undo system wasn't informed about the deletion of entity %p - make sure you call DeleteEntity, instead of directly deleting it.\n", entityId);

Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp

@@ -14,7 +14,8 @@ namespace AzToolsFramework
     SelectionCommand::SelectionCommand(const AZStd::vector<AZ::EntityId>& proposedSelection, const AZStd::string& friendlyName)
         : UndoSystem::URSequencePoint(friendlyName)
     {
-        EBUS_EVENT_RESULT(m_previousSelectionList, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(m_previousSelectionList,
+            &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
 
         m_proposedSelectionList = proposedSelection;
     }
@@ -35,7 +36,8 @@ namespace AzToolsFramework
     void SelectionCommand::Post()
     {
         UndoSystem::UndoStack* undoStack = nullptr;
-        EBUS_EVENT_RESULT(undoStack, AzToolsFramework::ToolsApplicationRequests::Bus, GetUndoStack);
+        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(undoStack,
+            &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetUndoStack);
 
         if (undoStack)
         {

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.cpp

@@ -334,7 +334,8 @@ namespace AzToolsFramework
                 AZ::Entity* entity = component->GetEntity();
 
                 bool isEntityEditable = false;
-                EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entity->GetId());
+                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isEntityEditable,
+                    &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsEntityEditable, entity->GetId());
                 if (!isEntityEditable)
                 {
                     continue;
@@ -390,7 +391,8 @@ namespace AzToolsFramework
                 AZ::Entity* entity = component->GetEntity();
 
                 bool isEntityEditable = false;
-                EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entity->GetId());
+                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isEntityEditable,
+                    &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsEntityEditable, entity->GetId());
                 if (!isEntityEditable)
                 {
                     continue;
@@ -461,7 +463,8 @@ namespace AzToolsFramework
                     AZ::Entity* entity = componentToRemove->GetEntity();
 
                     bool isEntityEditable = false;
-                    EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entity->GetId());
+                    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(isEntityEditable,
+                        &AzToolsFramework::ToolsApplicationRequests::Bus::Events::IsEntityEditable, entity->GetId());
                     if (!isEntityEditable)
                     {
                         continue;

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp

@@ -583,7 +583,7 @@ namespace AzToolsFramework
         //when an editor entity is created and registered, add it to a pending list.
         //once all entities in the pending list are activated, add them to model.
         bool isEditorEntity = false;
-        EBUS_EVENT_RESULT(isEditorEntity, EditorEntityContextRequestBus, IsEditorEntity, entityId);
+        EditorEntityContextRequestBus::BroadcastResult(isEditorEntity, &EditorEntityContextRequestBus::Events::IsEditorEntity, entityId);
         if (isEditorEntity)
         {
             // As an optimization, new entities are queued.

Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp

@@ -414,7 +414,7 @@ namespace AzToolsFramework
             for (const AZ::EntityId& id : selectedAndReferencedEntities)
             {
                 AZ::Entity* entity = nullptr;
-                EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, id);
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
                 if (entity)
                 {
                     if (entities.find(id) != entities.end())
@@ -617,7 +617,7 @@ namespace AzToolsFramework
 
             if (!serializeContext)
             {
-                EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+                AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
                 AZ_Assert(serializeContext, "Failed to retrieve application serialize context.");
             }
 
@@ -940,7 +940,7 @@ namespace AzToolsFramework
                 floodQueue.pop_back();
 
                 AZ::Entity* entity = nullptr;
-                EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, id);
+                AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
 
                 if (entity)
                 {
@@ -2911,7 +2911,7 @@ namespace AzToolsFramework
                     if (usedNameEntities.find(id) == usedNameEntities.end())
                     {
                         AZ::Entity* entity = nullptr;
-                        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, id);
+                        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
                         if (entity)
                         {
                             AZStd::string entityNameFiltered = entity->GetName();

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentMimeData.cpp

@@ -101,7 +101,7 @@ namespace AzToolsFramework
     AZStd::unique_ptr<QMimeData> ComponentMimeData::Create(const ComponentDataContainer& components)
     {
         AZ::SerializeContext* context;
-        EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         if (!context)
         {
             AZ_Assert(context, "No serialize context");

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp

@@ -259,7 +259,7 @@ namespace AzToolsFramework
                 bool preferNoViewportIcon = false;
 
                 AZ::SerializeContext* serializeContext = nullptr;
-                EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+                AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
                 AZ_Assert(serializeContext, "No serialize context");
 
                 for (AZ::ComponentId componentId : componentOrderArray)

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp

@@ -233,7 +233,7 @@ namespace AzToolsFramework
 
                     // Create an EntityId instance
                     const AZ::SerializeContext* context = nullptr;
-                    EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+                    AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
                     const AZ::SerializeContext::ClassData* entityIdClassData = context->FindClassData(azrtti_typeid<AZ::EntityId>());
                     AZ_Assert(entityIdClassData && entityIdClassData->m_factory, "AZ::EntityId is missing ClassData or factory in the SerializeContext");
                     AZ::EntityId* entityId = static_cast<AZ::EntityId*>(entityIdClassData->m_factory->Create(name));
@@ -940,7 +940,8 @@ namespace AzToolsFramework
             AZStd::string scriptFilename;
             if (assetId.IsValid())
             {
-                EBUS_EVENT_RESULT(scriptFilename, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetId);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(scriptFilename,
+                    &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, assetId);
             }
             EBUS_EVENT(AzToolsFramework::EditorRequests::Bus, LaunchLuaEditor, scriptFilename.c_str());
         }

Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp

@@ -18,56 +18,56 @@ namespace LegacyFramework
     const char* appName()
     {
         const char* result = nullptr;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, GetApplicationName);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::GetApplicationName);
         return result;
     }
 
     const char* appModule()
     {
         const char* result = nullptr;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, GetApplicationModule);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::GetApplicationModule);
         return result;
     }
 
     const char* appDir()
     {
         const char* result = nullptr;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, GetApplicationDirectory);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::GetApplicationDirectory);
         return result;
     }
 
     bool RequiresGameProject()
     {
         bool result = false;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, RequiresGameProject);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::RequiresGameProject);
         return result;
     }
 
     bool IsGUIMode()
     {
         bool result = false;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, IsRunningInGUIMode);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::IsRunningInGUIMode);
         return result;
     }
 
     bool appAbortRequested()
     {
         bool result = false;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, GetAbortRequested);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::GetAbortRequested);
         return result;
     }
 
     bool isPrimary()
     {
         bool result = false;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, IsPrimary);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::IsPrimary);
         return result;
     }
 
     bool IsAppConfigWritable()
     {
         bool result = false;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, IsAppConfigWritable);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::IsAppConfigWritable);
         return result;
     }
 
@@ -75,7 +75,7 @@ namespace LegacyFramework
     AZ::SerializeContext* GetSerializeContext()
     {
         AZ::SerializeContext* serializeContext = nullptr;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(serializeContext, "No serialize context");
         return serializeContext;
     }
@@ -91,7 +91,7 @@ namespace LegacyFramework
     bool ShouldRunAssetProcessor()
     {
         bool result = false;
-        EBUS_EVENT_RESULT(result, FrameworkApplicationMessages::Bus, ShouldRunAssetProcessor);
+        FrameworkApplicationMessages::Bus::BroadcastResult(result, &FrameworkApplicationMessages::Bus::Events::ShouldRunAssetProcessor);
         return result;
     }
 }

Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp

@@ -186,7 +186,8 @@ namespace AzToolsFramework
         pApplication->setApplicationName("O3DE Editor");
 
         bool GUIMode = true;
-        EBUS_EVENT_RESULT(GUIMode, LegacyFramework::FrameworkApplicationMessages::Bus, IsRunningInGUIMode);
+        LegacyFramework::FrameworkApplicationMessages::Bus::BroadcastResult(GUIMode,
+            &LegacyFramework::FrameworkApplicationMessages::Bus::Events::IsRunningInGUIMode);
 
         // if we're not in GUI Mode why bother reigstering fonts and style sheets?
         if (GUIMode)
@@ -278,7 +279,7 @@ namespace AzToolsFramework
             m_ptrTicker->cancel();
             QApplication::processEvents();
             AZ::ComponentApplication* pApp = nullptr;
-            EBUS_EVENT_RESULT(pApp, AZ::ComponentApplicationBus, GetApplication);
+            AZ::ComponentApplicationBus::BroadcastResult(pApp, &AZ::ComponentApplicationBus::Events::GetApplication);
             if (pApp)
             {
                 pApp->Tick();
@@ -363,7 +364,7 @@ namespace AzToolsFramework
         m_bTicking = true;
         // Tick the component app.
         AZ::ComponentApplication* pApp = nullptr;
-        EBUS_EVENT_RESULT(pApp, AZ::ComponentApplicationBus, GetApplication);
+        AZ::ComponentApplicationBus::BroadcastResult(pApp, &AZ::ComponentApplicationBus::Events::GetApplication);
         if (pApp && m_ptrTicker)
         {
             AZ::SystemTickBus::ExecuteQueuedEvents();
@@ -447,7 +448,7 @@ namespace AzToolsFramework
         // start the shutdown sequence:
         Ebus_Event_AllOkay check;
 
-        EBUS_EVENT_RESULT(check, LegacyFramework::CoreMessageBus, OnGetPermissionToShutDown);
+        LegacyFramework::CoreMessageBus::BroadcastResult(check, &LegacyFramework::CoreMessageBus::Events::OnGetPermissionToShutDown);
         if (!check.Accepted())
         {
             return;
@@ -466,7 +467,7 @@ namespace AzToolsFramework
 
         Ebus_Event_AllOkay check;
 
-        EBUS_EVENT_RESULT(check, LegacyFramework::CoreMessageBus, CheckOkayToShutDown);
+        LegacyFramework::CoreMessageBus::BroadcastResult(check, &LegacyFramework::CoreMessageBus::Events::CheckOkayToShutDown);
         if (!check.Accepted())
         {
             // the above could cause contexts to generate threaded requests that are outstanding (like a long data save).
@@ -482,7 +483,7 @@ namespace AzToolsFramework
         // pump the tickbus one last time!
        // QApplication::processEvents();
         AZ::ComponentApplication* pApp = nullptr;
-        EBUS_EVENT_RESULT(pApp, AZ::ComponentApplicationBus, GetApplication);
+        AZ::ComponentApplicationBus::BroadcastResult(pApp, &AZ::ComponentApplicationBus::Events::GetApplication);
         if (pApp)
         {
             pApp->Tick();

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp

@@ -904,7 +904,8 @@ namespace AzToolsFramework
             }
 
             bool isEntityEditable = true;
-            EBUS_EVENT_RESULT(isEntityEditable, ToolsApplicationRequests::Bus, IsEntityEditable, entityId);
+            ToolsApplicationRequests::Bus::BroadcastResult(
+                isEntityEditable, &ToolsApplicationRequests::Bus::Events::IsEntityEditable, entityId);
             if (!isEntityEditable)
             {
                 return false;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp

@@ -273,7 +273,7 @@ namespace AzToolsFramework
         connect(m_gui->m_searchWidget, &AzQtComponents::FilteredSearchWidget::TypeFilterChanged, this, &EntityOutlinerWidget::OnFilterChanged);
 
         AZ::SerializeContext* serializeContext = nullptr;
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
 
         if (serializeContext)
         {
@@ -573,7 +573,7 @@ namespace AzToolsFramework
         AZ_PROFILE_FUNCTION(Editor);
 
         bool isDocumentOpen = false;
-        EBUS_EVENT_RESULT(isDocumentOpen, EditorRequests::Bus, IsLevelDocumentOpen);
+        EditorRequests::Bus::BroadcastResult(isDocumentOpen, &EditorRequests::Bus::Events::IsLevelDocumentOpen);
         if (!isDocumentOpen)
         {
             return;
@@ -683,7 +683,7 @@ namespace AzToolsFramework
     AzFramework::EntityContextId EntityOutlinerWidget::GetPickModeEntityContextId()
     {
         AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull();
-        EBUS_EVENT_RESULT(editorEntityContextId, EditorRequests::Bus, GetEntityContextId);
+        EditorRequests::Bus::BroadcastResult(editorEntityContextId, &EditorRequests::Bus::Events::GetEntityContextId);
 
         return editorEntityContextId;
     }
@@ -691,7 +691,7 @@ namespace AzToolsFramework
     void EntityOutlinerWidget::PrepareSelection()
     {
         m_selectedEntityIds.clear();
-        EBUS_EVENT_RESULT(m_selectedEntityIds, ToolsApplicationRequests::Bus, GetSelectedEntities);
+        ToolsApplicationRequests::Bus::BroadcastResult(m_selectedEntityIds, &ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
     }
 
     void EntityOutlinerWidget::DoCreateEntity()
@@ -716,7 +716,7 @@ namespace AzToolsFramework
         PrepareSelection();
 
         AZ::EntityId entityId;
-        EBUS_EVENT_RESULT(entityId, EditorRequests::Bus, CreateNewEntity, parentId);
+        EditorRequests::Bus::BroadcastResult(entityId, &EditorRequests::Bus::Events::CreateNewEntity, parentId);
     }
 
     void EntityOutlinerWidget::DoDuplicateSelection()

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp

@@ -646,7 +646,8 @@ namespace AzToolsFramework
         GetHeader()->SetTitle(ComponentEditorConstants::kUnknownComponentTitle);
 
         AZStd::string iconPath;
-        EBUS_EVENT_RESULT(iconPath, AzToolsFramework::EditorRequests::Bus, GetDefaultComponentEditorIcon);
+        AzToolsFramework::EditorRequests::Bus::BroadcastResult(
+            iconPath, &AzToolsFramework::EditorRequests::Bus::Events::GetDefaultComponentEditorIcon);
         GetHeader()->SetIcon(QIcon(iconPath.c_str()));
     }
 

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

@@ -782,7 +782,7 @@ namespace AzToolsFramework
         {
             // Show default asset editor (property grid dialog) if this asset type has edit reflection.
             AZ::SerializeContext* serializeContext = nullptr;
-            EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
             if (serializeContext)
             {
                 const AZ::SerializeContext::ClassData* classData = serializeContext->FindClassData(GetCurrentAssetType());
@@ -1738,7 +1738,8 @@ namespace AzToolsFramework
         (void)node;
 
         AZStd::string assetPath;
-        EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, GUI->GetSelectedAssetID());
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            assetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, GUI->GetSelectedAssetID());
 
         instance.SetAssetPath(assetPath.c_str());
     }
@@ -1753,7 +1754,8 @@ namespace AzToolsFramework
         AZ::Data::AssetId assetId;
         if (!instance.GetAssetPath().empty())
         {
-            EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, instance.GetAssetPath().c_str(), instance.GetAssetType(), true);
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                instance.GetAssetPath().c_str(), instance.GetAssetType(), true);
         }
 
         // Set the hint in case the asset is not able to be found by assetId

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp

@@ -350,7 +350,7 @@ namespace AzToolsFramework
             bool servicesMismatch = false;
 
             AZ::Entity* entity = nullptr;
-            EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, newEntityId);
+            AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, newEntityId);
 
             if (entity)
             {
@@ -414,7 +414,8 @@ namespace AzToolsFramework
     QString PropertyEntityIdCtrl::BuildTooltip()
     {
         AZ::Entity* entity = nullptr;
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, m_entityIdLineEdit->GetEntityId());
+        AZ::ComponentApplicationBus::BroadcastResult(
+            entity, &AZ::ComponentApplicationBus::Events::FindEntity, m_entityIdLineEdit->GetEntityId());
 
         if (!entity)
         {

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp

@@ -263,7 +263,7 @@ namespace AzToolsFramework
             {
                 // does a base class have a handler?
                 AZ::SerializeContext* sc = nullptr;
-                EBUS_EVENT_RESULT(sc, AZ::ComponentApplicationBus, GetSerializeContext);
+                AZ::ComponentApplicationBus::BroadcastResult(sc, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
                 AZStd::vector<const AZ::SerializeContext::ClassData*> classes;
 
                 sc->EnumerateBase(

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp

@@ -326,7 +326,8 @@ namespace AzToolsFramework
 
             // --------------------- HANDLER discovery:
             // in order to discover this, we need the property type and handler type.
-            EBUS_EVENT_RESULT(m_handler, PropertyTypeRegistrationMessages::Bus, ResolvePropertyHandler, m_handlerName, typeUuid);
+            PropertyTypeRegistrationMessages::Bus::BroadcastResult(
+                m_handler, &PropertyTypeRegistrationMessages::Bus::Events::ResolvePropertyHandler, m_handlerName, typeUuid);
 
             
             if (m_handler)

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp

@@ -909,7 +909,8 @@ namespace AzToolsFramework
     {
         // Slice has changed underneath us, transaction invalidated
         AZStd::string sliceAssetPath;
-        EBUS_EVENT_RESULT(sliceAssetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, asset.GetId());
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            sliceAssetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
 
         QMessageBox::warning(this, QStringLiteral("Push to Slice Aborting"), 
             QString("Slice asset changed on disk during push configuration, transaction canceled.\r\n\r\nAsset:\r\n%1").arg(sliceAssetPath.c_str()), 
@@ -1033,7 +1034,7 @@ namespace AzToolsFramework
 
         if (!m_serializeContext)
         {
-            EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(m_serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         }
 
         PopulateFieldTree(entities);
@@ -1053,7 +1054,8 @@ namespace AzToolsFramework
                     item->m_selectedAsset = validSliceAssets.back().GetId();
 
                     AZStd::string sliceAssetPath;
-                    EBUS_EVENT_RESULT(sliceAssetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, item->m_selectedAsset);
+                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                        sliceAssetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, item->m_selectedAsset);
 
                     SetFieldIcon(item);
 
@@ -1211,7 +1213,8 @@ namespace AzToolsFramework
 
                 AZStd::string assetPath;
                 AZStd::string itemText;
-                EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, sliceAssetId);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    assetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, sliceAssetId);
                 AzFramework::StringFunc::Path::GetFullFileName(assetPath.c_str(), itemText);
                 if (itemText.empty())
                 {
@@ -1602,7 +1605,8 @@ namespace AzToolsFramework
                     item->m_selectedAsset = assetId;
 
                     AZStd::string assetPath;
-                    EBUS_EVENT_RESULT(assetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, assetId);
+                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                        assetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, assetId);
 
                     item->setText(1, assetPath.c_str());
 
@@ -1864,7 +1868,7 @@ namespace AzToolsFramework
         for (const AZ::EntityId& entityId : processEntityIds)
         {
             AZ::Entity* entity = nullptr;
-            EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, entityId);
+            AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, entityId);
 
             if (entity)
             {
@@ -2724,7 +2728,8 @@ namespace AzToolsFramework
             {
                 // Unsuccessful commit
                 AZStd::string sliceAssetPath;
-                EBUS_EVENT_RESULT(sliceAssetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, transactionPair.first);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    sliceAssetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, transactionPair.first);
                 if (sliceAssetPath.empty())
                 {
                     sliceAssetPath = transactionPair.first.ToString<AZStd::string>();
@@ -2791,7 +2796,8 @@ namespace AzToolsFramework
                     }
 
                     AZStd::string sliceAssetPath;
-                    EBUS_EVENT_RESULT(sliceAssetPath, AZ::Data::AssetCatalogRequestBus, GetAssetPathById, asset.GetId());
+                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                        sliceAssetPath, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetPathById, asset.GetId());
 
                     if (sliceAssetPath.empty())
                     {

Code/Framework/AzToolsFramework/Tests/EntityTestbed.h

@@ -117,7 +117,7 @@ namespace UnitTest
             m_propertyEditor = aznew AzToolsFramework::EntityPropertyEditor(nullptr);
 
             AZ::SerializeContext* serializeContext = nullptr;
-            EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
 
             m_window->setMinimumHeight(600);
             m_propertyEditor->setMinimumWidth(600);

Code/Framework/AzToolsFramework/Tests/Script/ScriptComponentTests.cpp

@@ -53,9 +53,9 @@ namespace UnitTest
             systemEntity->Init();
             systemEntity->Activate();
 
-            EBUS_EVENT_RESULT(m_scriptContext, ScriptSystemRequestBus, GetContext, DefaultScriptContextId);
-            EBUS_EVENT_RESULT(m_behaviorContext, AZ::ComponentApplicationBus, GetBehaviorContext);
-            EBUS_EVENT_RESULT(m_serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+            ScriptSystemRequestBus::BroadcastResult(m_scriptContext, &ScriptSystemRequestBus::Events::GetContext, DefaultScriptContextId);
+            AZ::ComponentApplicationBus::BroadcastResult(m_behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
+            AZ::ComponentApplicationBus::BroadcastResult(m_serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
 
             AzToolsFramework::Components::ScriptEditorComponent::CreateDescriptor(); // descriptor is deleted by app
             AzToolsFramework::Components::ScriptEditorComponent::Reflect(m_serializeContext);

Code/Framework/AzToolsFramework/Tests/Slices.cpp

@@ -240,7 +240,8 @@ namespace UnitTest
                 azsnprintf(assetFile, AZ_ARRAY_SIZE(assetFile), "GeneratedSlices/Gen%zu_Descendent%zu_%zu.xml", generation, i, nextSliceIndex++);
 
                 AZ::Data::AssetId assetId;
-                EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, assetFile, azrtti_typeid<AZ::SliceAsset>(), true);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, assetFile, azrtti_typeid<AZ::SliceAsset>(), true);
 
                 AZ::Utils::SaveObjectToFile(assetFile, AZ::DataStream::ST_XML, entity);
 
@@ -286,7 +287,8 @@ namespace UnitTest
             // override from the parent.
 
             AZ::Data::AssetId assetId;
-            EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, "GeneratedSlices/Gen0.xml", azrtti_typeid<AZ::SliceAsset>(), true);
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                "GeneratedSlices/Gen0.xml", azrtti_typeid<AZ::SliceAsset>(), true);
 
             AZ::Data::Asset<AZ::SliceAsset> baseSliceAsset;
             baseSliceAsset.Create(assetId, false);
@@ -310,7 +312,8 @@ namespace UnitTest
                 azsnprintf(assetFile, AZ_ARRAY_SIZE(assetFile), "GeneratedSlices/Gen%zu_Descendent%zu_%zu.xml", generation, i, nextSliceIndex++);
 
                 AZ::Data::AssetId assetId;
-                EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, assetFile, azrtti_typeid<AZ::SliceAsset>(), true);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                    assetFile, azrtti_typeid<AZ::SliceAsset>(), true);
 
                 if (assetId.IsValid())
                 {
@@ -377,7 +380,8 @@ namespace UnitTest
 
             // Preload all slice assets.
             AZ::Data::AssetId rootAssetId;
-            EBUS_EVENT_RESULT(rootAssetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, "GeneratedSlices/Gen0.xml", azrtti_typeid<AZ::SliceAsset>(), true);
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(rootAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                "GeneratedSlices/Gen0.xml", azrtti_typeid<AZ::SliceAsset>(), true);
             if (rootAssetId.IsValid())
             {
                 AZ::Data::AssetBus::MultiHandler::BusConnect(rootAssetId);
@@ -420,7 +424,8 @@ namespace UnitTest
             // Instantiate from the bottom generation up.
             {
                 AZ::Data::AssetId assetId;
-                EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, "GeneratedSlices/Gen0.xml", azrtti_typeid<AZ::SliceAsset>(), true);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                    "GeneratedSlices/Gen0.xml", azrtti_typeid<AZ::SliceAsset>(), true);
 
                 AZ::Data::Asset<AZ::SliceAsset> baseSliceAsset;
                 baseSliceAsset.Create(assetId, false);
@@ -481,7 +486,8 @@ namespace UnitTest
             static AZ::u32 sliceCounter = 1;
 
             AzToolsFramework::EntityIdList selected;
-            EBUS_EVENT_RESULT(selected, AzToolsFramework::ToolsApplicationRequests::Bus, GetSelectedEntities);
+            AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
+                selected, &AzToolsFramework::ToolsApplicationRequests::Bus::Events::GetSelectedEntities);
 
             AZ::SliceComponent* rootSlice = nullptr;
             AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(
@@ -500,7 +506,7 @@ namespace UnitTest
                 for (AZ::EntityId id : selected)
                 {
                     AZ::Entity* entity = nullptr;
-                    EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, id);
+                    AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, id);
                     if (entity)
                     {
                         AZ::SliceComponent::SliceInstanceAddress sliceAddress = rootSlice->FindSlice(entity);
@@ -557,7 +563,8 @@ namespace UnitTest
             if (!loadFrom.isEmpty())
             {
                 AZ::Data::AssetId assetId;
-                EBUS_EVENT_RESULT(assetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, loadFrom.toUtf8().constData(), azrtti_typeid<AZ::SliceAsset>(), true);
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                    loadFrom.toUtf8().constData(), azrtti_typeid<AZ::SliceAsset>(), true);
 
                 AZ::Data::Asset<AZ::SliceAsset> baseSliceAsset;
                 baseSliceAsset.Create(assetId, true);

Code/Tools/AssetBundler/source/utils/applicationManager.cpp

@@ -60,7 +60,7 @@ namespace AssetBundler
         Start(AzFramework::Application::Descriptor(), startupParameters);
 
         AZ::SerializeContext* context;
-        EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(context, "No serialize context");
         AzToolsFramework::AssetSeedManager::Reflect(context);
         AzToolsFramework::AssetFileInfoListComparison::Reflect(context);

Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp

@@ -1213,7 +1213,7 @@ namespace AssetBuilderSDK
     {
         AZ::SerializeContext* serializeContext = nullptr;
 
-        EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(serializeContext, "Unable to retrieve serialize context.");
 
         InitializeReflectContext(serializeContext);
@@ -1223,7 +1223,7 @@ namespace AssetBuilderSDK
     {
         AZ::BehaviorContext* behaviorContext = nullptr;
 
-        EBUS_EVENT_RESULT(behaviorContext, AZ::ComponentApplicationBus, GetBehaviorContext);
+        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
         AZ_Error("asset", behaviorContext, "Unable to retrieve behavior context.");
         if (behaviorContext)
         {

Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp

@@ -291,7 +291,7 @@ namespace AssetProcessor
             m_catalogIsDirty = false;
             // Reflect registry for serialization.
             AZ::SerializeContext* serializeContext = nullptr;
-            EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
             AZ_Assert(serializeContext, "Unable to retrieve serialize context.");
             if (nullptr == serializeContext->FindClassData(AZ::AzTypeInfo<AzFramework::AssetRegistry>::Uuid()))
             {

Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp

@@ -581,7 +581,7 @@ void AssetRequestHandler::DeleteFenceFile_Retry(unsigned int fenceId, QString fe
 void AssetRequestHandler::OnNewIncomingRequest(unsigned int connId, unsigned int serial, QByteArray payload, QString platform)
 {
     AZ::SerializeContext* serializeContext = nullptr;
-    EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(serializeContext, "Unable to retrieve serialize context.");
     AZStd::shared_ptr<BaseAssetProcessorMessage> message{ AZ::Utils::LoadObjectFromBuffer<BaseAssetProcessorMessage>(payload.constData(), payload.size(), serializeContext) };
 

Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp

@@ -367,7 +367,7 @@ bool GUIApplicationManager::Run()
     m_mainWindow = nullptr;
 
     AZ::SerializeContext* context;
-    EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(context, "No serialize context");
     QDir projectCacheRoot;
     AssetUtilities::ComputeProjectCacheRoot(projectCacheRoot);
@@ -490,7 +490,7 @@ bool GUIApplicationManager::Activate()
     m_startupErrorCollector = AZStd::make_unique<ErrorCollector>(m_mainWindow);
 
     AZ::SerializeContext* context;
-    EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+    AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
     AZ_Assert(context, "No serialize context");
     QDir projectCacheRoot;
     AssetUtilities::ComputeProjectCacheRoot(projectCacheRoot);

Code/Tools/LuaIDE/Source/LUA/BreakpointPanel.cpp

@@ -30,7 +30,8 @@ DHBreakpointsWidget::~DHBreakpointsWidget()
 void DHBreakpointsWidget::PullFromContext()
 {
     const LUAEditor::BreakpointMap* myData = NULL;
-    EBUS_EVENT_RESULT(myData, LUAEditor::LUABreakpointRequestMessages::Bus, RequestBreakpoints);
+    LUAEditor::LUABreakpointRequestMessages::Bus::BroadcastResult(
+        myData, &LUAEditor::LUABreakpointRequestMessages::Bus::Events::RequestBreakpoints);
     AZ_Assert(myData, "Nobody responded to the request breakpoints message.");
     BreakpointsUpdate(*myData);
 }

Code/Tools/LuaIDE/Source/LUA/CodeCompletion/LUACompletionModel.cpp

@@ -64,9 +64,9 @@ namespace LUAEditor
     void CompletionModel::UpdateKeywords()
     {
         const HighlightedWords::LUAKeywordsType* keywords = nullptr;
-        EBUS_EVENT_RESULT(keywords, HighlightedWords::Bus, GetLUAKeywords);
+        HighlightedWords::Bus::BroadcastResult(keywords, &HighlightedWords::Bus::Events::GetLUAKeywords);
         const HighlightedWords::LUAKeywordsType* libraryFuncs = nullptr;
-        EBUS_EVENT_RESULT(libraryFuncs, HighlightedWords::Bus, GetLUALibraryFunctions);
+        HighlightedWords::Bus::BroadcastResult(libraryFuncs, &HighlightedWords::Bus::Events::GetLUALibraryFunctions);
 
         m_keywords.clear();
         m_builtIns.Reset();

Code/Tools/LuaIDE/Source/LUA/LUAEditorContext.cpp

@@ -175,7 +175,11 @@ namespace LUAEditor
         desc.hotkeyDesc = AzToolsFramework::HotkeyDescription(AZ_CRC("LUAOpenEditor", 0x5870cf6d), "Ctrl+Shift+L", "Open LUA Editor", "General", 1, AzToolsFramework::HotkeyDescription::SCOPE_WINDOW);
         EBUS_EVENT(AzToolsFramework::FrameworkMessages::Bus, AddComponentInfo, desc);
 
-        EBUS_EVENT_RESULT(m_ipcOpenFilesHandle, LegacyFramework::IPCCommandBus, RegisterIPCHandler, "open_files", AZStd::bind(&Context::OnIPCOpenFiles, this, AZStd::placeholders::_1));
+        LegacyFramework::IPCCommandBus::BroadcastResult(
+            m_ipcOpenFilesHandle,
+            &LegacyFramework::IPCCommandBus::Events::RegisterIPCHandler,
+            "open_files",
+            AZStd::bind(&Context::OnIPCOpenFiles, this, AZStd::placeholders::_1));
 
         bool connectedToAssetProcessor = false;
 
@@ -682,7 +686,8 @@ namespace LUAEditor
         EBUS_EVENT(HotkeyBus, RegisterHotkey, AzToolsFramework::HotkeyDescription(AZ_CRC("LUAResetZoom", 0xbe0787ad),               "Ctrl+0",           "Reset Default Zoom",                   "LUA Editor", 1, AzToolsFramework::HotkeyDescription::SCOPE_WINDOW));
 
         bool GUIMode = true;
-        EBUS_EVENT_RESULT(GUIMode, LegacyFramework::FrameworkApplicationMessages::Bus, IsRunningInGUIMode);
+        LegacyFramework::FrameworkApplicationMessages::Bus::BroadcastResult(
+            GUIMode, &LegacyFramework::FrameworkApplicationMessages::Bus::Events::IsRunningInGUIMode);
         if (!GUIMode)
         {
             // do not auto create lua editor main window in batch mode.
@@ -963,7 +968,12 @@ namespace LUAEditor
             }
 
             AZ::Data::AssetId catalogAssetId;
-            EBUS_EVENT_RESULT(catalogAssetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, newAssetName.c_str(), AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid(), false);
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                catalogAssetId,
+                &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,
+                newAssetName.c_str(),
+                AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid(),
+                false);
 
             if (catalogAssetId.IsValid() || m_fileIO->Exists(newAssetName.c_str()))
             {
@@ -1487,7 +1497,8 @@ namespace LUAEditor
         // Register the script into the asset catalog
         AZ::Data::AssetType assetType = AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid();
         AZ::Data::AssetId catalogAssetId;
-        EBUS_EVENT_RESULT(catalogAssetId, AZ::Data::AssetCatalogRequestBus, GetAssetIdByPath, normalizedAssetId.c_str(), assetType, true);
+        AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+            catalogAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, normalizedAssetId.c_str(), assetType, true);
 
         uint64_t modTime = m_fileIO->ModificationTime(assetId.c_str());
 
@@ -1619,7 +1630,8 @@ namespace LUAEditor
         if (executeLocally)
         {
             AZ::ScriptContext* sc = nullptr;
-            EBUS_EVENT_RESULT(sc, AZ::ScriptSystemRequestBus, GetContext, AZ::ScriptContextIds::DefaultScriptContextId);
+            AZ::ScriptSystemRequestBus::BroadcastResult(
+                sc, &AZ::ScriptSystemRequestBus::Events::GetContext, AZ::ScriptContextIds::DefaultScriptContextId);
             if (sc)
             {
                 // we might want to bracket this with some sort of error or warning protection, to collect

Code/Tools/LuaIDE/Source/LUA/LUAEditorFindDialog.cpp

@@ -514,7 +514,8 @@ namespace LUAEditor
         {
             AZ_Assert(false, "Fix assets!");
             //AZ::u32 platformFeatureFlags = PLATFORM_FEATURE_FLAGS_ALL;
-            //EBUS_EVENT_RESULT(platformFeatureFlags, EditorFramework::EditorAssetCatalogMessages::Bus, GetCurrentPlatformFeatureFlags);
+            //EditorFramework::EditorAssetCatalogMessages::Bus::BroadcastResult(
+            //    platformFeatureFlags, &EditorFramework::EditorAssetCatalogMessages::Bus::Events::GetCurrentPlatformFeatureFlags);
             //EBUS_EVENT(EditorFramework::EditorAssetCatalogMessages::Bus, FindEditorAssetsByType, m_dFindAllLUAAssetsInfo, AZ::ScriptAsset::StaticAssetType(), platformFeatureFlags);
         }
 
@@ -984,7 +985,8 @@ namespace LUAEditor
         AZ_Assert(false, "Fix assets!");
 
         //AZ::u32 platformFeatureFlags = PLATFORM_FEATURE_FLAGS_ALL;
-        //EBUS_EVENT_RESULT(platformFeatureFlags, EditorFramework::EditorAssetCatalogMessages::Bus, GetCurrentPlatformFeatureFlags);
+        //EditorFramework::EditorAssetCatalogMessages::Bus::BroadcastResult(
+        //    platformFeatureFlags, &EditorFramework::EditorAssetCatalogMessages::Bus::Events::GetCurrentPlatformFeatureFlags);
         //EBUS_EVENT(EditorFramework::EditorAssetCatalogMessages::Bus, FindEditorAssetsByType, m_RIFData.m_dReplaceAllLUAAssetsInfo, AZ::ScriptAsset::StaticAssetType(), platformFeatureFlags);
 
         m_RIFData.m_OpenView = pLUAEditorMainWindow->GetAllViews();

Code/Tools/LuaIDE/Source/LUA/LUAEditorMainWindow.cpp

@@ -898,7 +898,8 @@ namespace LUAEditor
         if (SyncDocumentToContext(m_lastFocusedAssetId))
         {
             bool saveSuccess = false;
-            EBUS_EVENT_RESULT(saveSuccess, Context_DocumentManagement::Bus, OnSaveDocumentAs, m_lastFocusedAssetId, false);
+            Context_DocumentManagement::Bus::BroadcastResult(
+                saveSuccess, &Context_DocumentManagement::Bus::Events::OnSaveDocumentAs, m_lastFocusedAssetId, false);
         }
     }
 

Code/Tools/LuaIDE/Source/LUA/LUAEditorSettingsDialog.cpp

@@ -39,7 +39,7 @@ namespace LUAEditor
 
         AZ::SerializeContext* context = nullptr;
         {
-            EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+            AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
             AZ_Assert(context, "We should have a valid context!");
         }
 

Code/Tools/LuaIDE/Source/LUA/LUAEditorSyntaxHighlighter.cpp

@@ -576,9 +576,9 @@ namespace LUAEditor
         auto colors = AZ::UserSettings::CreateFind<SyntaxStyleSettings>(AZ_CRC("LUA Editor Text Settings", 0xb6e15565), AZ::UserSettings::CT_GLOBAL);
 
         const HighlightedWords::LUAKeywordsType* keywords = nullptr;
-        EBUS_EVENT_RESULT(keywords, HighlightedWords::Bus, GetLUAKeywords);
+        HighlightedWords::Bus::BroadcastResult(keywords, &HighlightedWords::Bus::Events::GetLUAKeywords);
         const HighlightedWords::LUAKeywordsType* libraryFuncs = nullptr;
-        EBUS_EVENT_RESULT(libraryFuncs, HighlightedWords::Bus, GetLUALibraryFunctions);
+        HighlightedWords::Bus::BroadcastResult(libraryFuncs, &HighlightedWords::Bus::Events::GetLUALibraryFunctions);
 
         auto cBlock = currentBlock();
 
@@ -747,9 +747,9 @@ namespace LUAEditor
         m_machine->SetOnDecFoldLevel([](int) {});
 
         const HighlightedWords::LUAKeywordsType* keywords = nullptr;
-        EBUS_EVENT_RESULT(keywords, HighlightedWords::Bus, GetLUAKeywords);
+        HighlightedWords::Bus::BroadcastResult(keywords, &HighlightedWords::Bus::Events::GetLUAKeywords);
         const HighlightedWords::LUAKeywordsType* libraryFuncs = nullptr;
-        EBUS_EVENT_RESULT(libraryFuncs, HighlightedWords::Bus, GetLUALibraryFunctions);
+        HighlightedWords::Bus::BroadcastResult(libraryFuncs, &HighlightedWords::Bus::Events::GetLUALibraryFunctions);
 
         auto syntaxSettings = AZ::UserSettings::CreateFind<SyntaxStyleSettings>(AZ_CRC("LUA Editor Text Settings", 0xb6e15565), AZ::UserSettings::CT_GLOBAL);
         auto font = syntaxSettings->GetFont();

Code/Tools/LuaIDE/Source/LUA/LUAEditorView.cpp

@@ -292,7 +292,8 @@ namespace LUAEditor
 
             // scan the breakpoint store from our context and pre-set the markers to get in sync
             const LUAEditor::BreakpointMap* myData = NULL;
-            EBUS_EVENT_RESULT(myData, LUAEditor::LUABreakpointRequestMessages::Bus, RequestBreakpoints);
+            LUAEditor::LUABreakpointRequestMessages::Bus::BroadcastResult(
+                myData, &LUAEditor::LUABreakpointRequestMessages::Bus::Events::RequestBreakpoints);
             AZ_Assert(myData, "LUAEditor::LUABreakpointRequestMessages::Bus, RequestBreakpoints failed to return any data.");
             BreakpointsUpdate(*myData);
             UpdateCurrentEditingLine(newInfo.m_PresetLineAtOpen);
@@ -595,7 +596,8 @@ namespace LUAEditor
         m_gui->m_breakpoints->ClearBreakpoints();
 
         const LUAEditor::BreakpointMap* myData = NULL;
-        EBUS_EVENT_RESULT(myData, LUAEditor::LUABreakpointRequestMessages::Bus, RequestBreakpoints);
+        LUAEditor::LUABreakpointRequestMessages::Bus::BroadcastResult(
+            myData, &LUAEditor::LUABreakpointRequestMessages::Bus::Events::RequestBreakpoints);
         AZ_Assert(myData, "Nobody responded to the request breakpoints message.");
 
         // and slam down a new set

Code/Tools/LuaIDE/Source/LUA/TargetContextButton.cpp

@@ -46,7 +46,8 @@ namespace LUA
         QMenu menu;
 
         AZStd::vector<AZStd::string> contexts;
-        EBUS_EVENT_RESULT(contexts, LUAEditor::LUATargetContextRequestMessages::Bus, RequestTargetContexts);
+        LUAEditor::LUATargetContextRequestMessages::Bus::BroadcastResult(
+            contexts, &LUAEditor::LUATargetContextRequestMessages::Bus::Events::RequestTargetContexts);
 
         for (AZStd::vector<AZStd::string>::const_iterator it = contexts.begin(); it != contexts.end(); ++it)
         {

Code/Tools/PythonBindingsExample/source/Application.cpp

@@ -42,7 +42,7 @@ namespace PythonBindingsExample
         Start(Descriptor());
 
         AZ::SerializeContext* context;
-        EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
+        AZ::ComponentApplicationBus::BroadcastResult(context, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
         AZ_Assert(context, "Application did not start; detected no serialize context");
 
         AZ_TracePrintf("Python Bindings", "Init() \n");

Gems/LyShineExamples/Code/Source/UiTestScrollBoxDataProviderComponent.cpp

@@ -38,7 +38,7 @@ namespace LyShineExamples
     int UiTestScrollBoxDataProviderComponent::GetNumElements()
     {
         UiDynamicContentDatabase *uiDynamicContentDB = nullptr;
-        EBUS_EVENT_RESULT(uiDynamicContentDB, LyShineExamplesInternalBus, GetUiDynamicContentDatabase);
+        LyShineExamplesInternalBus::BroadcastResult(uiDynamicContentDB, &LyShineExamplesInternalBus::Events::GetUiDynamicContentDatabase);
         if (uiDynamicContentDB)
         {
             return uiDynamicContentDB->GetNumColors(UiDynamicContentDatabaseInterface::ColorType::PaidColors);
@@ -51,7 +51,7 @@ namespace LyShineExamples
     void UiTestScrollBoxDataProviderComponent::OnElementBecomingVisible(AZ::EntityId entityId, int index)
     {
         UiDynamicContentDatabase *uiDynamicContentDB = nullptr;
-        EBUS_EVENT_RESULT(uiDynamicContentDB, LyShineExamplesInternalBus, GetUiDynamicContentDatabase);
+        LyShineExamplesInternalBus::BroadcastResult(uiDynamicContentDB, &LyShineExamplesInternalBus::Events::GetUiDynamicContentDatabase);
         if (uiDynamicContentDB)
         {
             if ((index >= 0) && (index < uiDynamicContentDB->GetNumColors(UiDynamicContentDatabaseInterface::ColorType::PaidColors)))

Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp

@@ -63,7 +63,7 @@ namespace Maestro
         }
 
         IEditor* editor = nullptr;
-        EBUS_EVENT_RESULT(editor, AzToolsFramework::EditorRequests::Bus, GetEditor);
+        AzToolsFramework::EditorRequests::Bus::BroadcastResult(editor, &AzToolsFramework::EditorRequests::Bus::Events::GetEditor);
         if (editor)
         {
             IAnimSequence* sequence = editor->GetMovieSystem()->FindSequenceById(m_sequenceId);
@@ -127,7 +127,7 @@ namespace Maestro
         EditorComponentBase::Init();
         m_sequenceId = s_invalidSequenceId;
         IEditor* editor = nullptr;
-        EBUS_EVENT_RESULT(editor, AzToolsFramework::EditorRequests::Bus, GetEditor);
+        AzToolsFramework::EditorRequests::Bus::BroadcastResult(editor, &AzToolsFramework::EditorRequests::Bus::Events::GetEditor);
 
         if (editor)
         {
@@ -170,7 +170,7 @@ namespace Maestro
         Maestro::SequenceComponentRequestBus::Handler::BusConnect(GetEntityId());
 
         IEditor* editor = nullptr;
-        EBUS_EVENT_RESULT(editor, AzToolsFramework::EditorRequests::Bus, GetEditor);
+        AzToolsFramework::EditorRequests::Bus::BroadcastResult(editor, &AzToolsFramework::EditorRequests::Bus::Events::GetEditor);
         if (editor)
         {
             editor->GetSequenceManager()->OnSequenceActivated(GetEntityId());
@@ -336,7 +336,7 @@ namespace Maestro
         bool retSuccess = false;
         AZ::Entity* entity = nullptr;
 
-        EBUS_EVENT_RESULT(entity, AZ::ComponentApplicationBus, FindEntity, GetEntityId());
+        AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationBus::Events::FindEntity, GetEntityId());
         if (entity)
         {
             CEntityObject* entityObject = nullptr;

Gems/Maestro/Code/Source/Components/SequenceAgent.cpp

@@ -53,7 +53,7 @@ namespace Maestro
     void SequenceAgent::CacheAllVirtualPropertiesFromBehaviorContext()
     {
         AZ::BehaviorContext* behaviorContext = nullptr;
-        EBUS_EVENT_RESULT(behaviorContext, AZ::ComponentApplicationBus, GetBehaviorContext);
+        AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationBus::Events::GetBehaviorContext);
         
         AZ::Entity::ComponentArrayType entityComponents;
         GetEntityComponents(entityComponents);