diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index c34f2c675f133636fd11c85bbb4e7657f518fc90..90227625abd0205464953eda81f8e5586f401d64 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -38,7 +38,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index de485394017ca21cb90b44769e1e36681f7a36d1..d609cda1c78d866b9f603d2f68c5fc276114d93b 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1619,13 +1619,13 @@ AppendGroupCommand();
AppendGroupCommand(const MantidQt::MantidWidgets::DataProcessor::AppendGroupCommand &);
};
-class DataProcessorClearSelectedCommand
+class ClearSelectedCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
%End
public:
-DataProcessorClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+ClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1634,8 +1634,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorClearSelectedCommand();
-DataProcessorClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorClearSelectedCommand &);
+ClearSelectedCommand();
+ClearSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::ClearSelectedCommand &);
};
class DataProcessorCopySelectedCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 5526f8cf18ee70cf81a292885ef739b548791482..9d375182f76a3869da02956a9a874f07c47dd691 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -304,7 +304,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/CatalogHelper.h
inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
similarity index 82%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
index fb2738c3b472b2f301775efa33c4268cc218f1a5..00ed923f8a76e39ab77fdfba3c2ae07a919d6b0b 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorClearSelectedCommand
+/** @class ClearSelectedCommand
-DataProcessorClearSelectedCommand defines the action "Clear Selected"
+ClearSelectedCommand defines the action "Clear 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 DataProcessorClearSelectedCommand : public DataProcessorCommandBase {
+class ClearSelectedCommand : public DataProcessorCommandBase {
public:
- DataProcessorClearSelectedCommand(DataProcessorPresenter *tablePresenter)
+ ClearSelectedCommand(DataProcessorPresenter *tablePresenter)
: DataProcessorCommandBase(tablePresenter){};
- DataProcessorClearSelectedCommand(const QDataProcessorWidget &widget)
+ ClearSelectedCommand(const QDataProcessorWidget &widget)
: DataProcessorCommandBase(widget){};
- virtual ~DataProcessorClearSelectedCommand(){};
+ virtual ~ClearSelectedCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::ClearSelectedFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index bfc974b3da42480a6bcabcd9a84f64b72e69fd3c..1a7e078b6a4ec67824fbfc1d14251fad0e3b70a2 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -3,7 +3,7 @@
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
@@ -96,7 +96,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<DataProcessorPasteSelectedCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorClearSelectedCommand>(m_presenter));
+ make_unique<ClearSelectedCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorDeleteRowCommand>(m_presenter));
return commands;
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 98a5a3e32dd7478ced587bfad1a731478ef19c5d..60163b6ae9e6c6340ec0cf9ece6f6b98e0093dcf 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -4,7 +4,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
@@ -115,7 +115,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<DataProcessorPasteSelectedCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorClearSelectedCommand>(m_presenter));
+ make_unique<ClearSelectedCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorDeleteRowCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
index 02894710d8023acce65fccce6f6dd2e6f52ca54e..daeee71c862a840a8dff026382c4398039947a1d 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
@@ -7,7 +7,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
@@ -319,7 +319,7 @@ public:
void test_clear_selected_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorClearSelectedCommand command(&mockPresenter);
+ ClearSelectedCommand command(&mockPresenter);
// The presenter should be notified with the ClearSelectedFlag
EXPECT_CALL(mockPresenter,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
index 15517401b19ce7c2e707c714827c3e42ea7df9bb..660a9a92de474f03b0b1b8da4107e05019a480da 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
@@ -10,7 +10,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
@@ -149,7 +149,7 @@ public:
TS_ASSERT(
dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[19].get()));
TS_ASSERT(
- dynamic_cast<DataProcessorClearSelectedCommand *>(comm[20].get()));
+ dynamic_cast<ClearSelectedCommand *>(comm[20].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[21].get()));
TS_ASSERT(dynamic_cast<DataProcessorDeleteRowCommand *>(comm[22].get()));
}
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index ebaa423ae1184e9781988e1a4dcac53b4c943642..ced6a9327a6ca91e1be14c108057fde9d1e75929 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -11,7 +11,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h"
@@ -169,7 +169,7 @@ public:
TS_ASSERT(
dynamic_cast<DataProcessorPasteSelectedCommand *>(comm[26].get()));
TS_ASSERT(
- dynamic_cast<DataProcessorClearSelectedCommand *>(comm[27].get()));
+ 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<DataProcessorDeleteGroupCommand *>(comm[30].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 7098572b1c276537125d7d5fc5326c008acf65ad..6139318f2ed63b156226efdf69459be9513a43a9 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -170,7 +170,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.DataProcessorCopySelectedCommand(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.DataProcessorClearSelectedCommand(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.DataProcessorDeleteGroupCommand(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 6daa33cfd00eca0b7011f45c864b26810b4cb4bf..ccb5fc851ce5cfa75c9e9fd6f8155c15683ba4bf 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -159,7 +159,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.DataProcessorCopySelectedCommand(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.DataProcessorClearSelectedCommand(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.DataProcessorDeleteGroupCommand(self.data_processor_table), self.menuEdit)