birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes for Code

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 14:48:42 -07:00
parent a35464ca08
commit 9245a31196
54 changed files with 97 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorViewportWidget.cpp
+9 -9
View File
@@ -1975,12 +1975,12 @@ Vec3 EditorViewportWidget::ViewToWorld(
{
AZ_PROFILE_FUNCTION(Editor);
AZ_UNUSED(collideWithTerrain)
AZ_UNUSED(onlyTerrain)
AZ_UNUSED(bTestRenderMesh)
AZ_UNUSED(bSkipVegetation)
AZ_UNUSED(bSkipVegetation)
AZ_UNUSED(collideWithObject)
AZ_UNUSED(collideWithTerrain);
AZ_UNUSED(onlyTerrain);
AZ_UNUSED(bTestRenderMesh);
AZ_UNUSED(bSkipVegetation);
AZ_UNUSED(bSkipVegetation);
AZ_UNUSED(collideWithObject);
auto ray = m_renderViewport->ViewportScreenToWorldRay(AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(vp));
if (!ray.has_value())
@@ -2004,9 +2004,9 @@ Vec3 EditorViewportWidget::ViewToWorld(
//////////////////////////////////////////////////////////////////////////
Vec3 EditorViewportWidget::ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh)
{
AZ_UNUSED(vp)
AZ_UNUSED(onlyTerrain)
AZ_UNUSED(bTestRenderMesh)
AZ_UNUSED(vp);
AZ_UNUSED(onlyTerrain);
AZ_UNUSED(bTestRenderMesh);
AZ_PROFILE_FUNCTION(Editor);
Code/Framework/AzCore/AzCore/Math/Guid.h
+1 -1
View File
@@ -66,7 +66,7 @@ typedef const GUID& REFIID;
const GUID name \
= { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
REFGUID GUID_NULL()
inline static REFGUID GUID_NULL()
{
static GUID guid = { 0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} };
return guid;
Code/Framework/AzCore/AzCore/Memory/AllocatorScope.h
+1 -1
View File
@@ -22,7 +22,7 @@ namespace AZ
{
// Note the parameter pack expansion, this creates the equivalent of a fold expression
// For each type, call InitAllocator<T>(), then put 0 in the initializer list
std::initializer_list<int> init{(InitAllocator<Allocators>(), 0)...};
[[maybe_unused]] std::initializer_list<int> init{(InitAllocator<Allocators>(), 0)...};
}
void DeactivateAllocators()
Code/Framework/AzCore/AzCore/RTTI/RTTI.h
+2 -2
View File
@@ -493,7 +493,7 @@ namespace AZ
const void* result = GetTypeId() == asType ? instance : nullptr;
using dummy = bool[];
dummy{ true, (CastInternal<TArgs>(result, instance, asType), true)... };
[[maybe_unused]] dummy d { true, (CastInternal<TArgs>(result, instance, asType), true)... };
return result;
}
@@ -534,7 +534,7 @@ namespace AZ
callback(GetActualUuid(instance), instance);
using dummy = bool[];
dummy{ true, (RttiHelper<TArgs>{}.EnumHierarchy(callback, instance), true)... };
[[maybe_unused]] dummy d = { true, (RttiHelper<TArgs>{}.EnumHierarchy(callback, instance), true)... };
}
TypeTraits GetTypeTraits() const override
{
Code/Framework/AzCore/AzCore/base.h
+1 -1
View File
@@ -293,7 +293,7 @@ namespace AZ
#define AZ_DEFAULT_COPY_MOVE(_Class) AZ_DEFAULT_COPY(_Class) AZ_DEFAULT_MOVE(_Class)
// Macro that can be used to avoid unreferenced variable warnings
#define AZ_UNUSED(x) (void)x;
#define AZ_UNUSED(x) (void)x
#define AZ_DEFINE_ENUM_BITWISE_OPERATORS(EnumType) \
inline constexpr EnumType operator | (EnumType a, EnumType b) \
Code/Framework/AzCore/Tests/AZStd/Variant.cpp
-2
View File
@@ -318,8 +318,6 @@ namespace UnitTest
using TestVariant2 = AZStd::variant<TestAlignedStorage, float, bool, int>;
static_assert(sizeof(TestVariant1) == sizeof(TestVariant2), "with different permutations variants of same types should be the same size");
using UnorderedVariant3 = AZStd::variant<AZStd::unordered_map<AZStd::string, AZStd::string>, TestAlignedStorage>;
constexpr size_t testVariant1Size = sizeof(TestVariant1);
constexpr size_t unorderedVariant3Size = sizeof(UnorderedVariant3);
static_assert(sizeof(TestVariant1) == sizeof(UnorderedVariant3), "with different permutations variants of same types should be the same size");
}
Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp
+1 -1
View File
@@ -297,7 +297,7 @@ TEST_F(AssetDataStreamTest, IsFullyLoaded_FileDoesNotReadAllData_DataIsNotFullyL
using ::testing::_;
ON_CALL(m_mockStreamer, GetReadRequestResult(_, _, _, _))
.WillByDefault([this, incompleteAssetSize](
.WillByDefault([this](
[[maybe_unused]] FileRequestHandle request,
void*& buffer,
AZ::u64& numBytesRead,
Code/Framework/AzCore/Tests/Asset/AssetManagerStreamingTests.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ namespace UnitTest
});
ON_CALL(m_mockStreamer, GetRequestStatus(_))
.WillByDefault([this]([[maybe_unused]] FileRequestHandle request)
.WillByDefault([]([[maybe_unused]] FileRequestHandle request)
{
// Return whatever request status has been set in this class
return IO::IStreamerTypes::RequestStatus::Completed;
Code/Framework/AzCore/Tests/Debug/LocalFileEventLoggerTests.cpp
+3 -1
View File
@@ -226,8 +226,10 @@ namespace AZ::Debug
AZStd::thread threads[totalThreads];
for (size_t threadIndex = 0; threadIndex < totalThreads; ++threadIndex)
{
threads[threadIndex] = AZStd::thread([&startLogging, &totalRecordsWritten, &message, recordsPerThreadCount]()
threads[threadIndex] = AZStd::thread([&startLogging, &message, &totalRecordsWritten]()
{
AZ_UNUSED(message);
while (!startLogging)
{
AZStd::this_thread::yield();
Code/Framework/AzCore/Tests/EBus.cpp
+2 -2
View File
@@ -2837,7 +2837,7 @@ namespace UnitTest
handlerList.emplace_back(i, maxSleep);
}
auto work = [maxSleep, threadCount]()
auto work = []()
{
char sentinel[64] = { 0 };
char* end = sentinel + AZ_ARRAY_SIZE(sentinel);
@@ -2923,7 +2923,7 @@ namespace UnitTest
MyEventGroupImpl handler;
auto work = [maxSleep, &handler]()
auto work = [&handler]()
{
for (int i = 1; i < cycleCount; ++i)
{
Code/Framework/AzCore/Tests/EnumTests.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ namespace UnitTest
auto EnumerateTestEnum = []() constexpr -> bool
{
int count = 0;
for (TestEnumEnumeratorValueAndString enumMember : TestEnumMembers)
for ([[maybe_unused]] TestEnumEnumeratorValueAndString enumMember : TestEnumMembers)
{
++count;
}
Code/Framework/AzCore/Tests/GenericStreamTests.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ public:
// Reroute the mock stream to our output MemoryStream for writing.
ON_CALL(m_mockGenericStream, Write(_, _))
.WillByDefault([this, &outputStream](AZ::IO::SizeType bytes, const void* buffer)
.WillByDefault([&outputStream](AZ::IO::SizeType bytes, const void* buffer)
{
return outputStream.Write(bytes, buffer);
});
Code/Framework/AzCore/Tests/Jobs.cpp
+1 -1
View File
@@ -1361,7 +1361,7 @@ namespace UnitTest
AZ::JobCompletion completion;
// Push a parent job that pushes the work as child jobs (requires the current job, so this is a real world test of "functor with current job as param")
AZ::Job* parentJob = AZ::CreateJobFunction([this, &jobData, JobCount](AZ::Job& thisJob)
AZ::Job* parentJob = AZ::CreateJobFunction([this, &jobData](AZ::Job& thisJob)
{
EXPECT_EQ(m_jobManager->GetCurrentJob(), &thisJob);
Code/Framework/AzCore/Tests/Math/CrcTests.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ namespace Benchmark
// This function only exist to calculate AZ::Crc32 values at compile time
for (auto _ : state)
{
constexpr auto resultArray = Crc32Internal::GenerateTestCrc32Values();
[[maybe_unused]] constexpr auto resultArray = Crc32Internal::GenerateTestCrc32Values();
}
}
Code/Framework/AzCore/Tests/Name/NameTests.cpp
-4
View File
@@ -582,7 +582,6 @@ namespace UnitTest
TEST_F(NameTest, ConcurrencyDataTest_EachThreadCreatesOneName_NoCollision)
{
const uint32_t maxUniqueHashes = std::numeric_limits<uint32_t>::max();
AZ::NameDictionary::Destroy();
AZ::NameDictionary::Create();
@@ -592,7 +591,6 @@ namespace UnitTest
TEST_F(NameTest, ConcurrencyDataTest_EachThreadCreatesOneName_HighCollisions)
{
const uint32_t maxUniqueHashes = 25;
AZ::NameDictionary::Destroy();
AZ::NameDictionary::Create();
@@ -602,7 +600,6 @@ namespace UnitTest
TEST_F(NameTest, ConcurrencyDataTest_EachThreadRepeatedlyCreatesAndReleasesOneName_NoCollision)
{
const uint32_t maxUniqueHashes = std::numeric_limits<uint32_t>::max();
AZ::NameDictionary::Destroy();
AZ::NameDictionary::Create();
@@ -613,7 +610,6 @@ namespace UnitTest
TEST_F(NameTest, ConcurrencyDataTest_EachThreadRepeatedlyCreatesAndReleasesOneName_HighCollisions)
{
const uint32_t maxUniqueHashes = 25;
AZ::NameDictionary::Destroy();
AZ::NameDictionary::Create();
Code/Framework/AzCore/Tests/Rtti.cpp
+2 -3
View File
@@ -171,7 +171,6 @@ namespace UnitTest
AZ_TEST_ASSERT(AzGenericTypeInfo::Uuid<MyClassTemplateType>() == templateUuid);
// Check all combinations return a valid id.
Uuid nullId = Uuid::CreateNull();
AZ_TEST_ASSERT(AzGenericTypeInfo::Uuid<AZStd::array>() == AZ::Uuid("{911B2EA8-CCB1-4F0C-A535-540AD00173AE}"));
AZ_TEST_ASSERT(AzGenericTypeInfo::Uuid<AZStd::bitset>() == AZ::Uuid("{6BAE9836-EC49-466A-85F2-F4B1B70839FB}"));
AZ_TEST_ASSERT(AzGenericTypeInfo::Uuid<AZStd::function>() == AZ::Uuid("{C9F9C644-CCC3-4F77-A792-F5B5DBCA746E}"));
@@ -460,8 +459,8 @@ namespace UnitTest
TEST_F(Rtti, IsAbstract)
{
// compile time proof that the two non-abstract classes are not abstract at compile time:
ExampleFullImplementationClass one;
ExampleCombined two;
[[maybe_unused]] ExampleFullImplementationClass one;
[[maybe_unused]] ExampleCombined two;
ASSERT_NE(GetRttiHelper<ExampleAbstractClass>(), nullptr);
ASSERT_NE(GetRttiHelper<ExampleFullImplementationClass>(), nullptr);
Code/Framework/AzCore/Tests/Serialization/Json/BasicContainerSerializerTests.cpp
-5
View File
@@ -144,11 +144,6 @@ namespace JsonSerializationTests
{
return false;
}
auto compare = [](const int* lhs, const int* rhs) -> bool
{
return *lhs == *rhs;
};
return AZStd::equal(lhs.begin(), lhs.end(), rhs.begin(), SimplePointerTestDescriptionCompare{});
}
};
Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp
+1
View File
@@ -544,6 +544,7 @@ namespace JsonSerializationTests
ResultCode result = this->m_serializer->Store(convertedValue, &value, nullptr,
azrtti_typeid<typename SerializerInfo<TypeParam>::DataType>(), *this->m_jsonSerializationContext);
EXPECT_EQ(Outcomes::Success, result.GetOutcome());
if constexpr (AZStd::is_signed<typename SerializerInfo<TypeParam>::DataType>::value)
{
Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp
-1
View File
@@ -560,7 +560,6 @@ namespace JsonSerializationTests
{
using namespace AZ::JsonSerializationResult;
TemplatedClass<int> instance;
ResultCode result = AZ::JsonSerialization::Store(*m_jsonDocument, m_jsonDocument->GetAllocator(),
nullptr, nullptr, azrtti_typeid<int>(), *m_serializationSettings);
Code/Framework/AzCore/Tests/Serialization/Json/MathMatrixSerializerTests.cpp
+1 -1
View File
@@ -469,6 +469,7 @@ namespace JsonSerializationTests
*this->m_jsonDocument,
*this->m_jsonDeserializationContext);
ASSERT_EQ(Outcomes::Success, result.GetOutcome());
EXPECT_TRUE(defaultValue == output);
}
@@ -503,7 +504,6 @@ namespace JsonSerializationTests
using namespace AZ::JsonSerializationResult;
using Descriptor = typename JsonMathMatrixSerializerTests<TypeParam>::Descriptor;
const auto defaultValue = Descriptor::MatrixType::CreateIdentity();
rapidjson::Value& objectValue = this->m_jsonDocument->SetObject();
auto input = Descriptor::MatrixType::CreateIdentity();
DataHelper::AddData(objectValue, input, this->m_jsonDocument->GetAllocator());
Code/Framework/AzCore/Tests/Streamer/StreamStackEntryConformityTests.h
+1 -1
View File
@@ -250,7 +250,7 @@ namespace AZ::IO
constexpr s32 minValue = std::numeric_limits<s32>::min();
EXPECT_CALL(*mock, UpdateStatus(_))
.WillOnce([minValue](StreamStackEntry::Status& status)
.WillOnce([](StreamStackEntry::Status& status)
{
status.m_numAvailableSlots = minValue;
});
Code/Framework/AzFramework/Tests/ArchiveTests.cpp
+1 -2
View File
@@ -84,7 +84,7 @@ namespace UnitTest
for (AZ::u32 threadIdx = 0; threadIdx < numThreads; ++threadIdx)
{
auto threadFunctor = [&testFunction, testIteration, threadIdx, &successCount]()
auto threadFunctor = [&testFunction, &successCount]()
{
// Add some variability to thread timing by yielding each thread
AZStd::this_thread::yield();
@@ -769,7 +769,6 @@ namespace UnitTest
AZStd::intrusive_ptr<AZ::IO::INestedArchive> pArchive = archive->OpenArchive(testArchivePath, nullptr, AZ::IO::INestedArchive::FLAGS_CREATE_NEW);
EXPECT_NE(nullptr, pArchive);
char fillBuffer[32] = "Test";
EXPECT_EQ(0, pArchive->UpdateFile("foundit.dat", const_cast<char*>("test"), 4, AZ::IO::INestedArchive::METHOD_COMPRESS, AZ::IO::INestedArchive::LEVEL_BEST));
pArchive.reset();
Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
+10 -4
View File
@@ -313,7 +313,7 @@ namespace UnitTest
FillSpawnable(NumEntities);
CreateEntityReferences(refScheme);
auto callback = [this, refScheme, NumEntities]
auto callback = [this, refScheme]
(AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
ValidateEntityReferences(refScheme, NumEntities, entities);
@@ -346,7 +346,7 @@ namespace UnitTest
FillSpawnable(NumEntities);
CreateEntityReferences(refScheme);
auto callback = [this, refScheme, NumEntities]
auto callback = [this, refScheme]
(AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
ValidateEntityReferences(refScheme, NumEntities, entities);
@@ -572,6 +572,8 @@ namespace UnitTest
auto callback =
[this, refScheme, NumEntities](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
AZ_UNUSED(refScheme);
AZ_UNUSED(NumEntities);
ValidateEntityReferences(refScheme, NumEntities, entities);
};
@@ -592,6 +594,8 @@ namespace UnitTest
auto callback =
[this, refScheme, NumEntities](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
AZ_UNUSED(refScheme);
AZ_UNUSED(NumEntities);
ValidateEntityReferences(refScheme, NumEntities, entities);
};
@@ -617,7 +621,7 @@ namespace UnitTest
CreateEntityReferences(refScheme);
auto callback =
[this, refScheme, NumEntities](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
[](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
size_t numElements = entities.size();
@@ -671,7 +675,7 @@ namespace UnitTest
CreateEntityReferences(refScheme);
auto callback =
[this, refScheme, NumEntities](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
[](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
size_t numElements = entities.size();
@@ -719,6 +723,8 @@ namespace UnitTest
auto callback =
[this, refScheme, NumEntities](AzFramework::EntitySpawnTicket::Id, AzFramework::SpawnableConstEntityContainerView entities)
{
AZ_UNUSED(refScheme);
AZ_UNUSED(NumEntities);
ValidateEntityReferences(refScheme, NumEntities, entities);
};
Code/Framework/AzQtComponents/AzQtComponents/Components/DockBarButton.cpp
-1
View File
@@ -141,7 +141,6 @@ namespace AzQtComponents
}
QRect buttonRect = style->subControlRect(QStyle::CC_ToolButton, option, QStyle::SC_ToolButton, widget);
QRect menuRect = style->subControlRect(QStyle::CC_ToolButton, option, QStyle::SC_ToolButtonMenu, widget);
painter->save();
Code/Framework/AzQtComponents/AzQtComponents/Components/FilteredSearchWidget.cpp
+1 -1
View File
@@ -852,7 +852,7 @@ namespace AzQtComponents
{
FilterCriteriaButton* button = createCriteriaButton(filter, index);
connect(button, &FilterCriteriaButton::RequestClose, this, [this, index]() { SetFilterStateByIndex(index, false); });
connect(button, &FilterCriteriaButton::ExtraButtonClicked, this, [this, index](FilterCriteriaButton::ExtraButtonType type)
connect(button, &FilterCriteriaButton::ExtraButtonClicked, this, [](FilterCriteriaButton::ExtraButtonType type)
{
switch (type)
{
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Eyedropper.h
+1 -1
View File
@@ -72,7 +72,7 @@ namespace AzQtComponents
void release(bool selected);
QToolButton* m_button;
[[maybe_unused]] QToolButton* m_button;
int m_contextSize;
int m_sampleSize;
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/GradientSlider.cpp
+1 -2
View File
@@ -30,7 +30,7 @@ GradientSlider::GradientSlider(Qt::Orientation orientation, QWidget* parent)
setMouseTracking(true);
m_colorFunction = [this](qreal value) {
m_colorFunction = [](qreal value) {
return QColor::fromRgbF(value, value, value);
};
@@ -115,7 +115,6 @@ void GradientSlider::mouseMoveEvent(QMouseEvent* event)
int intValue = Slider::valueFromPosition(this, event->pos(), width(), height(), rect().bottom());
qreal value = (aznumeric_cast<qreal, int>(intValue - minimum()) / aznumeric_cast<qreal, int>(maximum() - minimum()));
QColor rgb = m_colorFunction(value);
const QString toolTipText = m_toolTipFunction(value);
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Slider.cpp
+2 -2
View File
@@ -490,11 +490,11 @@ QRect Slider::sliderGrooveRect(const Style* style, const QStyleOptionSlider* opt
return {};
}
bool Slider::polish(Style* style, QWidget* widget, const Slider::Config& config)
bool Slider::polish([[maybe_unused]] Style* style, QWidget* widget, const Slider::Config& config)
{
Q_UNUSED(config);
auto polishSlider = [style](auto slider)
auto polishSlider = [](auto slider)
{
// Qt's stylesheet parsing doesn't set custom properties on things specified via
// pseudo-states, such as horizontal/vertical, so we implement our own
Code/Framework/AzQtComponents/AzQtComponents/Components/WindowDecorationWrapper.cpp
-1
View File
@@ -65,7 +65,6 @@ namespace AzQtComponents
return false;
}
const quint16 currentMajorVersion = 2;
quint16 majorVersion = 0;
quint16 minorVersion = 0;
Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber.h
+1 -1
View File
@@ -31,7 +31,7 @@ namespace AzQtComponents
private:
QSize m_size;
Eyedropper* m_owner;
[[maybe_unused]] Eyedropper* m_owner;
QScopedPointer<Internal> m_internal;
};
Code/Framework/AzQtComponents/AzQtComponents/Utilities/ScreenGrabber_win.cpp
+1 -1
View File
@@ -217,7 +217,7 @@ namespace AzQtComponents
}
ScreenGrabber::ScreenGrabber(const QSize size, Eyedropper* parent /* = nullptr */)
: QObject(static_cast<QObject*>(parent))
: QObject(parent)
, m_size(size)
, m_owner(parent)
{
Code/Framework/AzTest/AzTest/Utils.cpp
+1
View File
@@ -121,6 +121,7 @@ namespace AZ
char** SplitCommandLine(int& size, char* const cmdLine)
{
std::vector<char*> tokens;
[[maybe_unused]] char* next_token = nullptr;
char* tok = azstrtok(cmdLine, 0, " ", &next_token);
while (tok != NULL)
{
Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
-5
View File
@@ -87,11 +87,6 @@ namespace AzToolsFramework
{
namespace Internal
{
static const char* s_engineConfigFileName = "engine.json";
static const char* s_engineConfigEngineVersionKey = "O3DEVersion";
static const char* s_startupLogWindow = "Startup";
template<typename IdContainerType>
void DeleteEntities(const IdContainerType& entityIds)
{
Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp
+28
View File
@@ -939,6 +939,34 @@ namespace AzToolsFramework
jobinfo.m_warningCount = jobDatabaseEntry.m_warningCount;
jobinfo.m_errorCount = jobDatabaseEntry.m_errorCount;
}
bool GetDatabaseInfoResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::databaseInfoHandler handler);
bool GetScanFolderResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::scanFolderHandler handler);
bool GetSourceResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::sourceHandler handler);
bool GetSourceAndScanfolderResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::combinedSourceScanFolderHandler handler);
bool GetSourceDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::sourceFileDependencyHandler handler);
bool GetJobResultSimple(const char* name, SQLite::Statement* statement, AssetDatabaseConnection::jobHandler handler);
bool GetJobResult(
const char* callName,
SQLite::Statement* statement,
AssetDatabaseConnection::jobHandler handler,
AZ::Uuid builderGuid = AZ::Uuid::CreateNull(),
const char* jobKey = nullptr,
AssetSystem::JobStatus status = AssetSystem::JobStatus::Any);
bool GetProductResultSimple(const char* name, SQLite::Statement* statement, AssetDatabaseConnection::productHandler handler);
bool GetProductResult(
const char* callName,
SQLite::Statement* statement,
AssetDatabaseConnection::productHandler handler,
AZ::Uuid builderGuid = AZ::Uuid::CreateNull(),
const char* jobKey = nullptr,
AssetSystem::JobStatus status = AssetSystem::JobStatus::Any);
bool GetLegacySubIDsResult(const char* callname, SQLite::Statement* statement, AssetDatabaseConnection::legacySubIDsHandler handler);
bool GetProductDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::productDependencyHandler handler);
bool GetProductDependencyAndPathResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::productDependencyAndPathHandler handler);
bool GetMissingProductDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::missingProductDependencyHandler handler);
bool GetCombinedDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::combinedProductDependencyHandler handler);
bool GetFileResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::fileHandler handler);
}
//////////////////////////////////////////////////////////////////////////
Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h
-20
View File
@@ -655,26 +655,6 @@ namespace AzToolsFramework
// before every query, since validating it essentially must makes sure it exists.
AZStd::unordered_set<AZStd::string> m_validatedTables;
};
namespace
{
//boiler plate
bool GetDatabaseInfoResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::databaseInfoHandler handler);
bool GetScanFolderResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::scanFolderHandler handler);
bool GetSourceResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::sourceHandler handler);
bool GetSourceAndScanfolderResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::combinedSourceScanFolderHandler handler);
bool GetSourceDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::sourceFileDependencyHandler handler);
bool GetJobResultSimple(const char* name, SQLite::Statement* statement, AssetDatabaseConnection::jobHandler handler);
bool GetJobResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::jobHandler handler, AZ::Uuid builderGuid = AZ::Uuid::CreateNull(), const char* jobKey = nullptr, AssetSystem::JobStatus status = AssetSystem::JobStatus::Any);
bool GetProductResultSimple(const char* name, SQLite::Statement* statement, AssetDatabaseConnection::productHandler handler);
bool GetProductResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::productHandler handler, AZ::Uuid builderGuid = AZ::Uuid::CreateNull(), const char* jobKey = nullptr, AssetSystem::JobStatus status = AssetSystem::JobStatus::Any);
bool GetLegacySubIDsResult(const char* callname, SQLite::Statement* statement, AssetDatabaseConnection::legacySubIDsHandler handler);
bool GetProductDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::productDependencyHandler handler);
bool GetProductDependencyAndPathResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::productDependencyAndPathHandler handler);
bool GetMissingProductDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::missingProductDependencyHandler handler);
bool GetCombinedDependencyResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::combinedProductDependencyHandler handler);
bool GetFileResult(const char* callName, SQLite::Statement* statement, AssetDatabaseConnection::fileHandler handler);
}
} // namespace AssetDatabase
}// namespace AzToolsFramework
Code/Framework/AzToolsFramework/AzToolsFramework/Component/EditorComponentAPIComponent.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ namespace AzToolsFramework
m_serializeContext->EnumerateDerived<AZ::Component>(
[&typeNameList, entityType](const AZ::SerializeContext::ClassData* componentClass, const AZ::Uuid& knownType) -> bool
{
AZ_UNUSED(knownType)
AZ_UNUSED(knownType);
if (!componentClass->m_editData)
{
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp
+1 -1
View File
@@ -1324,7 +1324,7 @@ namespace AzToolsFramework
AZ::SliceComponent::EntityAncestorList::const_iterator ancestorIter = ancestors.begin();
// Skip the first, that would be a regular slice root and not a subslice root, which was already checked.
++ancestorIter;
for (ancestorIter; ancestorIter != ancestors.end(); ++ancestorIter)
for (; ancestorIter != ancestors.end(); ++ancestorIter)
{
const AZ::SliceComponent::Ancestor& ancestor = *ancestorIter;
if (!ancestor.m_entity || !SliceUtilities::IsRootEntity(*ancestor.m_entity))
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
-1
View File
@@ -98,7 +98,6 @@ namespace AzToolsFramework
void SliceEditorEntityOwnershipService::OnSlicePreInstantiate(const AZ::Data::AssetId& sliceAssetId, const AZ::SliceComponent::SliceInstanceAddress& sliceAddress)
{
AZ_PROFILE_FUNCTION(AzToolsFramework);
const AzFramework::SliceInstantiationTicket ticket = *AzFramework::SliceInstantiationResultBus::GetCurrentBusId();
// Start an undo that will wrap the entire slice instantiation event (unable to do this at a higher level since this is queued up by AzFramework and there's no undo concept at that level)
ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::Bus::Events::BeginUndoBatch, "Slice Instantiation");
Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp
+1 -1
View File
@@ -895,7 +895,7 @@ namespace AzToolsFramework
// calculate average position of selected vertices for translation manipulator
MidpointCalculator midpointCalculator;
m_translationManipulator->Process(
[this, &midpointCalculator, fixedVertices](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
[&midpointCalculator, fixedVertices](typename IndexedTranslationManipulator<Vertex>::VertexLookup& vertex)
{
Vertex v;
bool found = false;
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
-2
View File
@@ -262,8 +262,6 @@ namespace AzToolsFramework
void InstanceToTemplatePropagator::AddPatchesToLink(const PrefabDom& patches, Link& link)
{
PrefabDom& linkDom = link.GetLinkDom();
PrefabDomValueReference linkPatchesReference =
PrefabDomUtils::FindPrefabDomValue(linkDom, PrefabDomUtils::PatchesName);
/*
If the original allocator the patches were created with gets destroyed, then the patches would become garbage in the
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
-3
View File
@@ -1298,9 +1298,6 @@ namespace AzToolsFramework
command->RunRedo();
}
const auto instanceTemplateId = instancePtr->GetTemplateId();
auto parentContainerEntityId = parentInstance.GetContainerEntityId();
instancePtr->DetachNestedInstances(
[&](AZStd::unique_ptr<Instance> detachedNestedInstance)
{
Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
+2 -4
View File
@@ -461,7 +461,7 @@ namespace AzToolsFramework
msgBox.setStandardButtons(QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Yes);
msgBox.setDetailedText(message.c_str());
const int response = msgBox.exec();
msgBox.exec();
if (msgBox.clickedButton() == moveButton)
{
@@ -2043,7 +2043,7 @@ namespace AzToolsFramework
QAction* confirmSelected = new QAction(detachMenu);
confirmationMessageBox->addAction(confirmSelected);
QObject::connect(reassignToAction, &QAction::triggered, [reassignToAction, confirmationMessageBox, selectedEntity, ancestors, currentAncestorIndex]() mutable
QObject::connect(reassignToAction, &QAction::triggered, [confirmationMessageBox, ancestors, currentAncestorIndex]() mutable
{
if (confirmationMessageBox->exec() == QDialog::Accepted)
{
@@ -4200,8 +4200,6 @@ namespace AzToolsFramework
if (canPush)
{
AZ::Data::AssetId targetSliceAssetId = sliceAncestryToPushTo.at(0).m_sliceAddress.GetReference()->GetSliceAsset().GetId();
//remember we're trying to push to this root, so we don't try to push to any others
size_t ancestrySize = sliceAncestryToPushTo.size();
rootAncestorPushList.push_back(sliceAncestryToPushTo[ancestrySize-1].m_sliceAddress.GetReference()->GetSliceAsset().GetId());
Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp
-1
View File
@@ -23,7 +23,6 @@ namespace AzToolsFramework
LoadingThumbnail::LoadingThumbnail()
: Thumbnail(MAKE_TKEY(ThumbnailKey))
, m_angle(0)
{
auto absoluteIconPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / LoadingIconPath;
m_loadingMovie.setFileName(absoluteIconPath.c_str());
Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.h
-1
View File
@@ -37,7 +37,6 @@ namespace AzToolsFramework
void OnTick(float deltaTime, AZ::ScriptTimePoint /*time*/) override;
private:
float m_angle;
QMovie m_loadingMovie;
};
} // namespace Thumbnailer
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/LayerUiHandler.cpp
-3
View File
@@ -111,9 +111,6 @@ namespace AzToolsFramework
painter, option.rect.left() - 1, option.rect.top(), option.rect.bottom(), m_layerBorderBottomColor, layerColor);
}
QModelIndex nameColumn = index.sibling(index.row(), EntityOutlinerListModel::Column::ColumnName);
QModelIndex sibling = index.sibling(index.row() + 1, index.column());
QPoint lineBottomLeft(option.rect.bottomLeft());
QPoint lineTopLeft(option.rect.topLeft());
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
+1 -5
View File
@@ -1106,8 +1106,6 @@ namespace AzToolsFramework
QMimeData* EntityOutlinerListModel::mimeData(const QModelIndexList& indexes) const
{
AZ_PROFILE_FUNCTION(AzToolsFramework);
AZ::TypeId uuid1 = AZ::AzTypeInfo<AZ::Entity>::Uuid();
AZ::TypeId uuid2 = AZ::AzTypeInfo<EditorEntityIdContainer>::Uuid();
EditorEntityIdContainer entityIdList;
for (const QModelIndex& index : indexes)
@@ -1334,13 +1332,11 @@ namespace AzToolsFramework
QueueEntityUpdate(entityId);
}
void EntityOutlinerListModel::OnEntityInfoUpdatedRemoveChildBegin(AZ::EntityId parentId, AZ::EntityId childId)
void EntityOutlinerListModel::OnEntityInfoUpdatedRemoveChildBegin([[maybe_unused]] AZ::EntityId parentId, [[maybe_unused]] AZ::EntityId childId)
{
//add/remove operations trigger selection change signals which assert and break undo/redo operations in progress in inspector etc.
//so disallow selection updates until change is complete
emit EnableSelectionUpdates(false);
auto parentIndex = GetIndexFromEntity(parentId);
auto childIndex = GetIndexFromEntity(childId);
beginResetModel();
}
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+7 -7
View File
@@ -157,7 +157,7 @@ namespace AzToolsFramework
QAction* createAction = menu->addAction(QObject::tr("Create Prefab..."));
createAction->setToolTip(QObject::tr("Creates a prefab out of the currently selected entities."));
QObject::connect(createAction, &QAction::triggered, createAction, [this, selectedEntities] {
QObject::connect(createAction, &QAction::triggered, createAction, [selectedEntities] {
ContextMenu_CreatePrefab(selectedEntities);
});
}
@@ -171,7 +171,7 @@ namespace AzToolsFramework
instantiateAction->setToolTip(QObject::tr("Instantiates a prefab file in the scene."));
QObject::connect(
instantiateAction, &QAction::triggered, instantiateAction, [this] { ContextMenu_InstantiatePrefab(); });
instantiateAction, &QAction::triggered, instantiateAction, [] { ContextMenu_InstantiatePrefab(); });
}
menu->addSeparator();
@@ -196,7 +196,7 @@ namespace AzToolsFramework
QAction* editAction = menu->addAction(QObject::tr("Edit Prefab"));
editAction->setToolTip(QObject::tr("Edit the prefab in focus mode."));
QObject::connect(editAction, &QAction::triggered, editAction, [this, selectedEntity] {
QObject::connect(editAction, &QAction::triggered, editAction, [selectedEntity] {
ContextMenu_EditPrefab(selectedEntity);
});
@@ -213,7 +213,7 @@ namespace AzToolsFramework
QAction* saveAction = menu->addAction(QObject::tr("Save Prefab to file"));
saveAction->setToolTip(QObject::tr("Save the changes to the prefab to disk."));
QObject::connect(saveAction, &QAction::triggered, saveAction, [this, selectedEntity] {
QObject::connect(saveAction, &QAction::triggered, saveAction, [selectedEntity] {
ContextMenu_SavePrefab(selectedEntity);
});
@@ -229,7 +229,7 @@ namespace AzToolsFramework
}
QAction* deleteAction = menu->addAction(QObject::tr("Delete"));
QObject::connect(deleteAction, &QAction::triggered, deleteAction, [this] { ContextMenu_DeleteSelected(); });
QObject::connect(deleteAction, &QAction::triggered, deleteAction, [] { ContextMenu_DeleteSelected(); });
if (selectedEntities.size() == 0 ||
(selectedEntities.size() == 1 && s_prefabPublicInterface->IsLevelInstanceContainerEntity(selectedEntities[0])))
{
@@ -247,7 +247,7 @@ namespace AzToolsFramework
QAction* detachPrefabAction = menu->addAction(QObject::tr("Detach Prefab..."));
QObject::connect(
detachPrefabAction, &QAction::triggered, detachPrefabAction,
[this, selectedEntity]
[selectedEntity]
{
ContextMenu_DetachPrefab(selectedEntity);
});
@@ -994,7 +994,7 @@ namespace AzToolsFramework
msgBox.setStandardButtons(QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Yes);
msgBox.setDetailedText(message.c_str());
const int response = msgBox.exec();
msgBox.exec();
if (msgBox.clickedButton() == moveButton)
{
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+1 -3
View File
@@ -2491,7 +2491,7 @@ namespace AzToolsFramework
QAction* revertAction = revertMenu->addAction(QObject::tr("Entity"));
revertAction->setToolTip(QObject::tr("This will revert all component properties on this entity to the last saved."));
QObject::connect(revertAction, &QAction::triggered, [this, relevantEntities]
QObject::connect(revertAction, &QAction::triggered, [relevantEntities]
{
SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
&SliceEditorEntityOwnershipServiceRequests::ResetEntitiesToSliceDefaults, relevantEntities);
@@ -4394,7 +4394,6 @@ namespace AzToolsFramework
{
ResetDrag(event);
Qt::MouseButtons realButtons = QApplication::mouseButtons();
if (QApplication::overrideCursor() && !(event->buttons() & Qt::LeftButton))
{
QApplication::restoreOverrideCursor();
@@ -4606,7 +4605,6 @@ namespace AzToolsFramework
bool EntityPropertyEditor::GetComponentsAtDropEventPosition(QDropEvent* event, AZ::Entity::ComponentArrayType& targetComponents)
{
const QPoint globalPos(mapToGlobal(event->pos()));
const QRect globalRect(GetInflatedRectFromPoint(globalPos, kComponentEditorDropTargetPrecision));
//get component editor(s) where drop will occur
ComponentEditor* targetComponentEditor = GetReorderDropTarget(
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+1 -1
View File
@@ -548,7 +548,7 @@ namespace AzToolsFramework
// Connect pressed to opening the error dialog
// Must capture this for call to QObject::connect
connect(m_errorButton, &QPushButton::pressed, this, [this, errorLog]() {
connect(m_errorButton, &QPushButton::pressed, this, [errorLog]() {
// Create the dialog for the log panel, and set the layout
QDialog* logDialog = new QDialog();
logDialog->setMinimumSize(1024, 400);
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp
+1 -1
View File
@@ -2141,7 +2141,7 @@ namespace AzToolsFramework
AZStd::shared_ptr<void> keyToAdd(nullptr);
bool createdElement = pContainerNode->CreateContainerElement(CreateContainerElementSelectClassCallback,
[this, pContainerNode, promptForValue, &keyToAdd](void* dataPtr, const AZ::SerializeContext::ClassElement* classElement, bool noDefaultData, AZ::SerializeContext*) -> bool
[pContainerNode, promptForValue, &keyToAdd](void* dataPtr, const AZ::SerializeContext::ClassElement* classElement, bool noDefaultData, AZ::SerializeContext*) -> bool
{
bool handled = false;
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp
+1 -1
View File
@@ -2529,7 +2529,7 @@ namespace AzToolsFramework
AZ_Warning("SlicePush", levelSlice, "SlicePushWidget::CalculateReferenceCount could not find root slice, displayed counts will be inaccurate!");
size_t instanceCount = 0;
AZ::Data::AssetBus::EnumerateHandlersId(assetId,
[&instanceCount, assetId, levelSlice] (AZ::Data::AssetEvents* handler) -> bool
[&instanceCount, assetId] (AZ::Data::AssetEvents* handler) -> bool
{
AZ::SliceComponent* component = azrtti_cast<AZ::SliceComponent*>(handler);
if (component)
Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx
-1
View File
@@ -132,7 +132,6 @@ namespace AzToolsFramework
QPointer<QAbstractItemModel> m_dataModel;
QPointer<QItemSelectionModel> m_selectionModel;
AZStd::intrusive_ptr<QTreeViewStateSaverData> m_data;
bool m_defaultToExpandIndexes = false;
Q_DISABLE_COPY(QTreeViewStateSaver)
};
Code/Legacy/CryCommon/CryLibrary.h
+2 -2
View File
@@ -97,14 +97,14 @@ static const char* GetModulePath()
return getenv(gEnvName);
}
void SetModulePath(const char* pModulePath)
inline static void SetModulePath(const char* pModulePath)
{
setenv(gEnvName, pModulePath ? pModulePath : "", true);
}
// bInModulePath is only ever set to false in RC, because rc needs to load dlls from a $PATH that
// it has modified to include ..
HMODULE CryLoadLibrary(const char* libName, bool bLazy = false, bool bInModulePath = true)
inline static HMODULE CryLoadLibrary(const char* libName, bool bLazy = false, bool bInModulePath = true)
{
const char* libPath = nullptr;
char pathBuffer[MAX_PATH] = {0};
Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ namespace LegacyLevelSystem
AZ_CONSOLEFREEFUNC(UnloadLevel, AZ::ConsoleFunctorFlags::Null, "Unloads the current level");
//------------------------------------------------------------------------
SpawnableLevelSystem::SpawnableLevelSystem(ISystem* pSystem)
SpawnableLevelSystem::SpawnableLevelSystem([[maybe_unused]] ISystem* pSystem)
{
CRY_ASSERT(pSystem);