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

Editor code: tidy up BOOLs,NULLs and overrides pt3.

Browse Source 
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 3 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
This commit is contained in:
Nemerle
2021-08-05 16:48:00 +02:00
parent 7404622b48
commit c6760d8935
33 changed files with 153 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/SelectKeyUIControls.cpp
+9 -9
View File
@@ -22,7 +22,7 @@ class CSelectKeyUIControls
, protected AZ::EntitySystemBus::Handler
{
public:
CSelectKeyUIControls() {}
CSelectKeyUIControls() = default;
~CSelectKeyUIControls() override;
@@ -30,7 +30,7 @@ public:
CSmartVariableEnum<QString> mv_camera;
CSmartVariable<float> mv_BlendTime;
virtual void OnCreateVars()
void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_camera, "Camera");
@@ -39,14 +39,14 @@ public:
Camera::CameraNotificationBus::Handler::BusConnect();
AZ::EntitySystemBus::Handler::BusConnect();
}
bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const override
{
return valueType == AnimValueType::Select;
}
virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
virtual unsigned int GetPriority() const { return 1; }
unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
@@ -98,7 +98,7 @@ bool CSelectKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKey
ResetCameraEntries();
// Get All cameras.
mv_camera.SetEnumList(NULL);
mv_camera.SetEnumList(nullptr);
mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
@@ -217,7 +217,7 @@ void CSelectKeyUIControls::OnCameraRemoved(const AZ::EntityId & cameraId)
// We can't iterate or remove an item from the enum list, and Camera::CameraRequests::GetCameras
// still includes the deleted camera at this point. Reset the list anyway and filter out the
// deleted camera.
mv_camera->SetEnumList(NULL);
mv_camera->SetEnumList(nullptr);
mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
AZ::EBusAggregateResults<AZ::EntityId> cameraComponentEntities;
@@ -256,7 +256,7 @@ void CSelectKeyUIControls::OnEntityNameChanged(const AZ::EntityId & entityId, [[
void CSelectKeyUIControls::ResetCameraEntries()
{
mv_camera.SetEnumList(NULL);
mv_camera.SetEnumList(nullptr);
mv_camera->AddEnumItem(QObject::tr("<None>"), QString::number(static_cast<AZ::u64>(AZ::EntityId::InvalidEntityId)));
// Find all Component Entity Cameras