From 6bdef504446f39e73bbe558ebb4e086752271320 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 23 Aug 2021 13:00:45 -0700 Subject: [PATCH] Code/Framework Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp | 1 - Code/Framework/AzCore/AzCore/Debug/Trace.cpp | 1 - Code/Framework/AzCore/Tests/AZStd/Pair.cpp | 1 - .../Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp | 2 +- .../Tests/Serialization/Json/MathMatrixSerializerTests.cpp | 2 +- Code/Framework/AzCore/Tests/TaskTests.cpp | 1 + .../AzFramework/AzFramework/Archive/ArchiveFileIO.cpp | 1 - Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp | 2 +- Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp | 2 ++ .../AzQtComponents/AzQtComponents/Components/DockTabBar.cpp | 2 -- .../AzQtComponents/Components/Widgets/Card.cpp | 5 ----- .../AzToolsFramework/Manipulators/EditorVertexSelection.cpp | 2 +- 12 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp index 1fdd249138..658021b018 100644 --- a/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp +++ b/Code/Framework/AzCore/AzCore/Debug/EventTraceDriller.cpp @@ -26,7 +26,6 @@ namespace AZ const u32 Timestamp = AZ_CRC("Timestamp", 0xa5d6e63e); const u32 Duration = AZ_CRC("Duration", 0x865f80c0); const u32 Instant = AZ_CRC("Instant", 0x0e9047ad); - const u32 InstantScope = AZ_CRC("InstantScope", 0xed4bfb0e); } EventTraceDriller::EventTraceDriller() diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp index bd3b12a3b8..74ecee40e5 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp @@ -66,7 +66,6 @@ namespace AZ static const int assertLevel_log = 1; static const int assertLevel_nativeUI = 2; static const int assertLevel_crash = 3; - static const int logLevel_errorWarning = 1; static const int logLevel_full = 2; static AZ::EnvironmentVariable> g_ignoredAsserts; static AZ::EnvironmentVariable g_assertVerbosityLevel; diff --git a/Code/Framework/AzCore/Tests/AZStd/Pair.cpp b/Code/Framework/AzCore/Tests/AZStd/Pair.cpp index 53786d20da..213cb8b17d 100644 --- a/Code/Framework/AzCore/Tests/AZStd/Pair.cpp +++ b/Code/Framework/AzCore/Tests/AZStd/Pair.cpp @@ -68,7 +68,6 @@ namespace UnitTest static constexpr size_t max_expected_size = MaxExpectedSize; }; - constexpr size_t pairSize = sizeof(AZStd::compressed_pair); using CompressedPairTestConfigs = ::testing::Types< CompressedPairTestConfig , CompressedPairTestConfig diff --git a/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp index a842626e18..6d572a02a3 100644 --- a/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp +++ b/Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp @@ -639,7 +639,7 @@ namespace AZ::IO path.InitFromAbsolutePath(m_dummyFilepath); request->CreateRead(nullptr, buffer, unalignedSize + 4, path, unalignedOffset, unalignedSize); - auto callback = [&fileSize, unalignedOffset, unalignedSize, this](const FileRequest& request) + auto callback = [unalignedOffset, unalignedSize, this](const FileRequest& request) { EXPECT_EQ(request.GetStatus(), AZ::IO::IStreamerTypes::RequestStatus::Completed); auto& readRequest = AZStd::get(request.GetCommand()); diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp index be51b3bf74..3cb316f472 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp +++ b/Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp @@ -469,7 +469,7 @@ namespace JsonSerializationTests *this->m_jsonDocument, *this->m_jsonDeserializationContext); - ASSERT_EQ(Outcomes::Success, result.GetOutcome()); + ASSERT_EQ(Outcomes::DefaultsUsed, result.GetOutcome()); EXPECT_TRUE(defaultValue == output); } diff --git a/Code/Framework/AzCore/Tests/TaskTests.cpp b/Code/Framework/AzCore/Tests/TaskTests.cpp index f2ca484df3..f65dffcd99 100644 --- a/Code/Framework/AzCore/Tests/TaskTests.cpp +++ b/Code/Framework/AzCore/Tests/TaskTests.cpp @@ -225,6 +225,7 @@ namespace UnitTest defaultTD, [td = AZStd::move(td)] { + AZ_UNUSED(td); }); task.Invoke(); // Destructor should not have run yet (except on moved-from instances) diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp index c5e3bc9315..55f7640785 100644 --- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp +++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFileIO.cpp @@ -16,7 +16,6 @@ namespace AZ::IO { - constexpr size_t ArchiveFileiOMaxBuffersize = 16 * 1024; ArchiveFileIO::ArchiveFileIO(IArchive* archive) : m_archive(archive) { diff --git a/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp index c402e6c5bc..f820ee56ed 100644 --- a/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp +++ b/Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp @@ -366,7 +366,7 @@ namespace AzFramework AZStd::set tags; AZStd::string resolvedFilePath = ResolveFilePath(filePath); - auto found = AZStd::find_if(m_fileTagsMap.begin(), m_fileTagsMap.end(), [filePath, resolvedFilePath](auto& entry) -> bool + auto found = AZStd::find_if(m_fileTagsMap.begin(), m_fileTagsMap.end(), [resolvedFilePath](auto& entry) -> bool { return resolvedFilePath == ResolveFilePath(entry.first); }); diff --git a/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp b/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp index 25bc31b760..3ac1b91144 100644 --- a/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp +++ b/Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp @@ -27,7 +27,9 @@ namespace AZ const char* const NetworkFileIOChannel = "NetworkFileIO"; #ifndef REMOTEFILEIO_IS_NETWORKFILEIO const char* const RemoteFileIOChannel = "RemoteFileIO"; + #ifdef REMOTEFILEIO_SYNC_CHECK const char* const RemoteFileCacheChannel = "RemoteFileCache"; + #endif #endif const size_t READ_CHUNK_SIZE = 1024 * 256; diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp index 2574e1b05a..127163f056 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/DockTabBar.cpp @@ -31,8 +31,6 @@ static const int g_closeButtonOffset = g_closeButtonWidth + AzQtComponents::Dock static const QColor g_tabIndicatorUnderlayColor(Qt::black); // Constant for the opacity of our tab indicator underlay static const qreal g_tabIndicatorUnderlayOpacity = 0.75; -// Constant for the duration of our tab animations (in milliseconds) -static const int g_tabAnimationDurationMS = 250; namespace AzQtComponents diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp index a4ab3c5e5d..40c0a1d55a 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.cpp @@ -25,11 +25,6 @@ namespace AzQtComponents { - namespace CardConstants - { - static const char* kPropertySelected = "selected"; - } - static QPixmap ApplyAlphaToPixmap(const QPixmap& pixmap, float alpha) { QImage image = pixmap.toImage().convertToFormat(QImage::Format_ARGB32); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp index 9bb452eb71..81f573672b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp @@ -1306,7 +1306,7 @@ namespace AzToolsFramework void EditorVertexSelectionVariable::PrepareActions() { ActionOverride deleteAction = CreateDeleteAction( - s_deleteVerticesTitle, s_duplicateVerticesDesc, + s_deleteVerticesTitle, s_deleteVerticesDesc, [this]() { DestroySelected();