From dbb53b8947d528d4cb638a90091230cec1bc6c40 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 23 Aug 2017 11:11:25 +0100
Subject: [PATCH] Re #20303: Renamed DataProcessorCutSelectedCommand to
- Renamed to CutSelectedCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...ssorCutSelectedCommand.h => CutSelectedCommand.h} | 12 ++++++------
.../DataProcessorOneLevelTreeManager.cpp | 4 ++--
.../DataProcessorTwoLevelTreeManager.cpp | 4 ++--
.../common/test/DataProcessorUI/CommandsTest.h | 4 ++--
.../DataProcessorOneLevelTreeManagerTest.h | 4 ++--
.../DataProcessorTwoLevelTreeManagerTest.h | 4 ++--
.../ui/dataprocessorinterface/data_processor_gui.py | 2 +-
scripts/Interface/ui/poldi/poldi_gui.py | 2 +-
11 files changed, 25 insertions(+), 25 deletions(-)
rename qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/{DataProcessorCutSelectedCommand.h => CutSelectedCommand.h} (84%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 32d94fd58c6..063db3b9ebf 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -40,7 +40,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index c32bc56d4fb..22025032ec9 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1657,13 +1657,13 @@ CopySelectedCommand();
CopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::CopySelectedCommand &);
};
-class DataProcessorCutSelectedCommand
+class CutSelectedCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
%End
public:
-DataProcessorCutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+CutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1672,8 +1672,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorCutSelectedCommand();
-DataProcessorCutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorCutSelectedCommand &);
+CutSelectedCommand();
+CutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::CutSelectedCommand &);
};
class DataProcessorDeleteGroupCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 37bbf896ab9..31f8c029875 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -309,7 +309,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h
inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
similarity index 84%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
index 1f68538a86c..e184764e929 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorCutSelectedCommand
+/** @class CutSelectedCommand
-DataProcessorCutSelectedCommand defines the action "Cut Selected"
+CutSelectedCommand defines the action "Cut Selected"
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
@@ -31,13 +31,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorCutSelectedCommand : public CommandBase {
+class CutSelectedCommand : public CommandBase {
public:
- DataProcessorCutSelectedCommand(DataProcessorPresenter *tablePresenter)
+ CutSelectedCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorCutSelectedCommand(const QDataProcessorWidget &widget)
+ CutSelectedCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorCutSelectedCommand(){};
+ virtual ~CutSelectedCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::CutSelectedFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index 6ec95e93242..b73d3d642e7 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -5,7 +5,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
@@ -92,7 +92,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<CopySelectedCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorCutSelectedCommand>(m_presenter));
+ make_unique<CutSelectedCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorPasteSelectedCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 0ddbb2f6c70..57f32a56453 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -7,7 +7,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
@@ -111,7 +111,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<CopySelectedCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorCutSelectedCommand>(m_presenter));
+ make_unique<CutSelectedCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorPasteSelectedCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index af02f1b1603..8cbc44d048e 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -10,7 +10,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
@@ -292,7 +292,7 @@ public:
void test_cut_selected_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorCutSelectedCommand command(&mockPresenter);
+ CutSelectedCommand command(&mockPresenter);
// The presenter should be notified with the CutSelectedFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::CutSelectedFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
index 0c879fb54b8..afaa4a19490 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
@@ -12,7 +12,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
@@ -145,7 +145,7 @@ public:
TS_ASSERT(dynamic_cast<AppendRowCommand *>(comm[15].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[16].get()));
TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[17].get()));
- TS_ASSERT(dynamic_cast<DataProcessorCutSelectedCommand *>(comm[18].get()));
+ TS_ASSERT(dynamic_cast<CutSelectedCommand *>(comm[18].get()));
TS_ASSERT(
dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[19].get()));
TS_ASSERT(
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index e9265a7add8..b64c4a3af5a 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -14,7 +14,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
@@ -165,7 +165,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[22].get()));
TS_ASSERT(dynamic_cast<DataProcessorGroupRowsCommand *>(comm[23].get()));
TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[24].get()));
- TS_ASSERT(dynamic_cast<DataProcessorCutSelectedCommand *>(comm[25].get()));
+ TS_ASSERT(dynamic_cast<CutSelectedCommand *>(comm[25].get()));
TS_ASSERT(
dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[26].get()));
TS_ASSERT(
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index c841b5f45f7..c6dafbe45ef 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -168,7 +168,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.AppendGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorGroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CopySelectedCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorCutSelectedCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.CutSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorPasteSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ClearSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorDeleteRowCommand(self.data_processor_table), self.menuEdit)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index fdc84e218cf..df403c98168 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -157,7 +157,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.AppendGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorGroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CopySelectedCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorCutSelectedCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.CutSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorPasteSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ClearSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorDeleteRowCommand(self.data_processor_table), self.menuEdit)
--
GitLab