diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 18277a3bfaf1970805832ef9d9db4442e7bc88a9..795d80f54cc37abe3afb053a1c4d8d4434230c33 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -50,7 +50,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index c64cb66857617ea06250e3b33f20ed17f1e1705e..d8ec87df703727b4839618bd6a59c3266190bd87 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1847,13 +1847,13 @@ OptionsCommand();
OptionsCommand(const MantidQt::MantidWidgets::DataProcessor::OptionsCommand &);
};
-class DataProcessorPasteSelectedCommand
+class PasteSelectedCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
%End
public:
-DataProcessorPasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+PasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1862,8 +1862,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorPasteSelectedCommand();
-DataProcessorPasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorPasteSelectedCommand &);
+PasteSelectedCommand();
+PasteSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::PasteSelectedCommand &);
};
class DataProcessorPlotGroupCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 70bd1619830d4cc201bca39bbf7288e754a97ffc..cbc66f87052230e6f9b21f0cfd084943eb4a6abd 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -323,7 +323,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
index 1a23091ffcabec9fbe1769739ec48df310431f2f..b1ba98efe6695ceca32df6316c939015546250be 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorPasteSelectedCommand
+/** @class PasteSelectedCommand
-DataProcessorPasteSelectedCommand defines the action "Paste Selected"
+PasteSelectedCommand defines the action "Paste 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 DataProcessorPasteSelectedCommand : public CommandBase {
+class PasteSelectedCommand : public CommandBase {
public:
- DataProcessorPasteSelectedCommand(DataProcessorPresenter *tablePresenter)
+ PasteSelectedCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorPasteSelectedCommand(const QDataProcessorWidget &widget)
+ PasteSelectedCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorPasteSelectedCommand(){};
+ virtual ~PasteSelectedCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::PasteSelectedFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 878c2253abaa7b38e0a0269dcb078bed351e7f41..42c89654f101cc3c16ae9ac9abcaecf00e7fe182 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -18,7 +18,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
@@ -113,7 +113,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<CutSelectedCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorPasteSelectedCommand>(m_presenter));
+ make_unique<PasteSelectedCommand>(m_presenter));
addCommand(commands,
make_unique<ClearSelectedCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
index 42a254ed202ffa20538b04e7412bdb06a2d8a3cd..5a856765effc3749bebab546004b3dd75d1e538b 100644
--- a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
@@ -12,7 +12,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
@@ -94,7 +94,7 @@ OneLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<CutSelectedCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorPasteSelectedCommand>(m_presenter));
+ make_unique<PasteSelectedCommand>(m_presenter));
addCommand(commands,
make_unique<ClearSelectedCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 728f4dd55f3dd4329723e2585bd156d8caf68c80..a7a4faa65ea7203d72ed16b748fae1bdd276bb5a 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -22,7 +22,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
@@ -305,7 +305,7 @@ public:
void test_paste_selected_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorPasteSelectedCommand command(&mockPresenter);
+ PasteSelectedCommand command(&mockPresenter);
// The presenter should be notified with the PasteSelectedFlag
EXPECT_CALL(mockPresenter,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index ac1175fa3ebebb8073dbc8ae554118199bc31f2c..107de7bc7c3c88d5de4180c4ce363739aed38313 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -26,7 +26,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
@@ -167,7 +167,7 @@ public:
TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[24].get()));
TS_ASSERT(dynamic_cast<CutSelectedCommand *>(comm[25].get()));
TS_ASSERT(
- dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[26].get()));
+ dynamic_cast<PasteSelectedCommand *>(comm[26].get()));
TS_ASSERT(
dynamic_cast<ClearSelectedCommand *>(comm[27].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[28].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
index 10a1b88c493a7b9c905c792fa50b3e82ad51368d..de7d1cf86eef796471358c413bc9109421a538f9 100644
--- a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
@@ -20,7 +20,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
@@ -147,7 +147,7 @@ public:
TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[17].get()));
TS_ASSERT(dynamic_cast<CutSelectedCommand *>(comm[18].get()));
TS_ASSERT(
- dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[19].get()));
+ dynamic_cast<PasteSelectedCommand *>(comm[19].get()));
TS_ASSERT(
dynamic_cast<ClearSelectedCommand *>(comm[20].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[21].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 5acdb6015d13da97ab77a10ffdfa937ff9a08c5f..3a62de2f44dd563dedf90e019ddbce48ed7f4bbb 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -169,7 +169,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.GroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CopySelectedCommand(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.PasteSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ClearSelectedCommand(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)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 51d69b1e2ccc9b51b56afe00347745820ff7a0c5..24b8a3b194b6b2273a2d8898b3541657136ed2ab 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -158,7 +158,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.GroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CopySelectedCommand(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.PasteSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ClearSelectedCommand(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)
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index cf951b5c462c542cb1256287c5a3986212ede001..0755f0becd067e733039a70160d789f6a4c69281 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -1475,7 +1475,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
), 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._create_action(MantidQt.MantidWidgets.PasteSelectedCommand(self.data_processor_table),
self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorClearSelectedCommand(self.data_processor_table),
self.menuEdit)