Fix compiler errors while building with C++20 standard. (#18994)

The fixes fall mostly into 6 categories:

 * Add missing [[maybe_unused]] decorators.
 * Fix the inconsistance with C++20 in <chrono>.
 * Fix arithmetics between incomparable enums by explicitly casting to int.
 * Mark comparators as const to avoid ambiguity of C++20 synthesized expression.
 * Fix issues around utf8 string literals by casting to const char*.
 * Remove explicit constructor for some PODs to allow aggregate initialization.

Signed-off-by: Ross Charles C. <[email protected]>

Code/Editor/EditorViewportWidget.cpp

@@ -474,7 +474,7 @@ void EditorViewportWidget::Update()
             if (debugDisplay)
             {
                 const AZ::u32 prevState = debugDisplay->GetState();
-                debugDisplay->SetState(AzFramework::e_Mode3D | AzFramework::e_AlphaBlended | AzFramework::e_FillModeSolid | AzFramework::e_CullModeBack | AzFramework::e_DepthWriteOn | AzFramework::e_DepthTestOn);
+                debugDisplay->SetState(0x0u | AzFramework::e_Mode3D | AzFramework::e_AlphaBlended | AzFramework::e_FillModeSolid | AzFramework::e_CullModeBack | AzFramework::e_DepthWriteOn | AzFramework::e_DepthTestOn);
 
                 AzFramework::EntityDebugDisplayEventBus::Broadcast(
                     &AzFramework::EntityDebugDisplayEvents::DisplayEntityViewport, AzFramework::ViewportInfo{ GetViewportId() },
@@ -694,7 +694,7 @@ void EditorViewportWidget::OnBeginPrepareRender()
     // Draw 2D helpers.
     m_debugDisplay->DepthTestOff();
     auto prevState = m_debugDisplay->GetState();
-    m_debugDisplay->SetState(AzFramework::e_Mode3D | AzFramework::e_AlphaBlended | AzFramework::e_FillModeSolid | AzFramework::e_CullModeBack | AzFramework::e_DepthWriteOn | AzFramework::e_DepthTestOn);
+    m_debugDisplay->SetState(0x0u | AzFramework::e_Mode3D | AzFramework::e_AlphaBlended | AzFramework::e_FillModeSolid | AzFramework::e_CullModeBack | AzFramework::e_DepthWriteOn | AzFramework::e_DepthTestOn);
 
     AzFramework::ViewportDebugDisplayEventBus::Event(
         AzToolsFramework::GetEntityContextId(), &AzFramework::ViewportDebugDisplayEvents::DisplayViewport2d,

Code/Editor/TrackView/SequenceBatchRenderDialog.h

@@ -96,7 +96,7 @@ protected:
             , pDirectorNode(nullptr)
             , disableDebugInfo(false)
             , bCreateVideo(false) {}
-        bool operator==(const SRenderItem& item)
+        bool operator==(const SRenderItem& item) const
         {
             if (pSequence == item.pSequence
                 && pDirectorNode == item.pDirectorNode

Code/Framework/AzCore/AzCore/Instance/InstancePool.h

@@ -147,7 +147,7 @@ namespace AZ
         // important note: to use this, the T type must either include the AZ_RTTI macro, or be externally exposed via AZ_TYPE_INFO_SPECIALIZE
         template<class T>
         AZ::Outcome<AZStd::shared_ptr<InstancePool<T>>, AZStd::string> CreatePool(
-            typename InstancePool<T>::ResetInstance resetFunc = [](T&){}, 
+            typename InstancePool<T>::ResetInstance resetFunc = [](T&){},
             [[maybe_unused]] typename InstancePool<T>::CreateInstance createFunc = []() { return new T{}; })
         {
             return CreatePool<T>(GetDefaultName<T>(), resetFunc);

Code/Framework/AzCore/AzCore/Memory/AllocatorManager.cpp

@@ -215,7 +215,7 @@ namespace AZ
             auto durationInMilliseconds = AZStd::chrono::duration_cast<AZStd::chrono::milliseconds>(endTime - startTime);
             auto durationInSeconds = AZStd::chrono::ceil<AZStd::chrono::seconds>(durationInMilliseconds);
 
-            AllocationString allocationsPerSecond = u8"\u221e";
+            AllocationString allocationsPerSecond = reinterpret_cast<const char*>(u8"\u221e");
             if (durationInSeconds.count() != 0)
             {
                 // Use a double for the seconds duration in order to allow decimal values

Code/Framework/AzCore/AzCore/Serialization/DataPatch.h

@@ -52,8 +52,8 @@ namespace AZ
             const AZ::u32 GetElementVersion() const { return m_addressClassVersion; }
             bool IsValid() const { return m_isValid; }
 
-            static constexpr const char* PathDelimiter = "/";
-            static constexpr const char* VersionDelimiter = u8"\u00B7"; // utf-8 for <middledot>
+            static constexpr const char PathDelimiter[] = "/";
+            static constexpr const char VersionDelimiter[] = u8"\u00B7"; // utf-8 for <middledot>
 
             void SetAddressClassTypeId(const AZ::TypeId& id) { m_addressClassTypeId = id; }
             void SetPathElement(const AZStd::string& path) { m_pathElement = path; }

Code/Framework/AzCore/AzCore/std/chrono/chrono.h

@@ -496,7 +496,8 @@ namespace AZStd::chrono
 
     // [time.cal.last](http://eel.is/c++draft/time#cal.last), class last_­spec
 #if __cpp_lib_chrono >= 201907L
-    using std::chrono::last_spec using std::chrono::last;
+    using std::chrono::last_spec;
+    using std::chrono::last;
 #else
     struct last_spec
     {
@@ -1395,7 +1396,6 @@ namespace AZStd::chrono
     // [time.cal.ymd](http://eel.is/c++draft/time#cal.ymd), class year_­month_­day
 #if __cpp_lib_chrono >= 201907L
     using std::chrono::year_month_day;
-    using std::chrono::year_month_last;
 #else
     namespace Internal
     {
@@ -2459,21 +2459,19 @@ namespace AZStd
         {
             using namespace std::literals::chrono_literals;
 
+            // Note that C++20 defines ""d and ""y string literals, but they are reserved and thus can't be defined by user
+
             // [time.cal.day.nonmembers](http://eel.is/c++draft/time#cal.day.nonmembers), non-member functions
-    #if __cpp_lib_chrono < 201907L
             constexpr chrono::day operator""_d(unsigned long long d) noexcept
             {
                 return chrono::day{ static_cast<unsigned int>(d) };
             }
-    #endif
 
             // [time.cal.year.nonmembers](http://eel.is/c++draft/time#cal.year.nonmembers), non-member functions
-    #if __cpp_lib_chrono < 201907L
             constexpr chrono::year operator""_y(unsigned long long y) noexcept
             {
                 return chrono::year{ static_cast<int>(y) };
             }
-    #endif
         }
     } // namespace literals
 

Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableMonitor.cpp

@@ -90,7 +90,7 @@ namespace AzFramework
         }
     }
 
-    void SpawnableMonitor::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
+    void SpawnableMonitor::OnAssetReady([[maybe_unused]] AZ::Data::Asset<AZ::Data::AssetData> asset)
     {
         AZ_Assert(!m_isLoaded, "Trying to load spawnable %s (%s) for a second time.",
             asset.GetHint().c_str(), asset.GetId().ToString<AZStd::string>().c_str());

Code/Framework/AzQtComponents/AzQtComponents/Gallery/MenuPage.cpp

@@ -27,12 +27,12 @@ MenuPage::MenuPage(QWidget* parent)
     menu->addSeparator();
 
     auto shortcutAction = menu->addAction(actionText);
-    shortcutAction->setShortcut(Qt::CTRL + Qt::Key_O);
+    shortcutAction->setShortcut(0x0 | Qt::CTRL | Qt::Key_O);
     shortcutAction->setShortcutVisibleInContextMenu(true);
 
     auto disabledShortcutAction = menu->addAction(QStringLiteral("Disabled"));
     disabledShortcutAction->setEnabled(false);
-    disabledShortcutAction->setShortcut(Qt::CTRL + Qt::Key_D);
+    disabledShortcutAction->setShortcut(0x0 | Qt::CTRL | Qt::Key_D);
     disabledShortcutAction->setShortcutVisibleInContextMenu(true);
 
     auto submenu = menu->addMenu(QStringLiteral("Submenu"));
@@ -67,7 +67,7 @@ QMenu* radioButton;
 
 // To add an action with a shortcut:
 auto shortcutAction = menu->addAction("Menu text");
-shortcutAction->setShortcut(Qt::CTRL + Qt::Key_O);
+shortcutAction->setShortcut(0x0 | Qt::CTRL | Qt::Key_O);
 shortcutAction->setShortcutVisibleInContextMenu(true);
 
 // To add a checkable action:

Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h

@@ -428,16 +428,8 @@ namespace AzToolsFramework
 
         //////////////////////////////////////////////////////////////////////////
         // StatDatabaseEntry
-        class StatDatabaseEntry
+        struct StatDatabaseEntry
         {
-        public:
-            StatDatabaseEntry() = default;
-
-            StatDatabaseEntry(const StatDatabaseEntry& other) = default;
-            StatDatabaseEntry(StatDatabaseEntry&& other) = default;
-
-            StatDatabaseEntry& operator=(StatDatabaseEntry&& other) = default;
-            StatDatabaseEntry& operator=(const StatDatabaseEntry& other) = default;
             bool operator==(const StatDatabaseEntry& other) const;
             bool operator!=(const StatDatabaseEntry& other) const;
 

Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp

@@ -518,7 +518,7 @@ namespace AzToolsFramework
                     // cycle to previous 'selected' ComponentMode actions
                     const ActionOverride previousComponentModeAction = ActionOverride()
                         .SetUri(s_previousComponentMode)
-                        .SetKeySequence(QKeySequence(Qt::SHIFT + Qt::Key_Tab))
+                        .SetKeySequence(QKeySequence(0x0 | Qt::SHIFT | Qt::Key_Tab))
                         .SetTitle(s_previousActiveComponentModeTitle)
                         .SetTip(s_prevActiveComponentModeDesc)
                         .SetCallback([]()

Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp

@@ -1596,7 +1596,7 @@ namespace AzToolsFramework
         EditorVertexSelectionBase<Vertex>::m_actionOverrides[static_cast<size_t>(EditorVertexSelectionBase<Vertex>::State::Translating)] =
             AZStd::vector<ActionOverride>{ ActionOverride()
                                                .SetUri(AzToolsFramework::s_duplicateAction)
-                                               .SetKeySequence(QKeySequence(Qt::CTRL + Qt::Key_D))
+                                               .SetKeySequence(QKeySequence(0x0 | Qt::CTRL | Qt::Key_D))
                                                .SetTitle(s_duplicateVerticesTitle)
                                                .SetTip(s_duplicateVerticesDesc)
                                                .SetCallback(

Code/Framework/AzToolsFramework/AzToolsFramework/PropertyTreeEditor/PropertyTreeEditor.h

@@ -112,7 +112,6 @@ namespace AzToolsFramework
 
         struct ContainerData final
         {
-            ContainerData() = default;
             ~ContainerData() = default;
 
             const PropertyTreeEditorNode* m_propertyTreeEditorNode = nullptr;
@@ -122,7 +121,6 @@ namespace AzToolsFramework
 
         struct AssociatePairInfo final
         {
-            AssociatePairInfo() = default;
             ~AssociatePairInfo() = default;
 
             const AZ::SerializeContext::ClassData* m_pairClass = nullptr;

Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewBookmarkLoaderInterface.h

@@ -24,8 +24,6 @@ namespace AzToolsFramework
         AZ_CLASS_ALLOCATOR(ViewBookmark, AZ::SystemAllocator);
         AZ_TYPE_INFO(ViewBookmark, "{9D6601B9-922F-4E90-BEB2-4D3D709DADD7}");
 
-        ViewBookmark() = default;
-
         static void Reflect(AZ::ReflectContext* context);
 
         bool operator==(const ViewBookmark& other) const

Code/Tools/AssetBundler/source/ui/MainWindow.cpp

@@ -51,9 +51,9 @@ namespace AssetBundler
         m_unsavedChangesMsgBox->setDefaultButton(QMessageBox::Save);
 
         // Set up Quit functionality
-        m_ui->actionClose->setShortcut(Qt::Key_Q | Qt::CTRL);
+        m_ui->actionClose->setShortcut(0x0 | Qt::Key_Q | Qt::CTRL);
         m_ui->actionClose->setMenuRole(QAction::QuitRole);
-        connect(m_ui->actionClose, SIGNAL(triggered()), this, SLOT(close()));
+        connect(m_ui->actionClose, &QAction::triggered, this, &MainWindow::close);
         this->addAction(m_ui->actionClose);
 
         // Set up Tabs
@@ -82,10 +82,10 @@ namespace AssetBundler
         m_ui->tabWidget->addAction(supportAction);
 
         // Set up Save functionality
-        m_ui->actionSave->setShortcut(Qt::Key_S | Qt::CTRL);
+        m_ui->actionSave->setShortcut(0x0 | Qt::Key_S | Qt::CTRL);
         connect(m_ui->actionSave, &QAction::triggered, this, &MainWindow::SaveCurrentSelection);
 
-        m_ui->actionSaveAll->setShortcut(Qt::Key_S | Qt::CTRL | Qt::SHIFT);
+        m_ui->actionSaveAll->setShortcut(0x0 | Qt::Key_S | Qt::CTRL | Qt::SHIFT);
         connect(m_ui->actionSaveAll, &QAction::triggered, this, &MainWindow::SaveAll);
     }
 

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

@@ -265,13 +265,13 @@ bool GUIApplicationManager::Run()
 #endif
 
     QAction* quitAction = new QAction(QObject::tr("Quit"), m_mainWindow);
-    quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
+    quitAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_Q));
     quitAction->setMenuRole(QAction::QuitRole);
     m_mainWindow->addAction(quitAction);
     m_mainWindow->connect(quitAction, SIGNAL(triggered()), this, SLOT(QuitRequested()));
 
     QAction* refreshAction = new QAction(QObject::tr("Refresh Stylesheet"), m_mainWindow);
-    refreshAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+    refreshAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_R));
     m_mainWindow->addAction(refreshAction);
     m_mainWindow->connect(refreshAction, &QAction::triggered, this, refreshStyleSheets);
 

Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp

@@ -169,8 +169,8 @@ namespace O3DE::ProjectManager
             QPair<int, int> versionXBounds = CalcColumnXBounds(HeaderOrder::Version);
             QRect gemVersionRect{ versionXBounds.first, contentRect.top(), versionXBounds.second - versionXBounds.first, contentRect.height() };
             painter->setFont(standardFont);
-            gemVersionRect = painter->boundingRect(gemVersionRect, Qt::TextWordWrap | Qt::AlignRight | Qt::AlignVCenter, gemInfo.m_version);
-            painter->drawText(gemVersionRect, Qt::TextWordWrap | Qt::AlignRight | Qt::AlignVCenter, gemInfo.m_version);
+            gemVersionRect = painter->boundingRect(gemVersionRect, 0x0 | Qt::TextWordWrap | Qt::AlignRight | Qt::AlignVCenter, gemInfo.m_version);
+            painter->drawText(gemVersionRect, 0x0 | Qt::TextWordWrap | Qt::AlignRight | Qt::AlignVCenter, gemInfo.m_version);
 
             GemSortFilterProxyModel* proxyModel = reinterpret_cast<GemSortFilterProxyModel*>(m_model);
             bool showCompatibleUpdatesOnly = proxyModel ? proxyModel->GetCompatibleFilterFlag() : true;

Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.h

@@ -141,7 +141,7 @@ namespace ImageProcessingAtom
                 return m_pitch * m_rowCount * m_depth;
             }
 
-            bool operator==(const MipLevel& other)
+            bool operator==(const MipLevel& other) const
             {
                 if (m_width == other.m_width && m_height == other.m_height && m_depth == other.m_depth
                     && m_rowCount == other.m_rowCount && m_pitch == other.m_pitch)

Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp

@@ -39,7 +39,7 @@ namespace AZ
             }
         }
 
-        void ReflectionProbe::OnAssetError(Data::Asset<Data::AssetData> asset)
+        void ReflectionProbe::OnAssetError([[maybe_unused]] Data::Asset<Data::AssetData> asset)
         {
             AZ_Error("ReflectionProbe", false, "Failed to load ReflectionProbe dependency asset %s", asset.ToString<AZStd::string>().c_str());
             Data::AssetBus::Handler::BusDisconnect();

Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceCopyItem.h

@@ -15,8 +15,6 @@ namespace AZ::RHI
 {
     struct DeviceCopyBufferDescriptor
     {
-        DeviceCopyBufferDescriptor() = default;
-
         const DeviceBuffer* m_sourceBuffer = nullptr;
         uint32_t m_sourceOffset = 0;
         const DeviceBuffer* m_destinationBuffer = nullptr;
@@ -26,8 +24,6 @@ namespace AZ::RHI
 
     struct DeviceCopyImageDescriptor
     {
-        DeviceCopyImageDescriptor() = default;
-
         const DeviceImage* m_sourceImage = nullptr;
         ImageSubresource m_sourceSubresource;
         Origin m_sourceOrigin;
@@ -39,8 +35,6 @@ namespace AZ::RHI
 
     struct DeviceCopyBufferToImageDescriptor
     {
-        DeviceCopyBufferToImageDescriptor() = default;
-
         const DeviceBuffer* m_sourceBuffer = nullptr;
         uint32_t m_sourceOffset = 0;
         uint32_t m_sourceBytesPerRow = 0;
@@ -56,8 +50,6 @@ namespace AZ::RHI
 
     struct DeviceCopyImageToBufferDescriptor
     {
-        DeviceCopyImageToBufferDescriptor() = default;
-
         const DeviceImage* m_sourceImage = nullptr;
         ImageSubresource m_sourceSubresource;
         Origin m_sourceOrigin;
@@ -73,8 +65,6 @@ namespace AZ::RHI
 
     struct DeviceCopyQueryToBufferDescriptor
     {
-        DeviceCopyQueryToBufferDescriptor() = default;
-
         const DeviceQueryPool* m_sourceQueryPool = nullptr;
         QueryHandle m_firstQuery = QueryHandle(0);
         uint32_t m_queryCount = 0;

Gems/Atom/RHI/Code/Include/Atom/RHI/DeviceDrawPacketBuilder.h

@@ -25,8 +25,6 @@ namespace AZ::RHI
     public:
         struct DeviceDrawRequest
         {
-            DeviceDrawRequest() = default;
-
             //! The filter tag used to direct the draw item.
             DrawListTag m_listTag;
 

Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp

@@ -118,7 +118,7 @@ namespace AZ::RHI
     }
 
     void FrameGraph::ValidateOverlappingAttachment(
-        AttachmentId attachmentId, ScopeAttachmentUsage usage, [[maybe_unused]] ScopeAttachmentAccess access, const ScopeAttachment& scopeAttachment) const
+        [[maybe_unused]] AttachmentId attachmentId, ScopeAttachmentUsage usage, [[maybe_unused]] ScopeAttachmentAccess access, const ScopeAttachment& scopeAttachment) const
     {
         // Validation for access type
         AZ_Assert(

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

@@ -179,11 +179,11 @@ namespace AtomToolsFramework
 
         m_actionPreviousTab = CreateActionAtPosition(m_menuView, insertPostion, "&Previous Tab", [this]() {
             SelectPrevDocumentTab();
-        }, Qt::CTRL | Qt::SHIFT | Qt::Key_Tab); //QKeySequence::PreviousChild is mapped incorrectly in Qt
+        }, 0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Tab); //QKeySequence::PreviousChild is mapped incorrectly in Qt
 
         m_actionNextTab = CreateActionAtPosition(m_menuView, insertPostion, "&Next Tab", [this]() {
             SelectNextDocumentTab();
-        }, Qt::CTRL | Qt::Key_Tab); //QKeySequence::NextChild works as expected but mirroring Previous
+        }, 0x0 | Qt::CTRL | Qt::Key_Tab); //QKeySequence::NextChild works as expected but mirroring Previous
         m_menuView->insertSeparator(insertPostion);
     }
 

Gems/Atom/Tools/AtomToolsFramework/Code/Source/Graph/GraphView.cpp

@@ -192,7 +192,7 @@ namespace AtomToolsFramework
         m_actionDuplicate = makeAction("menuEdit", tr("Duplicate"), [this](){
             GraphCanvas::ScopedGraphUndoBatch undoBatch(m_activeGraphId);
             GraphCanvas::SceneRequestBus::Event(m_activeGraphId, &GraphCanvas::SceneRequests::DuplicateSelection);
-        }, QKeySequence(Qt::CTRL + Qt::Key_D));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::Key_D));
         m_actionDelete = makeAction("menuEdit", tr("Delete"), [this](){
             GraphCanvas::ScopedGraphUndoBatch undoBatch(m_activeGraphId);
             GraphCanvas::SceneRequestBus::Event(m_activeGraphId, &GraphCanvas::SceneRequests::DeleteSelection);
@@ -215,30 +215,30 @@ namespace AtomToolsFramework
         m_actionSelectInputs = makeAction("menuEdit", tr("Select Inputs"), [this](){
             GraphCanvas::SceneRequestBus::Event(
                 m_activeGraphId, &GraphCanvas::SceneRequests::SelectAllRelative, GraphCanvas::ConnectionType::CT_Input);
-        }, QKeySequence(Qt::CTRL + Qt::Key_Left));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::Key_Left));
         m_actionSelectOutputs = makeAction("menuEdit", tr("Select Outputs"), [this](){
             GraphCanvas::SceneRequestBus::Event(
                 m_activeGraphId, &GraphCanvas::SceneRequests::SelectAllRelative, GraphCanvas::ConnectionType::CT_Output);
-        }, QKeySequence(Qt::CTRL + Qt::Key_Right));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::Key_Right));
         m_actionSelectConnected = makeAction("menuEdit", tr("Select Connected"), [this](){
             GraphCanvas::SceneRequestBus::Event(m_activeGraphId, &GraphCanvas::SceneRequests::SelectConnectedNodes);
-        }, QKeySequence(Qt::CTRL + Qt::Key_Up));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::Key_Up));
         m_actionSelectNone = makeAction("menuEdit", tr("Clear Selection"), [this](){
             GraphCanvas::SceneRequestBus::Event(m_activeGraphId, &GraphCanvas::SceneRequests::ClearSelection);
         }, QKeySequence::Deselect);
         m_actionSelectEnable = makeAction("menuEdit", tr("Enable Selection"), [this](){
             GraphCanvas::SceneRequestBus::Event(m_activeGraphId, &GraphCanvas::SceneRequests::EnableSelection);
-        }, QKeySequence(Qt::CTRL + Qt::Key_K, Qt::CTRL + Qt::Key_U));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::Key_K, 0x0 | Qt::CTRL | Qt::Key_U));
         m_actionSelectDisable = makeAction("menuEdit", tr("Disable Selection"), [this](){
             GraphCanvas::SceneRequestBus::Event(m_activeGraphId, &GraphCanvas::SceneRequests::DisableSelection);
-        }, QKeySequence(Qt::CTRL + Qt::Key_K, Qt::CTRL + Qt::Key_C));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::Key_K, 0x0 | Qt::CTRL | Qt::Key_C));
 
         makeSeperator("menuEdit");
         m_actionScreenShot = makeAction("menuEdit", tr("Screenshot"), [this](){
             GraphCanvas::ViewId viewId;
             GraphCanvas::SceneRequestBus::EventResult(viewId, m_activeGraphId, &GraphCanvas::SceneRequests::GetViewId);
             GraphCanvas::ViewRequestBus::Event(viewId, &GraphCanvas::ViewRequests::ScreenshotSelection);
-        }, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_P));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_P));
 
         makeSeperator("menuEdit");
         m_actionAlignTop = makeAction("menuEdit", tr("Align Top"), [this](){
@@ -282,7 +282,7 @@ namespace AtomToolsFramework
             GraphCanvas::ViewId viewId;
             GraphCanvas::SceneRequestBus::EventResult(viewId, m_activeGraphId, &GraphCanvas::SceneRequests::GetViewId);
             GraphCanvas::ViewRequestBus::Event(viewId, &GraphCanvas::ViewRequests::ShowEntireGraph);
-        }, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Down));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Down));
         m_actionZoomIn = makeAction("menuView", tr("Zoom In"), [this](){
             GraphCanvas::ViewId viewId;
             GraphCanvas::SceneRequestBus::EventResult(viewId, m_activeGraphId, &GraphCanvas::SceneRequests::GetViewId);
@@ -297,19 +297,19 @@ namespace AtomToolsFramework
             GraphCanvas::ViewId viewId;
             GraphCanvas::SceneRequestBus::EventResult(viewId, m_activeGraphId, &GraphCanvas::SceneRequests::GetViewId);
             GraphCanvas::ViewRequestBus::Event(viewId, &GraphCanvas::ViewRequests::CenterOnSelection);
-        }, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Up));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Up));
 
         makeSeperator("menuView");
         m_actionGotoStartOfChain = makeAction("menuView", tr("Goto Start Of Chain"), [this](){
             GraphCanvas::ViewId viewId;
             GraphCanvas::SceneRequestBus::EventResult(viewId, m_activeGraphId, &GraphCanvas::SceneRequests::GetViewId);
             GraphCanvas::ViewRequestBus::Event(viewId, &GraphCanvas::ViewRequests::CenterOnStartOfChain);
-        }, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Left));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Left));
         m_actionGotoEndOfChain = makeAction("menuView", tr("Goto End Of Chain"), [this](){
             GraphCanvas::ViewId viewId;
             GraphCanvas::SceneRequestBus::EventResult(viewId, m_activeGraphId, &GraphCanvas::SceneRequests::GetViewId);
             GraphCanvas::ViewRequestBus::Event(viewId, &GraphCanvas::ViewRequests::CenterOnEndOfChain);
-        }, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Right));
+        }, QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Right));
     }
 
     void GraphView::CreateMenus(QMenuBar* menuBar)

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

@@ -82,7 +82,7 @@ namespace ShaderManagementConsole
                         int count = m_statisticData.m_shaderOptionUsage[optionName][valueName];
                         AZStd::string itemText = AZStd::string::format("%s     %d", valueName.GetCStr(), count);
                         auto* cellWidget = new QTableWidgetItem(itemText.c_str());
-                        cellWidget->setToolTip(tr(u8"value \u23B5 usage count of this value"));
+                        cellWidget->setToolTip(tr(reinterpret_cast<const char*>(u8"value \u23B5 usage count of this value")));
                         setItem(row, column, cellWidget);
                         break;
                     }

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

@@ -254,7 +254,7 @@ namespace ShaderManagementConsole
                 setItem(row, column, newItem);
             }
             auto* deleterButton = new QPushButton;
-            deleterButton->setText(u8"\u274C");  // cross sign
+            deleterButton->setText(reinterpret_cast<const char*>(u8"\u274C"));  // cross sign
             deleterButton->setToolTip(tr("delete row"));
             connect(deleterButton, &QPushButton::clicked, this, [this, row](){
                 auto& vec = m_shaderVariantListSourceData.m_shaderVariants;

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

@@ -325,7 +325,7 @@ namespace EMStudio
         // actor file actions
         QAction* openAction = menu->addAction(tr("&Open Actor"), this, &MainWindow::OnFileOpenActor, QKeySequence::Open);
         openAction->setObjectName("EMFX.MainWindow.OpenActorAction");
-        m_mergeActorAction = menu->addAction(tr("&Merge Actor"), this, &MainWindow::OnFileMergeActor, Qt::CTRL + Qt::Key_I);
+        m_mergeActorAction = menu->addAction(tr("&Merge Actor"), this, &MainWindow::OnFileMergeActor, 0x0 | Qt::CTRL | Qt::Key_I);
         m_mergeActorAction->setObjectName("EMFX.MainWindow.MergeActorAction");
         m_saveSelectedActorsAction = menu->addAction(tr("&Save Selected Actors"), this, &MainWindow::OnFileSaveSelectedActors);
         m_saveSelectedActorsAction->setObjectName("EMFX.MainWindow.SaveActorAction");
@@ -453,7 +453,7 @@ namespace EMStudio
         QAction* animGraphLayoutAction = new QAction(
             "AnimGraph",
             this);
-        animGraphLayoutAction->setShortcut(Qt::Key_1 | Qt::AltModifier);
+        animGraphLayoutAction->setShortcut(0x0 | Qt::Key_1 | Qt::AltModifier);
         m_shortcutManager->RegisterKeyboardShortcut(animGraphLayoutAction, layoutGroupName, false);
         connect(animGraphLayoutAction, &QAction::triggered, [this]{ m_applicationMode->setCurrentIndex(0); });
         addAction(animGraphLayoutAction);
@@ -461,7 +461,7 @@ namespace EMStudio
         QAction* animationLayoutAction = new QAction(
             "Animation",
             this);
-        animationLayoutAction->setShortcut(Qt::Key_2 | Qt::AltModifier);
+        animationLayoutAction->setShortcut(0x0 | Qt::Key_2 | Qt::AltModifier);
         m_shortcutManager->RegisterKeyboardShortcut(animationLayoutAction, layoutGroupName, false);
         connect(animationLayoutAction, &QAction::triggered, [this]{ m_applicationMode->setCurrentIndex(1); });
         addAction(animationLayoutAction);
@@ -469,7 +469,7 @@ namespace EMStudio
         QAction* characterLayoutAction = new QAction(
             "Character",
             this);
-        characterLayoutAction->setShortcut(Qt::Key_3 | Qt::AltModifier);
+        characterLayoutAction->setShortcut(0x0 | Qt::Key_3 | Qt::AltModifier);
         m_shortcutManager->RegisterKeyboardShortcut(characterLayoutAction, layoutGroupName, false);
         connect(characterLayoutAction, &QAction::triggered, [this]{ m_applicationMode->setCurrentIndex(2); });
         addAction(characterLayoutAction);

Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/BlendGraphViewWidget.cpp

@@ -51,7 +51,7 @@ namespace EMStudio
             QIcon(":/EMotionFX/AlignLeft.svg"),
             FromStdString(AnimGraphPlugin::s_alignLeftShortcutName),
             this);
-        m_actions[SELECTION_ALIGNLEFT]->setShortcut(Qt::Key_L | Qt::ControlModifier);
+        m_actions[SELECTION_ALIGNLEFT]->setShortcut(0x0 | Qt::Key_L | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNLEFT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[SELECTION_ALIGNLEFT], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignLeft);
 
@@ -59,7 +59,7 @@ namespace EMStudio
             QIcon(":/EMotionFX/AlignRight.svg"),
             FromStdString(AnimGraphPlugin::s_alignRightShortcutName),
             this);
-        m_actions[SELECTION_ALIGNRIGHT]->setShortcut(Qt::Key_R | Qt::ControlModifier);
+        m_actions[SELECTION_ALIGNRIGHT]->setShortcut(0x0 | Qt::Key_R | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNRIGHT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[SELECTION_ALIGNRIGHT], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignRight);
 
@@ -67,7 +67,7 @@ namespace EMStudio
             QIcon(":/EMotionFX/AlignTop.svg"),
             FromStdString(AnimGraphPlugin::s_alignTopShortcutName),
             this);
-        m_actions[SELECTION_ALIGNTOP]->setShortcut(Qt::Key_T | Qt::ControlModifier);
+        m_actions[SELECTION_ALIGNTOP]->setShortcut(0x0 | Qt::Key_T | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNTOP], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[SELECTION_ALIGNTOP], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignTop);
 
@@ -75,7 +75,7 @@ namespace EMStudio
             QIcon(":/EMotionFX/AlignBottom.svg"),
             FromStdString(AnimGraphPlugin::s_alignBottomShortcutName),
             this);
-        m_actions[SELECTION_ALIGNBOTTOM]->setShortcut(Qt::Key_B | Qt::ControlModifier);
+        m_actions[SELECTION_ALIGNBOTTOM]->setShortcut(0x0 | Qt::Key_B | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_ALIGNBOTTOM], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[SELECTION_ALIGNBOTTOM], &QAction::triggered, &m_parentPlugin->GetActionManager(), &AnimGraphActionManager::AlignBottom);
 
@@ -83,7 +83,7 @@ namespace EMStudio
             FromStdString(AnimGraphPlugin::s_selectAllShortcutName),
             this
         );
-        m_actions[SELECTION_SELECTALL]->setShortcut(Qt::Key_A | Qt::ControlModifier);
+        m_actions[SELECTION_SELECTALL]->setShortcut(0x0 | Qt::Key_A | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_SELECTALL], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[SELECTION_SELECTALL], &QAction::triggered, [this]
         {
@@ -98,7 +98,7 @@ namespace EMStudio
             FromStdString(AnimGraphPlugin::s_unselectAllShortcutName),
             this
         );
-        m_actions[SELECTION_UNSELECTALL]->setShortcut(Qt::Key_D | Qt::ControlModifier);
+        m_actions[SELECTION_UNSELECTALL]->setShortcut(0x0 | Qt::Key_D | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[SELECTION_UNSELECTALL], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[SELECTION_UNSELECTALL], &QAction::triggered, [this]
         {
@@ -241,7 +241,7 @@ namespace EMStudio
             FromStdString(AnimGraphPlugin::s_cutShortcutName),
             this
         );
-        m_actions[EDIT_CUT]->setShortcut(Qt::Key_X | Qt::ControlModifier);
+        m_actions[EDIT_CUT]->setShortcut(0x0 | Qt::Key_X | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_CUT], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[EDIT_CUT], &QAction::triggered, this, [this]
         {
@@ -252,7 +252,7 @@ namespace EMStudio
             FromStdString(AnimGraphPlugin::s_copyShortcutName),
             this
         );
-        m_actions[EDIT_COPY]->setShortcut(Qt::Key_C | Qt::ControlModifier);
+        m_actions[EDIT_COPY]->setShortcut(0x0 | Qt::Key_C | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_COPY], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[EDIT_COPY], &QAction::triggered, this, [this]
         {
@@ -263,7 +263,7 @@ namespace EMStudio
             FromStdString(AnimGraphPlugin::s_pasteShortcutName),
             this
         );
-        m_actions[EDIT_PASTE]->setShortcut(Qt::Key_V | Qt::ControlModifier);
+        m_actions[EDIT_PASTE]->setShortcut(0x0 | Qt::Key_V | Qt::ControlModifier);
         shortcutManager->RegisterKeyboardShortcut(m_actions[EDIT_PASTE], AnimGraphPlugin::s_animGraphWindowShortcutGroupName, true);
         connect(m_actions[EDIT_PASTE], &QAction::triggered, this, [this]
         {

Gems/EMotionFX/Code/MCore/Source/CompressedQuaternion.h

@@ -76,10 +76,7 @@ namespace MCore
         StorageType m_x, m_y, m_z, m_w; /**< The compressed/packed quaternion components values. */
 
         // the number of steps within the specified range
-        enum
-        {
-            CONVERT_VALUE = ((1 << (sizeof(StorageType) << 3)) >> 1) - 1
-        };
+        static constexpr const int CONVERT_VALUE = ((1 << (sizeof(StorageType) << 3)) >> 1) - 1;
     };
 
     // include the inline code

Gems/EMotionFX/Code/MCore/Source/StringIdPool.h

@@ -85,6 +85,7 @@ namespace MCore
         AZ::u32 m_index{};
 
         operator AZ::u32() const { return m_index; }
+        bool operator==(const StringIdPoolIndex &rhs) const { return m_index == rhs.m_index; }
         bool operator==(AZ::u32 rhs) const { return m_index == rhs; }
 
         static void Reflect(AZ::ReflectContext* context);

Gems/EMotionFX/Code/Source/Editor/NotificationWidget.cpp

@@ -22,7 +22,7 @@ namespace EMotionFX
         QFrame* headerFrame = new QFrame(this);
         headerFrame->setObjectName("HeaderFrame");
         headerFrame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-        headerFrame->setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
+        headerFrame->setFrameStyle(0x0 | QFrame::StyledPanel | QFrame::Plain);
         headerFrame->setStyleSheet("background-color: rgb(60, 60, 60);");
 
         // Icon widget

Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/AlignmentMenuActions/AlignmentActionsMenuGroup.cpp

@@ -27,22 +27,22 @@ namespace GraphCanvas
         contextMenu->AddActionGroup(AlignmentContextMenuAction::GetAlignmentContextMenuActionGroupId());
 
         m_alignTop = aznew AlignSelectionMenuAction("Align top", GraphUtils::VerticalAlignment::Top, GraphUtils::HorizontalAlignment::None, contextMenu);
-        m_alignTop->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Up));
+        m_alignTop->setShortcut(QKeySequence(0x0 | Qt::SHIFT | Qt::Key_Up));
 
         contextMenu->AddMenuAction(m_alignTop);
 
         m_alignBottom = aznew AlignSelectionMenuAction("Align bottom", GraphUtils::VerticalAlignment::Bottom, GraphUtils::HorizontalAlignment::None, contextMenu);
-        m_alignBottom->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Down));
+        m_alignBottom->setShortcut(QKeySequence(0x0 | Qt::SHIFT | Qt::Key_Down));
 
         contextMenu->AddMenuAction(m_alignBottom);
 
         m_alignLeft = aznew AlignSelectionMenuAction("Align left", GraphUtils::VerticalAlignment::None, GraphUtils::HorizontalAlignment::Left, contextMenu);
-        m_alignLeft->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Left));
+        m_alignLeft->setShortcut(QKeySequence(0x0 | Qt::SHIFT | Qt::Key_Left));
 
         contextMenu->AddMenuAction(m_alignLeft);
 
         m_alignRight = aznew AlignSelectionMenuAction("Align right", GraphUtils::VerticalAlignment::None, GraphUtils::HorizontalAlignment::Right, contextMenu);
-        m_alignRight->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Right));
+        m_alignRight->setShortcut(QKeySequence(0x0 | Qt::SHIFT | Qt::Key_Right));
 
         contextMenu->AddMenuAction(m_alignRight);
 

Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/GraphCanvasGraphicsView/GraphCanvasGraphicsView.cpp

@@ -74,7 +74,7 @@ namespace GraphCanvas
         if (registerShortcuts)
         {
             QAction* centerAction = new QAction(this);
-            centerAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::DownArrow));
+            centerAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::DownArrow));
 
             connect(centerAction, &QAction::triggered, [this]()
             {
@@ -95,7 +95,7 @@ namespace GraphCanvas
 
             {
                 QAction* selectAllInputAction = new QAction(this);
-                selectAllInputAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
+                selectAllInputAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_Left));
 
                 connect(selectAllInputAction, &QAction::triggered, [this]()
                 {
@@ -107,7 +107,7 @@ namespace GraphCanvas
 
             {
                 QAction* selectAllOutputAction = new QAction(this);
-                selectAllOutputAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right));
+                selectAllOutputAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_Right));
 
                 connect(selectAllOutputAction, &QAction::triggered, [this]()
                 {
@@ -119,7 +119,7 @@ namespace GraphCanvas
 
             {
                 QAction* selectAllOutputAction = new QAction(this);
-                selectAllOutputAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
+                selectAllOutputAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_Up));
 
                 connect(selectAllOutputAction, &QAction::triggered, [this]()
                 {
@@ -134,7 +134,7 @@ namespace GraphCanvas
 
             {
                 QAction* gotoStartAction = new QAction(this);
-                gotoStartAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Left));
+                gotoStartAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Left));
 
                 connect(gotoStartAction, &QAction::triggered, [this]()
                 {
@@ -144,7 +144,7 @@ namespace GraphCanvas
 
             {
                 QAction* gotoStartAction = new QAction(this);
-                gotoStartAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Right));
+                gotoStartAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Right));
 
                 connect(gotoStartAction, &QAction::triggered, [this]()
                 {
@@ -154,7 +154,7 @@ namespace GraphCanvas
 
             {
                 QAction* gotoStartAction = new QAction(this);
-                gotoStartAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Up));
+                gotoStartAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_Up));
 
                 connect(gotoStartAction, &QAction::triggered, [this]()
                 {
@@ -165,7 +165,7 @@ namespace GraphCanvas
             // Ctrl+"0" overview shortcut.
             {
                 QAction* keyAction = new QAction(this);
-                keyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
+                keyAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_0));
 
                 connect(keyAction, &QAction::triggered, [this]()
                 {
@@ -184,8 +184,8 @@ namespace GraphCanvas
             // Ctrl+"+" zoom-in shortcut.
             {
                 QAction* keyAction = new QAction(this);
-                keyAction->setShortcuts({ QKeySequence(Qt::CTRL + Qt::Key_Plus),
-                    QKeySequence(Qt::CTRL + Qt::Key_Equal) });
+                keyAction->setShortcuts({ QKeySequence(0x0 | Qt::CTRL | Qt::Key_Plus),
+                    QKeySequence(0x0 | Qt::CTRL | Qt::Key_Equal) });
 
                 connect(keyAction, &QAction::triggered, [this]()
                 {
@@ -197,7 +197,7 @@ namespace GraphCanvas
             // Ctrl+"-" zoom-out shortcut.
             {
                 QAction* keyAction = new QAction(this);
-                keyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Minus));
+                keyAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_Minus));
 
                 connect(keyAction, &QAction::triggered, [this]()
                 {
@@ -210,7 +210,7 @@ namespace GraphCanvas
             // Ctrl+shift+'p' screenshot graph shortcut
             {
                 QAction* keyAction = new QAction(this);
-                keyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_P));
+                keyAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::SHIFT | Qt::Key_P));
 
                 connect(keyAction, &QAction::triggered, [this]()
                 {
@@ -229,7 +229,7 @@ namespace GraphCanvas
                 // ctrl+k, ctrl+u enable selection
                 {
                     QAction* keyAction = new QAction(this);
-                    keyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K, Qt::CTRL + Qt::Key_U));
+                    keyAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_K, 0x0 | Qt::CTRL | Qt::Key_U));
 
                     connect(keyAction, &QAction::triggered, [this]()
                     {
@@ -240,7 +240,7 @@ namespace GraphCanvas
                 // Ctrl+k, ctrl+c disable selection
                 {
                     QAction* keyAction = new QAction(this);
-                    keyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K, Qt::CTRL + Qt::Key_C));
+                    keyAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_K, 0x0 | Qt::CTRL | Qt::Key_C));
 
                     connect(keyAction, &QAction::triggered, [this]()
                     {
@@ -259,7 +259,7 @@ namespace GraphCanvas
             Qt::Key currentKey = keyIndexes[i];
 
             QAction* createBookmarkKeyAction = new QAction(this);
-            createBookmarkKeyAction->setShortcut(QKeySequence(Qt::CTRL + currentKey));
+            createBookmarkKeyAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | currentKey));
 
             connect(createBookmarkKeyAction, &QAction::triggered, [this, i]()
                 {

Gems/LyShine/Code/Editor/EditorCommon.h

@@ -159,7 +159,7 @@ bool ClipboardContainsOurDataType();
 
 #define UICANVASEDITOR_NAME_SHORT   "UiCanvasEditor"
 
-#define UICANVASEDITOR_COORDINATE_SYSTEM_CYCLE_SHORTCUT_KEY_SEQUENCE    QKeySequence(Qt::CTRL + Qt::Key_W)
+#define UICANVASEDITOR_COORDINATE_SYSTEM_CYCLE_SHORTCUT_KEY_SEQUENCE    QKeySequence(0x0 | Qt::CTRL | Qt::Key_W)
 #define UICANVASEDITOR_SNAP_TO_GRID_TOGGLE_SHORTCUT_KEY_SEQUENCE        QKeySequence(Qt::Key_G)
 
 #define UICANVASEDITOR_CANVAS_DIRECTORY "UI/Canvases"

Gems/LyShine/Code/Editor/EditorMenu.cpp

@@ -496,8 +496,8 @@ void EditorWindow::AddMenu_View()
         {
             QAction* action = new QAction("&Fit Canvas", this);
             {
-                action->setShortcuts(QList<QKeySequence>{QKeySequence(Qt::CTRL + Qt::Key_0),
-                                                         QKeySequence(Qt::META + Qt::Key_0)});
+                action->setShortcuts(QList<QKeySequence>{QKeySequence(0x0 | Qt::CTRL | Qt::Key_0),
+                                                         QKeySequence(0x0 | Qt::META | Qt::Key_0)});
             }
             action->setEnabled(canvasLoaded);
             QObject::connect(action,
@@ -515,8 +515,8 @@ void EditorWindow::AddMenu_View()
         {
             QAction* action = new QAction("Actual &Size", this);
             {
-                action->setShortcuts(QList<QKeySequence>{QKeySequence(Qt::CTRL + Qt::Key_1),
-                                                         QKeySequence(Qt::META + Qt::Key_1)});
+                action->setShortcuts(QList<QKeySequence>{QKeySequence(0x0 | Qt::CTRL | Qt::Key_1),
+                                                         QKeySequence(0x0 | Qt::META | Qt::Key_1)});
             }
             action->setEnabled(canvasLoaded);
             QObject::connect(action,
@@ -569,7 +569,7 @@ void EditorWindow::AddMenu_View()
         QAction* action = new QAction("&Rulers", this);
         action->setCheckable(true);
         action->setChecked(GetViewport() ? GetViewport()->AreRulersShown() : false);
-        action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+        action->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_R));
         action->setEnabled(canvasLoaded);
         QObject::connect(action,
             &QAction::triggered,
@@ -587,7 +587,7 @@ void EditorWindow::AddMenu_View()
         QAction* action = new QAction("&Guides", this);
         action->setCheckable(true);
         action->setChecked(GetViewport() ? GetViewport()->AreGuidesShown() : false);
-        action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Semicolon));
+        action->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_Semicolon));
         action->setEnabled(canvasLoaded);
         QObject::connect(action,
             &QAction::triggered,
@@ -720,8 +720,8 @@ void EditorWindow::AddMenu_View()
     {
         QAction* action = new QAction("Reload All Fonts", this);
         {
-            action->setShortcuts(QList<QKeySequence>{QKeySequence(Qt::CTRL + Qt::Key_L),
-                QKeySequence(Qt::META + Qt::Key_L)});
+            action->setShortcuts(QList<QKeySequence>{QKeySequence(0x0 | Qt::CTRL | Qt::Key_L),
+                QKeySequence(0x0 | Qt::META | Qt::Key_L)});
         }
         action->setEnabled(canvasLoaded);
         QObject::connect(action,
@@ -844,7 +844,7 @@ void EditorWindow::AddMenu_Preview()
         }
 
         QAction* action = new QAction(menuItemName, this);
-        action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P));
+        action->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_P));
         action->setEnabled(GetCanvas().IsValid());
         QObject::connect(action,
             &QAction::triggered,

Gems/Multiplayer/Code/Include/Multiplayer/ReplicationWindows/IReplicationWindow.h

@@ -20,7 +20,6 @@ namespace Multiplayer
 
     struct EntityReplicationData 
     {
-        EntityReplicationData() = default;
         NetEntityRole m_netEntityRole = NetEntityRole::InvalidRole;
         float m_priority = 0.0f;
     };

Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp

@@ -1275,7 +1275,7 @@ namespace ScriptCanvasEditor::Nodes
 
             if (slot.IsLatent())
             {
-                executionConfiguration.m_textDecoration = u8"\U0001f552";
+                executionConfiguration.m_textDecoration = reinterpret_cast<const char*>(u8"\U0001f552");
                 executionConfiguration.m_textDecorationToolTip = "This slot will not be executed immediately.";
             }
 
@@ -1302,7 +1302,7 @@ namespace ScriptCanvasEditor::Nodes
 
             if (slot.IsLatent())
             {
-                dataSlotConfiguration.m_textDecoration = u8"\U0001f552";
+                dataSlotConfiguration.m_textDecoration = reinterpret_cast<const char*>(u8"\U0001f552");
                 dataSlotConfiguration.m_textDecorationToolTip = "This slot will not be executed immediately.";
             }
 

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp

@@ -1139,7 +1139,7 @@ namespace ScriptCanvasEditor
 
         {
             QAction* duplicateAction = new QAction(this);
-            duplicateAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
+            duplicateAction->setShortcut(QKeySequence(0x0 | Qt::CTRL | Qt::Key_D));
 
             QObject::connect(duplicateAction, &QAction::triggered, this, &GraphVariablesTableView::OnDuplicate);
 

Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp

@@ -1981,8 +1981,8 @@ namespace ScriptCanvasEditor
         ui->action_AlignLeft->setShortcutContext(Qt::WidgetWithChildrenShortcut);
         ui->action_AlignRight->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 
-        ui->action_ZoomIn->setShortcuts({ QKeySequence(Qt::CTRL + Qt::Key_Plus),
-                                          QKeySequence(Qt::CTRL + Qt::Key_Equal)
+        ui->action_ZoomIn->setShortcuts({ QKeySequence(0x0 | Qt::CTRL | Qt::Key_Plus),
+                                          QKeySequence(0x0 | Qt::CTRL | Qt::Key_Equal)
                                         });
 
         // View Menu

Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp

@@ -73,7 +73,7 @@ namespace ScriptCanvas
             }
         }
 
-        void CheckConversionStringPre(Writer& writer, Grammar::VariableConstPtr source, const Grammar::ConversionByIndex& conversions, size_t index)
+        void CheckConversionStringPre(Writer& writer, [[maybe_unused]] Grammar::VariableConstPtr source, const Grammar::ConversionByIndex& conversions, size_t index)
         {
             auto iter = conversions.find(index);
             if (iter == conversions.end())

Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp

@@ -166,7 +166,7 @@ namespace ScriptEventsEditor
         scriptEventAsset->m_definition.IncreaseVersion();
     }
 
-    void ScriptEventAssetHandler::BeforePropertyEdit(AzToolsFramework::InstanceDataNode* node, AZ::Data::Asset<AZ::Data::AssetData> asset)
+    void ScriptEventAssetHandler::BeforePropertyEdit(AzToolsFramework::InstanceDataNode* node, [[maybe_unused]] AZ::Data::Asset<AZ::Data::AssetData> asset)
     {
         ScriptEventData::VersionedProperty* property = nullptr;
         AzToolsFramework::InstanceDataNode* parent = node;

Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h

@@ -72,11 +72,11 @@ namespace SurfaceData
 
     AZ_INLINE SurfaceTag::operator AZ::Crc32() const
     {
-        return m_surfaceTagCrc;
+        return static_cast<AZ::Crc32>(m_surfaceTagCrc);
     }
 
     AZ_INLINE SurfaceTag::operator AZ::u32() const
     {
-        return static_cast<AZ::u32>(m_surfaceTagCrc);
+        return m_surfaceTagCrc;
     }
 }

Gems/Terrain/Code/Source/TerrainRenderer/TerrainClipmapManager.cpp

@@ -379,7 +379,7 @@ namespace Terrain
     void TerrainClipmapManager::InitializeMacroClipmapBounds(const AZ::Vector2& center)
     {
         m_macroClipmapBounds.resize(m_macroClipmapStackSize);
-        float clipmapToWorldScale = m_config.m_macroClipmapMaxRenderRadius * 2.0f / m_config.m_clipmapSize;
+        float clipmapToWorldScale = m_config.m_macroClipmapMaxRenderRadius * 2.0f / aznumeric_cast<float>(m_config.m_clipmapSize);
         for (int32_t clipmapIndex = m_macroClipmapStackSize - 1; clipmapIndex >= 0; --clipmapIndex)
         {
             ClipmapBoundsDescriptor desc;
@@ -397,7 +397,7 @@ namespace Terrain
     void TerrainClipmapManager::InitializeDetailClipmapBounds(const AZ::Vector2& center)
     {
         m_detailClipmapBounds.resize(m_detailClipmapStackSize);
-        float clipmapToWorldScale = m_config.m_detailClipmapMaxRenderRadius * 2.0f / m_config.m_clipmapSize;
+        float clipmapToWorldScale = m_config.m_detailClipmapMaxRenderRadius * 2.0f / aznumeric_cast<float>(m_config.m_clipmapSize);
         for (int32_t clipmapIndex = m_detailClipmapStackSize - 1; clipmapIndex >= 0; --clipmapIndex)
         {
             ClipmapBoundsDescriptor desc;
@@ -426,7 +426,7 @@ namespace Terrain
         m_clipmapData.m_validMacroClipmapRadius =
             m_clipmapData.m_clipmapSizeFloat / 2.0f - m_clipmapData.m_macroClipmapMarginSize - m_clipmapData.m_extendedClipmapMarginSize;
 
-        float clipmapToWorldScale = m_config.m_macroClipmapMaxRenderRadius * 2.0f / m_config.m_clipmapSize;
+        float clipmapToWorldScale = m_config.m_macroClipmapMaxRenderRadius * 2.0f / aznumeric_cast<float>(m_config.m_clipmapSize);
         for (int32_t clipmapIndex = m_macroClipmapStackSize - 1; clipmapIndex >= 0; --clipmapIndex)
         {
             m_clipmapData.m_clipmapToWorldScale[clipmapIndex].m_macro = clipmapToWorldScale;
@@ -451,7 +451,7 @@ namespace Terrain
         m_clipmapData.m_validDetailClipmapRadius =
             m_clipmapData.m_clipmapSizeFloat / 2.0f - m_clipmapData.m_detailClipmapMarginSize - m_clipmapData.m_extendedClipmapMarginSize;
 
-        float clipmapToWorldScale = m_config.m_detailClipmapMaxRenderRadius * 2.0f / m_config.m_clipmapSize;
+        float clipmapToWorldScale = m_config.m_detailClipmapMaxRenderRadius * 2.0f / aznumeric_cast<float>(m_config.m_clipmapSize);
         for (int32_t clipmapIndex = m_detailClipmapStackSize - 1; clipmapIndex >= 0; --clipmapIndex)
         {
             m_clipmapData.m_clipmapToWorldScale[clipmapIndex].m_detail = clipmapToWorldScale;

Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp

@@ -331,7 +331,7 @@ namespace Terrain
     {
         for (DetailMaterialSurface& surface : materialRegion.m_materialsForSurfaces)
         {
-            if (surface.m_surfaceTag == surfaceTag)
+            if (surface.m_surfaceTag == static_cast<const AZ::Crc32&>(surfaceTag))
             {
                 callback(surface);
                 return true;