From 7244f74f5f6e87143195cac49bfaba3dae0b787c Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 23 Aug 2017 10:45:03 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorCopySelectedCommand
- Renamed to CopySelectedCommand
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...orCopySelectedCommand.h => CopySelectedCommand.h} | 12 ++++++------
.../DataProcessorOneLevelTreeManager.cpp | 4 ++--
.../DataProcessorTwoLevelTreeManager.cpp | 4 ++--
.../test/DataProcessorUI/DataProcessorCommandsTest.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/{DataProcessorCopySelectedCommand.h => CopySelectedCommand.h} (83%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 90227625abd..32d94fd58c6 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -39,7 +39,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index d609cda1c78..c32bc56d4fb 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1638,13 +1638,13 @@ ClearSelectedCommand();
ClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::ClearSelectedCommand &);
};
-class DataProcessorCopySelectedCommand
+class CopySelectedCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
%End
public:
-DataProcessorCopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+CopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1653,8 +1653,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorCopySelectedCommand();
-DataProcessorCopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorCopySelectedCommand &);
+CopySelectedCommand();
+CopySelectedCommand(const MantidQt::MantidWidgets::DataProcessor::CopySelectedCommand &);
};
class DataProcessorCutSelectedCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 0c425620d11..5ee5125a0c3 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -308,7 +308,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
index b77128fade9..5414f258b52 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorCopySelectedCommand
+/** @class CopySelectedCommand
-DataProcessorCopySelectedCommand defines the action "Copy Selected"
+CopySelectedCommand defines the action "Copy 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 DataProcessorCopySelectedCommand : public DataProcessorCommandBase {
+class CopySelectedCommand : public DataProcessorCommandBase {
public:
- DataProcessorCopySelectedCommand(DataProcessorPresenter *tablePresenter)
+ CopySelectedCommand(DataProcessorPresenter *tablePresenter)
: DataProcessorCommandBase(tablePresenter){};
- DataProcessorCopySelectedCommand(const QDataProcessorWidget &widget)
+ CopySelectedCommand(const QDataProcessorWidget &widget)
: DataProcessorCommandBase(widget){};
- virtual ~DataProcessorCopySelectedCommand(){};
+ virtual ~CopySelectedCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::CopySelectedFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index 1a7e078b6a4..7758a4b4794 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -4,7 +4,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
@@ -90,7 +90,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<AppendRowCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorCopySelectedCommand>(m_presenter));
+ make_unique<CopySelectedCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorCutSelectedCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index fd2578a76e9..61be8b79156 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -6,7 +6,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
@@ -109,7 +109,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorGroupRowsCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorCopySelectedCommand>(m_presenter));
+ make_unique<CopySelectedCommand>(m_presenter));
addCommand(commands,
make_unique<DataProcessorCutSelectedCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
index 9cc30990591..cfbea1e1edc 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
@@ -9,7 +9,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
@@ -279,7 +279,7 @@ public:
void test_copy_selected_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorCopySelectedCommand command(&mockPresenter);
+ CopySelectedCommand command(&mockPresenter);
// The presenter should be notified with the CopySelectedFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::CopySelectedFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
index 660a9a92de4..0c879fb54b8 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
@@ -11,7 +11,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
@@ -144,7 +144,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[14].get()));
TS_ASSERT(dynamic_cast<AppendRowCommand *>(comm[15].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[16].get()));
- TS_ASSERT(dynamic_cast<DataProcessorCopySelectedCommand *>(comm[17].get()));
+ TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[17].get()));
TS_ASSERT(dynamic_cast<DataProcessorCutSelectedCommand *>(comm[18].get()));
TS_ASSERT(
dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[19].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index 2bed77a8c65..e9265a7add8 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -13,7 +13,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
@@ -164,7 +164,7 @@ public:
TS_ASSERT(dynamic_cast<AppendGroupCommand *>(comm[21].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[22].get()));
TS_ASSERT(dynamic_cast<DataProcessorGroupRowsCommand *>(comm[23].get()));
- TS_ASSERT(dynamic_cast<DataProcessorCopySelectedCommand *>(comm[24].get()));
+ TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[24].get()));
TS_ASSERT(dynamic_cast<DataProcessorCutSelectedCommand *>(comm[25].get()));
TS_ASSERT(
dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[26].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 6139318f2ed..d21545f8b30 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -167,7 +167,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.AppendRowCommand(self.data_processor_table), self.menuEdit)
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.DataProcessorCopySelectedCommand(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.DataProcessorPasteSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ClearSelectedCommand(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 ccb5fc851ce..74d116af37a 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -156,7 +156,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.AppendRowCommand(self.data_processor_table), self.menuEdit)
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.DataProcessorCopySelectedCommand(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.DataProcessorPasteSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ClearSelectedCommand(self.data_processor_table), self.menuEdit)
--
GitLab