From c001d5422a130d067477c0e963c64651619212d7 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 10 Oct 2023 14:05:26 +0200
Subject: [PATCH] rm unused fct
---
GUI/View/SampleDesigner/SampleEditorCommands.cpp | 14 --------------
GUI/View/SampleDesigner/SampleEditorCommands.h | 1 -
2 files changed, 15 deletions(-)
diff --git a/GUI/View/SampleDesigner/SampleEditorCommands.cpp b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
index e41824df701..c911cc03f8b 100644
--- a/GUI/View/SampleDesigner/SampleEditorCommands.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorCommands.cpp
@@ -43,20 +43,6 @@ int CommandChangeValue::id() const
return COMMAND_ID_CHANGE_VALUE;
}
-bool CommandChangeValue::mergeWith(const QUndoCommand* command)
-{
- if (command->id() != id()) // make sure other is also a changeValue command
- return false;
-
- const auto* const other = dynamic_cast<const CommandChangeValue*>(command);
-
- if (m_path != other->m_path)
- return false;
-
- m_newValue = other->m_newValue;
- return true;
-}
-
void CommandChangeValue::redo()
{
if (m_isFirst)
diff --git a/GUI/View/SampleDesigner/SampleEditorCommands.h b/GUI/View/SampleDesigner/SampleEditorCommands.h
index 09b30a89217..db7764d6fbb 100644
--- a/GUI/View/SampleDesigner/SampleEditorCommands.h
+++ b/GUI/View/SampleDesigner/SampleEditorCommands.h
@@ -27,7 +27,6 @@ public:
double newValue, const QString& path, QUndoCommand* parent = nullptr);
int id() const override;
- bool mergeWith(const QUndoCommand* command) override;
void redo() override;
void undo() override;
--
GitLab