diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 063db3b9ebff2c744ae3caf2b08b6a51b9423d5f..9478aeae68ca48349503293b4722c688d4b221a5 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -41,7 +41,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 22025032ec9ec1f020c623f6ad8f63377ff4dcf6..a0bf6aef398da4ea05eacd0ba36601651277b1e2 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1676,13 +1676,13 @@ CutSelectedCommand();
CutSelectedCommand(const MantidQt::MantidWidgets::DataProcessor::CutSelectedCommand &);
};
-class DataProcessorDeleteGroupCommand
+class DeleteGroupCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
%End
public:
-DataProcessorDeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+DeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1691,8 +1691,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorDeleteGroupCommand();
-DataProcessorDeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorDeleteGroupCommand &);
+DeleteGroupCommand();
+DeleteGroupCommand(const MantidQt::MantidWidgets::DataProcessor::DeleteGroupCommand &);
};
class DataProcessorDeleteRowCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 31f8c029875a1bd47c02f081ae40b122659e88aa..6e731b448dc1c6d77f678f2e2cc00771d818413c 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -310,7 +310,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
similarity index 83%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
index cb3c062719d7c6482cf2b7c4b7c4d2bde8215d36..71224a98f6b8cc11063c391cf39f91e65d745b96 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h
@@ -7,9 +7,9 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorDeleteGroupCommand
+/** @class DeleteGroupCommand
-DataProcessorDeleteGroupCommand defines the action "Delete Group"
+DeleteGroupCommand defines the action "Delete Group"
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 DataProcessorDeleteGroupCommand : public CommandBase {
+class DeleteGroupCommand : public CommandBase {
public:
- DataProcessorDeleteGroupCommand(DataProcessorPresenter *tablePresenter)
+ DeleteGroupCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorDeleteGroupCommand(const QDataProcessorWidget &widget)
+ DeleteGroupCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorDeleteGroupCommand(){};
+ virtual ~DeleteGroupCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::DeleteGroupFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 57f32a564538bb7c1710ec0bc75a56d668058c4b..036ed729339c3601a6fc11afd672eb554b9fcfcd 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -8,7 +8,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
@@ -119,7 +119,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorDeleteRowCommand>(m_presenter));
addCommand(commands,
- make_unique<DataProcessorDeleteGroupCommand>(m_presenter));
+ 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 8cbc44d048e2be93b806c792583ad592b87fb1ff..d87547ec99301130070d9fdb8d137af0c939c483 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -11,7 +11,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h"
@@ -346,7 +346,7 @@ public:
void test_delete_group_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorDeleteGroupCommand command(&mockPresenter);
+ DeleteGroupCommand command(&mockPresenter);
// The presenter should be notified with the DeleteRowFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::DeleteGroupFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index b64c4a3af5a0544695b39ba7a2cd30bff767f010..f2654cbc3a36f07744a5bb6c7bd4d639951519ed 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -15,7 +15,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/CutSelectedCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/DeleteGroupCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h"
@@ -172,7 +172,7 @@ public:
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()));
+ TS_ASSERT(dynamic_cast<DeleteGroupCommand *>(comm[30].get()));
}
void test_append_row() {
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index c6dafbe45ef5a9eaf833ba0119716f7ef9d21f73..695dfca7421f63decb2cf82bbf5f81027187563f 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -172,7 +172,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
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.DataProcessorDeleteGroupCommand(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
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index df403c9816801326b0f16b30f400cb5c8cf6e543..fe51fb4dfb5ee0e6cea6d68aee2b35714979ac4e 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -161,7 +161,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
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.DataProcessorDeleteGroupCommand(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
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)