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

Modernization + AZStd::function compare fix. (#3680)

Browse Source 
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-09-02 21:55:09 +02:00
committed by GitHub
parent b3c8b0f5f3
commit 567c0ae24d
150 changed files with 865 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ namespace UnitTest
delete m_application;
}
AZ::Data::AssetInfo GetAssetInfoById(const AZ::Data::AssetId& id)
AZ::Data::AssetInfo GetAssetInfoById(const AZ::Data::AssetId& id) override
{
auto foundIter = m_assetRegistry->m_assetIdToInfo.find(id);
if (foundIter != m_assetRegistry->m_assetIdToInfo.end())
Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp
+1 -1
View File
@@ -1202,7 +1202,7 @@ namespace UnitTest
AZ_COMPONENT(HiddenComponent, "{E4D2AD8B-3930-46FC-837A-8DDFCA0FB1AF}", AzToolsFramework::Components::EditorComponentBase);
static Component* s_wasDeleted;
virtual ~HiddenComponent()
~HiddenComponent() override
{
s_wasDeleted = this;
}
Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ namespace AzToolsFramework
{
}
virtual ~EntitySearch_TestComponent1() override
~EntitySearch_TestComponent1() override
{}
private:
@@ -123,7 +123,7 @@ namespace AzToolsFramework
{
}
virtual ~EntitySearch_TestComponent2() override
~EntitySearch_TestComponent2() override
{}
private:
Code/Framework/AzToolsFramework/Tests/EntityIdQLabelTests.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ namespace UnitTest
AzToolsFramework::EditorRequests::Bus::Handler::BusConnect();
}
~EditorRequestHandlerTest()
~EditorRequestHandlerTest() override
{
AzToolsFramework::EditorRequests::Bus::Handler::BusDisconnect();
}
Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp
+3 -3
View File
@@ -67,7 +67,7 @@ namespace UnitTest
services.push_back(AZ_CRC("InspectorTestService1"));
}
virtual ~Inspector_TestComponent1() override
~Inspector_TestComponent1() override
{
}
@@ -136,7 +136,7 @@ namespace UnitTest
services.push_back(AZ_CRC("InspectorTestService2"));
}
virtual ~Inspector_TestComponent2() override
~Inspector_TestComponent2() override
{
}
@@ -205,7 +205,7 @@ namespace UnitTest
services.push_back(AZ_CRC("InspectorTestService3"));
}
virtual ~Inspector_TestComponent3() override
~Inspector_TestComponent3() override
{
}
Code/Framework/AzToolsFramework/Tests/FileFunc.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ namespace UnitTest
class FileFuncTest : public ScopedAllocatorSetupFixture
{
public:
void SetUp()
void SetUp() override
{
m_prevFileIO = AZ::IO::FileIOBase::GetInstance();
AZ::IO::FileIOBase::SetInstance(nullptr);
Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp
+21 -21
View File
@@ -104,15 +104,15 @@ namespace UnitTest
if (AZ::EditContext* edit = serializeContext->GetEditContext())
{
edit->Class<TestComponent>("Test Component", "A test component")
->DataElement(0, &TestComponent::m_float, "Float Field", "A float field")
->DataElement(0, &TestComponent::m_string, "String Field", "A string field")
->DataElement(0, &TestComponent::m_normalContainer, "Normal Container", "A container")
->DataElement(0, &TestComponent::m_pointerContainer, "Pointer Container", "A container")
->DataElement(0, &TestComponent::m_subData, "Struct Field", "A sub data type")
->DataElement(nullptr, &TestComponent::m_float, "Float Field", "A float field")
->DataElement(nullptr, &TestComponent::m_string, "String Field", "A string field")
->DataElement(nullptr, &TestComponent::m_normalContainer, "Normal Container", "A container")
->DataElement(nullptr, &TestComponent::m_pointerContainer, "Pointer Container", "A container")
->DataElement(nullptr, &TestComponent::m_subData, "Struct Field", "A sub data type")
;
edit->Class<SubData>("Test Component", "A test component")
->DataElement(0, &SubData::m_int, "Int Field", "An int")
->DataElement(nullptr, &SubData::m_int, "Int Field", "An int")
;
}
}
@@ -156,7 +156,7 @@ namespace UnitTest
{
}
~InstanceDataHierarchyBasicTest()
~InstanceDataHierarchyBasicTest() override
{
}
@@ -481,7 +481,7 @@ namespace UnitTest
{
}
~InstanceDataHierarchyCopyContainerChangesTest()
~InstanceDataHierarchyCopyContainerChangesTest() override
{
}
@@ -680,8 +680,8 @@ namespace UnitTest
;
edit->Class<EnumContainer>("Enum Container", "Test container that has an external enum")
->DataElement(0, &EnumContainer::m_enum, "Enum Field", "An enum value")
->DataElement(0, &EnumContainer::m_enumVector, "Enum Vector Field", "A vector of enum values")
->DataElement(nullptr, &EnumContainer::m_enum, "Enum Field", "An enum value")
->DataElement(nullptr, &EnumContainer::m_enumVector, "Enum Vector Field", "A vector of enum values")
;
}
}
@@ -776,21 +776,21 @@ namespace UnitTest
{
edit->Class<GroupTestComponent>("Group Test Component", "Testing normal groups and toggle groups")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->DataElement(0, &GroupTestComponent::m_float, "Float Field", "A float field")
->DataElement(nullptr, &GroupTestComponent::m_float, "Float Field", "A float field")
->ClassElement(AZ::Edit::ClassElements::Group, "Normal Group")
->DataElement(0, &GroupTestComponent::m_groupFloat, "Float Field", "A float field")
->DataElement(0, &GroupTestComponent::m_subGroupForNormal, "Struct Field", "A sub data type")
->DataElement(nullptr, &GroupTestComponent::m_groupFloat, "Float Field", "A float field")
->DataElement(nullptr, &GroupTestComponent::m_subGroupForNormal, "Struct Field", "A sub data type")
->GroupElementToggle("Group Toggle", &GroupTestComponent::m_groupToggle)
->DataElement(0, &GroupTestComponent::m_toggleGroupInt, "Normal Integer", "An Integer")
->DataElement(0, &GroupTestComponent::m_subGroupForToggle, "Struct Field", "A sub data type")
->DataElement(nullptr, &GroupTestComponent::m_toggleGroupInt, "Normal Integer", "An Integer")
->DataElement(nullptr, &GroupTestComponent::m_subGroupForToggle, "Struct Field", "A sub data type")
;
edit->Class<SubData>("SubGroup Test Component", "Testing nested normal groups and toggle groups")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->ClassElement(AZ::Edit::ClassElements::Group, "Normal SubGroup")
->DataElement(0, &SubData::m_int, "SubGroup Int Field", "An int")
->DataElement(nullptr, &SubData::m_int, "SubGroup Int Field", "An int")
->GroupElementToggle("SubGroup Toggle", &SubData::m_bool)
->DataElement(0, &SubData::m_float, "SubGroup Float Field", "An int")
->DataElement(nullptr, &SubData::m_float, "SubGroup Float Field", "An int")
;
}
}
@@ -974,7 +974,7 @@ namespace UnitTest
{
}
void InsertAndVerifyKeys(AZ::SerializeContext::IDataContainer* container, void* key, void* instance, const AZ::SerializeContext::ClassElement* classElement) const
void InsertAndVerifyKeys(AZ::SerializeContext::IDataContainer* container, void* key, void* instance, const AZ::SerializeContext::ClassElement* classElement) const override
{
T* keyContainer = reinterpret_cast<T*>(key);
for (const T& keyToInsert : keysToInsert)
@@ -1258,7 +1258,7 @@ namespace UnitTest
{
editContext->Class<UIElementContainer>("Test", "")
->UIElement("TestHandler", "UIElement")
->DataElement(0, &UIElementContainer::m_data)
->DataElement(nullptr, &UIElementContainer::m_data)
->UIElement(AZ_CRC("TestHandler2"), "UIElement2")
;
}
@@ -1322,8 +1322,8 @@ namespace UnitTest
{
// By default, DataElements accept multi-edit and UIElements do not
editContext->Class<AggregatedContainer>("Test", "")
->DataElement(0, &AggregatedContainer::m_aggregated)
->DataElement(0, &AggregatedContainer::m_notAggregated)
->DataElement(nullptr, &AggregatedContainer::m_aggregated)
->DataElement(nullptr, &AggregatedContainer::m_notAggregated)
->Attribute(AZ::Edit::Attributes::AcceptsMultiEdit, false)
->UIElement("TestHandler", "aggregatedUIElement")
->Attribute(AZ::Edit::Attributes::AcceptsMultiEdit, true)
Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ namespace UnitTest
if (AZ::EditContext* editContext = serializeContext->GetEditContext())
{
editContext->Class<TestSimpleAsset>("TestSimpleAsset", "Test data block for a simple asset mock data block")
->DataElement(0, &TestSimpleAsset::m_data, "My Data", "A test bool value.")
->DataElement(nullptr, &TestSimpleAsset::m_data, "My Data", "A test bool value.")
;
}
}
@@ -171,7 +171,7 @@ namespace UnitTest
->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::HideChildren)
->DataElement(AZ::Edit::UIHandlers::Default, &PropertyTreeEditorTester::m_myReadOnlyShort, "My Read Only", "A test read only node.")
->Attribute(AZ::Edit::Attributes::ReadOnly, true)
->DataElement(0, &PropertyTreeEditorTester::m_mySubBlock, "My Sub Block", "sub block test")
->DataElement(nullptr, &PropertyTreeEditorTester::m_mySubBlock, "My Sub Block", "sub block test")
->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
->ClassElement(AZ::Edit::ClassElements::Group, "Grouped")
Code/Framework/AzToolsFramework/Tests/SQLiteConnectionTests.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ namespace UnitTest
{
}
~SQLiteTest() = default;
~SQLiteTest() override = default;
void SetUp() override
{
Code/Framework/AzToolsFramework/Tests/Script/ScriptEntityTests.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ namespace UnitTest
ScriptContext* m_scriptContext;
~EntityScriptTest()
~EntityScriptTest() override
{
}
Code/Framework/AzToolsFramework/Tests/Slice.cpp
+1 -1
View File
@@ -457,7 +457,7 @@ namespace UnitTest
{
AZ::Debug::TraceMessageBus::Handler::BusConnect();
}
~SliceTestWarningInterceptor()
~SliceTestWarningInterceptor() override
{
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
}
Code/Framework/AzToolsFramework/Tests/UndoStack.cpp
+1 -1
View File
@@ -413,7 +413,7 @@ namespace UnitTest
*m_completedFlag = false;
}
~UndoDestructorTest()
~UndoDestructorTest() override
{
*m_completedFlag = true;
}
Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp
+2 -2
View File
@@ -28,7 +28,7 @@ namespace UnitTest
public:
ViewportUiDisplayTestFixture() = default;
void SetUp()
void SetUp() override
{
m_buttonGroup = AZStd::make_shared<ButtonGroup>();
m_buttonGroup->AddButton("");
@@ -36,7 +36,7 @@ namespace UnitTest
m_mockRenderOverlay = new QWidget();
}
void TearDown()
void TearDown() override
{
m_buttonGroup.reset();
delete m_parentWidget;
Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
+3 -3
View File
@@ -26,7 +26,7 @@ namespace UnitTest
{
public:
ViewportUiManagerTestable() = default;
~ViewportUiManagerTestable() = default;
~ViewportUiManagerTestable() override = default;
const AZStd::unordered_map<AzToolsFramework::ViewportUi::ClusterId, AZStd::shared_ptr<ButtonGroup>>& GetClusterMap()
{
@@ -84,12 +84,12 @@ namespace UnitTest
ViewportManagerWrapper m_viewportManagerWrapper;
void SetUp()
void SetUp() override
{
m_viewportManagerWrapper.Create();
}
void TearDown()
void TearDown() override
{
m_viewportManagerWrapper.Destroy();
}