resolving merge issues

fixing crash on startup because allocator was not available when string was allocated

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Application/AtomToolsApplication.h

@@ -43,7 +43,7 @@ namespace AtomToolsFramework
 
         using Base = AzFramework::Application;
 
-        AtomToolsApplication(const AZStd::string& targetName, int* argc, char*** argv);
+        AtomToolsApplication(const char* targetName, int* argc, char*** argv);
         ~AtomToolsApplication();
 
         virtual bool LaunchLocalServer();

Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentApplication.h

@@ -22,7 +22,7 @@ namespace AtomToolsFramework
 
         using Base = AtomToolsApplication;
 
-        AtomToolsDocumentApplication(const AZStd::string& targetName, int* argc, char*** argv);
+        AtomToolsDocumentApplication(const char* targetName, int* argc, char*** argv);
 
     protected:
         // AtomToolsApplication overrides...

Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp

@@ -45,7 +45,7 @@ AZ_POP_DISABLE_WARNING
 
 namespace AtomToolsFramework
 {
-    AtomToolsApplication::AtomToolsApplication(const AZStd::string& targetName, int* argc, char*** argv)
+    AtomToolsApplication::AtomToolsApplication(const char* targetName, int* argc, char*** argv)
         : Application(argc, argv)
         , AzQtApplication(*argc, *argv)
         , m_targetName(targetName)

Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentApplication.cpp

@@ -11,7 +11,7 @@
 
 namespace AtomToolsFramework
 {
-    AtomToolsDocumentApplication::AtomToolsDocumentApplication(const AZStd::string& targetName, int* argc, char*** argv)
+    AtomToolsDocumentApplication::AtomToolsDocumentApplication(const char* targetName, int* argc, char*** argv)
         : Base(targetName, argc, argv)
     {
     }

Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.cpp

@@ -14,8 +14,10 @@
 
 namespace ShaderManagementConsole
 {
-    ShaderManagementConsoleTableView::ShaderManagementConsoleTableView(const AZ::Uuid& documentId, QWidget* parent)
+    ShaderManagementConsoleTableView::ShaderManagementConsoleTableView(
+        const AZ::Crc32& toolId, const AZ::Uuid& documentId, QWidget* parent)
         : QTableView(parent)
+        , m_toolId(toolId)
         , m_documentId(documentId)
         , m_model(new QStandardItemModel(this))
     {
@@ -23,7 +25,7 @@ namespace ShaderManagementConsole
         setModel(m_model);
 
         RebuildTable();
-        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect();
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
     }
 
     ShaderManagementConsoleTableView::~ShaderManagementConsoleTableView()

Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleTableView.h

@@ -23,7 +23,7 @@ namespace ShaderManagementConsole
     {
     public:
         AZ_CLASS_ALLOCATOR(ShaderManagementConsoleTableView, AZ::SystemAllocator, 0);
-        ShaderManagementConsoleTableView(const AZ::Uuid& documentId, QWidget* parent = 0);
+        ShaderManagementConsoleTableView(const AZ::Crc32& toolId, const AZ::Uuid& documentId, QWidget* parent);
         ~ShaderManagementConsoleTableView();
 
     protected:
@@ -33,8 +33,8 @@ namespace ShaderManagementConsole
 
         void RebuildTable();
 
-        AZ::Uuid m_documentId = AZ::Uuid::CreateNull();
+        const AZ::Crc32 m_toolId = {};
+        const AZ::Uuid m_documentId = AZ::Uuid::CreateNull();
         QStandardItemModel* m_model = {};
-
     };
 } // namespace ShaderManagementConsole

Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp

@@ -36,7 +36,7 @@ namespace ShaderManagementConsole
         setObjectName("ShaderManagementConsoleWindow");
 
         m_assetBrowser->SetFilterState("", AZ::RPI::ShaderAsset::Group, true);
-        m_assetBrowser->SetOpenHandler([this](const AZStd::string& absolutePath) {
+        m_assetBrowser->SetOpenHandler([this](const AZStd::string& absolutePath)
             {
                 if (AzFramework::StringFunc::Path::IsExtension(absolutePath.c_str(), AZ::RPI::ShaderSourceData::Extension) ||
                     AzFramework::StringFunc::Path::IsExtension(absolutePath.c_str(), AZ::RPI::ShaderVariantListSourceData::Extension))
@@ -75,7 +75,7 @@ namespace ShaderManagementConsole
 
     QWidget* ShaderManagementConsoleWindow::CreateDocumentTabView(const AZ::Uuid& documentId)
     {
-        return new ShaderManagementConsoleTableView(documentId, centralWidget());
+        return new ShaderManagementConsoleTableView(m_toolId, documentId, centralWidget());
     }
 } // namespace ShaderManagementConsole