From 8c4e16d51ec0cc70b74c38e9a7303dbe3db66b27 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 28 Jun 2020 05:39:40 -0400 Subject: [PATCH] CScaleNodeCommand: Make use of override where applicable --- src/Editor/Undo/CScaleNodeCommand.cpp | 7 ++----- src/Editor/Undo/CScaleNodeCommand.h | 17 +++++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Editor/Undo/CScaleNodeCommand.cpp b/src/Editor/Undo/CScaleNodeCommand.cpp index ea417b59..db28a2e3 100644 --- a/src/Editor/Undo/CScaleNodeCommand.cpp +++ b/src/Editor/Undo/CScaleNodeCommand.cpp @@ -3,16 +3,13 @@ #include "Editor/INodeEditor.h" CScaleNodeCommand::CScaleNodeCommand() - : IUndoCommand("Scale"), - mpEditor(nullptr), - mCommandEnded(false) + : IUndoCommand("Scale") { } CScaleNodeCommand::CScaleNodeCommand(INodeEditor *pEditor, const QList& rkNodes, bool UsePivot, const CVector3f& rkPivot, const CVector3f& rkDelta) : IUndoCommand("Scale"), - mpEditor(pEditor), - mCommandEnded(false) + mpEditor(pEditor) { mNodeList.reserve(rkNodes.size()); diff --git a/src/Editor/Undo/CScaleNodeCommand.h b/src/Editor/Undo/CScaleNodeCommand.h index f7c3ba79..5aefb981 100644 --- a/src/Editor/Undo/CScaleNodeCommand.h +++ b/src/Editor/Undo/CScaleNodeCommand.h @@ -18,18 +18,19 @@ class CScaleNodeCommand : public IUndoCommand CVector3f NewScale; }; QList mNodeList; - INodeEditor *mpEditor; - bool mCommandEnded; + INodeEditor *mpEditor = nullptr; + bool mCommandEnded = false; public: CScaleNodeCommand(); CScaleNodeCommand(INodeEditor *pEditor, const QList& rkNodes, bool UsePivot, const CVector3f& rkPivot, const CVector3f& rkDelta); - ~CScaleNodeCommand(); - int id() const; - bool mergeWith(const QUndoCommand *pkOther); - void undo(); - void redo(); - bool AffectsCleanState() const { return true; } + ~CScaleNodeCommand() override; + + int id() const override; + bool mergeWith(const QUndoCommand *pkOther) override; + void undo() override; + void redo() override; + bool AffectsCleanState() const override { return true; } static CScaleNodeCommand* End(); };