Cleanup & refactoring

This commit is contained in:
Aruki
2018-12-16 14:00:40 -07:00
parent 2287b05bc3
commit c4829f5fda
197 changed files with 2461 additions and 2345 deletions

View File

@@ -43,14 +43,14 @@ CScaleNodeCommand::~CScaleNodeCommand()
int CScaleNodeCommand::id() const
{
return eScaleNodeCmd;
return (int) EUndoCommand::ScaleNodeCmd;
}
bool CScaleNodeCommand::mergeWith(const QUndoCommand *pkOther)
{
if (mCommandEnded) return false;
if (pkOther->id() == eScaleNodeCmd)
if (pkOther->id() == (int) EUndoCommand::ScaleNodeCmd)
{
const CScaleNodeCommand *pkCmd = static_cast<const CScaleNodeCommand*>(pkOther);