drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[studio] Make UndoCommand::mergeWith take a reference

Browse Source
This commit is contained in:
Gary Talent
2024-05-22 02:11:58 -05:00
parent f5a02ce94f
commit 9e9f317c13
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.cpp
+3 -3
View File
@@ -124,11 +124,11 @@ UpdateColorCommand::UpdateColorCommand(
//setObsolete(m_oldColor == m_newColor);
}
bool UpdateColorCommand::mergeWith(const UndoCommand *cmd) noexcept {
if (cmd->commandId() != static_cast<int>(PaletteEditorCommandId::UpdateColor)) {
bool UpdateColorCommand::mergeWith(UndoCommand const&cmd) noexcept {
if (cmd.commandId() != static_cast<int>(PaletteEditorCommandId::UpdateColor)) {
return false;
}
auto ucCmd = static_cast<const UpdateColorCommand*>(cmd);
auto ucCmd = static_cast<UpdateColorCommand const*>(&cmd);
if (m_idx != ucCmd->m_idx) {
return false;
}
src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.hpp
+1 -1
View File
@@ -140,7 +140,7 @@ class UpdateColorCommand: public studio::UndoCommand {
~UpdateColorCommand() noexcept override = default;
[[nodiscard]]
bool mergeWith(const UndoCommand *cmd) noexcept final;
bool mergeWith(const UndoCommand &cmd) noexcept final;
[[nodiscard]]
int commandId() const noexcept final;