From 772a32bcfd8695b4db90f5a24816cd47475a869b Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 23 Aug 2017 11:16:29 +0100
Subject: [PATCH] Re #20302: Remamed DataProcessorDeleteRowCommand to
DeleteRowCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...rocessorDeleteRowCommand.h => DeleteRowCommand.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/{DataProcessorDeleteRowCommand.h => DeleteRowCommand.h} (83%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 9478aeae68c..e2a2c8432fd 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -42,7 +42,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index a0bf6aef398..de03a328eaf 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1695,13 +1695,13 @@ DeleteGroupCommand();
DeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DeleteGroupCommand &);
};
-class DataProcessorDeleteRowCommand
+class DeleteRowCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
%End
public:
-DataProcessorDeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+DeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1710,8 +1710,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorDeleteRowCommand();
-DataProcessorDeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorDeleteRowCommand &);
+DeleteRowCommand();
+DeleteRowCommand(const MantidQt::MantidWidgets::DataProcessor::DeleteRowCommand &);
};
class DataProcessorExpandCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 6e731b448dc..c8339656ed3 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -311,7 +311,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
index a1a50b19522..58c5ed35785 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
@@ -7,9 +7,9 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorDeleteRowCommand
+/** @class DeleteRowCommand
-DataProcessorDeleteRowCommand defines the action "Delete Row"
+DeleteRowCommand defines the action "Delete Row"
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
@@ -32,13 +32,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 DataProcessorDeleteRowCommand : public CommandBase {
+class DeleteRowCommand : public CommandBase {
public:
- DataProcessorDeleteRowCommand(DataProcessorPresenter *tablePresenter)
+ DeleteRowCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorDeleteRowCommand(const QDataProcessorWidget &widget)
+ DeleteRowCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorDeleteRowCommand(){};
+ virtual ~DeleteRowCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::DeleteRowFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index b73d3d642e7..a8cbe0c0518 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -6,7 +6,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
@@ -98,7 +98,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<ClearSelectedCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorDeleteRowCommand>(m_presenter));
+ addCommand(commands, make_unique<DeleteRowCommand>(m_presenter));
return commands;
}
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 036ed729339..95ba28cf021 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -9,7 +9,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
@@ -117,7 +117,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<ClearSelectedCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorDeleteRowCommand>(m_presenter));
+ addCommand(commands, make_unique<DeleteRowCommand>(m_presenter));
addCommand(commands,
make_unique<DeleteGroupCommand>(m_presenter));
return commands;
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index d87547ec993..6f965f308c9 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -12,7 +12,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h"
@@ -333,7 +333,7 @@ public:
void test_delete_row_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorDeleteRowCommand command(&mockPresenter);
+ DeleteRowCommand command(&mockPresenter);
// The presenter should be notified with the DeleteRowFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::DeleteRowFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
index afaa4a19490..4d0b3a1f704 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
@@ -13,7 +13,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
@@ -151,7 +151,7 @@ public:
TS_ASSERT(
dynamic_cast<ClearSelectedCommand *>(comm[20].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[21].get()));
- TS_ASSERT(dynamic_cast<DataProcessorDeleteRowCommand *>(comm[22].get()));
+ TS_ASSERT(dynamic_cast<DeleteRowCommand *>(comm[22].get()));
}
void test_append_row() {
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index f2654cbc3a3..a513bc92568 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -16,7 +16,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
@@ -171,7 +171,7 @@ public:
TS_ASSERT(
dynamic_cast<ClearSelectedCommand *>(comm[27].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[28].get()));
- TS_ASSERT(dynamic_cast<DataProcessorDeleteRowCommand *>(comm[29].get()));
+ TS_ASSERT(dynamic_cast<DeleteRowCommand *>(comm[29].get()));
TS_ASSERT(dynamic_cast<DeleteGroupCommand *>(comm[30].get()));
}
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 695dfca7421..9406c2c53d6 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -171,7 +171,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
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)
+ self._create_action(MantidQt.MantidWidgets.DeleteRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DeleteGroupCommand(self.data_processor_table), self.menuEdit)
# Actions that go in the 'File' menu
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index fe51fb4dfb5..f5278694492 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -160,7 +160,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
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)
+ self._create_action(MantidQt.MantidWidgets.DeleteRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DeleteGroupCommand(self.data_processor_table), self.menuEdit)
# Actions that go in the 'File' menu
--
GitLab