Use consistent qualification of AddWorkspaceDialog in Inelastic inter…

…face library

qt/scientific_interfaces/Inelastic/Analysis/FqFitDataPresenter.cpp

@@ -207,7 +207,7 @@ void FqFitDataPresenter::subscribeFitPropertyBrowser(IIndirectFitPropertyBrowser
   m_fitPropertyBrowser = browser;
 }
 
-bool FqFitDataPresenter::addWorkspaceFromDialog(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog) {
+bool FqFitDataPresenter::addWorkspaceFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   if (const auto fqFitDialog = dynamic_cast<FqFitAddWorkspaceDialog const *>(dialog)) {
     addWorkspace(fqFitDialog->workspaceName(), fqFitDialog->parameterType(), fqFitDialog->parameterNameIndex());
     setActiveWorkspaceIDToCurrentWorkspace(fqFitDialog);
@@ -321,8 +321,7 @@ std::vector<std::string> FqFitDataPresenter::getParameterTypes(FqFitParameters &
   return types;
 }
 
-void FqFitDataPresenter::setActiveWorkspaceIDToCurrentWorkspace(
-    MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog) {
+void FqFitDataPresenter::setActiveWorkspaceIDToCurrentWorkspace(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   //  update active data index with correct index based on the workspace name
   //  and the vector in m_fitDataModel which is in the base class
   //  indirectFittingModel get table workspace index

qt/scientific_interfaces/Inelastic/Analysis/FqFitDataPresenter.h

@@ -36,7 +36,7 @@ class MANTIDQT_INELASTIC_DLL FqFitDataPresenter : public IndirectFitDataPresente
 
 public:
   FqFitDataPresenter(IIndirectDataAnalysisTab *tab, IIndirectFitDataModel *model, IIndirectFitDataView *view);
-  bool addWorkspaceFromDialog(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog) override;
+  bool addWorkspaceFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog) override;
   void addWorkspace(const std::string &workspaceName, const std::string &paramType, const int &spectrum_index) override;
   void setActiveWidth(std::size_t widthIndex, WorkspaceID dataIndex, bool single = true) override;
   void setActiveEISF(std::size_t eisfIndex, WorkspaceID dataIndex, bool single = true) override;
@@ -56,7 +56,7 @@ class MANTIDQT_INELASTIC_DLL FqFitDataPresenter : public IndirectFitDataPresente
   void updateParameterTypes(FqFitAddWorkspaceDialog *dialog, FqFitParameters &parameters);
   std::vector<std::string> getParameterTypes(FqFitParameters &parameters) const;
   std::map<std::string, std::string> chooseFqFitFunctions(bool paramWidth) const;
-  void setActiveWorkspaceIDToCurrentWorkspace(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog);
+  void setActiveWorkspaceIDToCurrentWorkspace(MantidWidgets::IAddWorkspaceDialog const *dialog);
 
   std::string m_activeParameterType;
   WorkspaceID m_activeWorkspaceID;

qt/scientific_interfaces/Inelastic/Analysis/IndirectFitDataPresenter.cpp

@@ -27,8 +27,8 @@ std::vector<IndirectFitData> *IndirectFitDataPresenter::getFittingData() { retur
 
 IIndirectFitDataView const *IndirectFitDataPresenter::getView() const { return m_view; }
 
-bool IndirectFitDataPresenter::addWorkspaceFromDialog(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog) {
-  if (const auto indirectDialog = dynamic_cast<MantidQt::MantidWidgets::AddWorkspaceDialog const *>(dialog)) {
+bool IndirectFitDataPresenter::addWorkspaceFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog) {
+  if (const auto indirectDialog = dynamic_cast<MantidWidgets::AddWorkspaceDialog const *>(dialog)) {
     addWorkspace(indirectDialog->workspaceName(), indirectDialog->workspaceIndices());
     return true;
   }
@@ -95,7 +95,7 @@ UserInputValidator &IndirectFitDataPresenter::validate(UserInputValidator &valid
   return m_view->validate(validator);
 }
 
-void IndirectFitDataPresenter::handleAddData(IAddWorkspaceDialog const *dialog) {
+void IndirectFitDataPresenter::handleAddData(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   try {
     m_tab->handleDataAdded(dialog);
     updateTableFromModel();

qt/scientific_interfaces/Inelastic/Analysis/IndirectFitDataPresenter.h

@@ -20,13 +20,11 @@ namespace MantidQt {
 namespace CustomInterfaces {
 namespace IDA {
 
-using namespace MantidWidgets;
-
 class IIndirectDataAnalysisTab;
 
 class MANTIDQT_INELASTIC_DLL IIndirectFitDataPresenter {
 public:
-  virtual void handleAddData(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog) = 0;
+  virtual void handleAddData(MantidWidgets::IAddWorkspaceDialog const *dialog) = 0;
   virtual void handleRemoveClicked() = 0;
   virtual void handleUnifyClicked() = 0;
   virtual void handleCellChanged(int row, int column) = 0;
@@ -38,7 +36,7 @@ class MANTIDQT_INELASTIC_DLL IndirectFitDataPresenter : public IIndirectFitDataP
   IndirectFitDataPresenter(IIndirectDataAnalysisTab *tab, IIndirectFitDataModel *model, IIndirectFitDataView *view);
   ~IndirectFitDataPresenter();
   std::vector<IndirectFitData> *getFittingData();
-  virtual bool addWorkspaceFromDialog(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog);
+  virtual bool addWorkspaceFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog);
   void addWorkspace(const std::string &workspaceName, const FunctionModelSpectra &workspaceIndices);
   void setResolution(const std::string &name);
   void setSampleWSSuffices(const QStringList &suffices);
@@ -80,7 +78,7 @@ class MANTIDQT_INELASTIC_DLL IndirectFitDataPresenter : public IIndirectFitDataP
 
   virtual void subscribeFitPropertyBrowser(IIndirectFitPropertyBrowser *browser) { UNUSED_ARG(browser); };
 
-  void handleAddData(MantidQt::MantidWidgets::IAddWorkspaceDialog const *dialog) override;
+  void handleAddData(MantidWidgets::IAddWorkspaceDialog const *dialog) override;
   void handleRemoveClicked() override;
   void handleUnifyClicked() override;
   void handleCellChanged(int row, int column) override;

qt/scientific_interfaces/Inelastic/Analysis/IndirectFitDataView.h

@@ -23,7 +23,6 @@ class IAddWorkspaceDialog;
 namespace CustomInterfaces {
 namespace IDA {
 
-class AddWorkspaceDialog;
 class IIndirectFitDataPresenter;
 
 class MANTIDQT_INELASTIC_DLL IndirectFitDataView : public QTabWidget, public IIndirectFitDataView {

qt/scientific_interfaces/Inelastic/Manipulation/InelasticDataManipulationElwinTab.cpp

@@ -290,7 +290,7 @@ void InelasticDataManipulationElwinTab::newInputFiles() {
  *
  * Updates preview selection combo box.
  */
-void InelasticDataManipulationElwinTab::newInputFilesFromDialog(IAddWorkspaceDialog const *dialog) {
+void InelasticDataManipulationElwinTab::newInputFilesFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   // Clear the existing list of files
   if (m_dataModel->getNumberOfWorkspaces().value < 2)
     m_view->clearPreviewFile();
@@ -404,7 +404,7 @@ std::string InelasticDataManipulationElwinTab::getOutputBasename() {
   return getWorkspaceBasename(QString::fromStdString(m_pythonExportWsName)).toStdString();
 }
 
-void InelasticDataManipulationElwinTab::handleAddData(IAddWorkspaceDialog const *dialog) {
+void InelasticDataManipulationElwinTab::handleAddData(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   try {
     addDataToModel(dialog);
     updateTableFromModel();
@@ -416,10 +416,10 @@ void InelasticDataManipulationElwinTab::handleAddData(IAddWorkspaceDialog const
   }
 }
 
-void InelasticDataManipulationElwinTab::handleAddDataFromFile(IAddWorkspaceDialog const *dialog) {
+void InelasticDataManipulationElwinTab::handleAddDataFromFile(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   try {
     UserInputValidator uiv;
-    const auto indirectDialog = dynamic_cast<AddWorkspaceDialog const *>(dialog);
+    const auto indirectDialog = dynamic_cast<MantidWidgets::AddWorkspaceDialog const *>(dialog);
     QList<QString> allFiles;
     allFiles.append(QString::fromStdString(indirectDialog->getFileName()));
     auto const suffixes = getFilteredSuffixes(allFiles);
@@ -439,8 +439,8 @@ void InelasticDataManipulationElwinTab::handleAddDataFromFile(IAddWorkspaceDialo
   }
 }
 
-void InelasticDataManipulationElwinTab::addDataToModel(IAddWorkspaceDialog const *dialog) {
-  if (const auto indirectDialog = dynamic_cast<AddWorkspaceDialog const *>(dialog))
+void InelasticDataManipulationElwinTab::addDataToModel(MantidWidgets::IAddWorkspaceDialog const *dialog) {
+  if (const auto indirectDialog = dynamic_cast<MantidWidgets::AddWorkspaceDialog const *>(dialog))
     m_dataModel->addWorkspace(indirectDialog->workspaceName(), indirectDialog->workspaceIndices());
 }
 

qt/scientific_interfaces/Inelastic/Manipulation/InelasticDataManipulationElwinTab.h

@@ -34,8 +34,8 @@ class IElwinPresenter {
   virtual void handleFilesFound() = 0;
   virtual void handlePreviewSpectrumChanged(int spectrum) = 0;
   virtual void handlePreviewIndexChanged(int index) = 0;
-  virtual void handleAddData(IAddWorkspaceDialog const *dialog) = 0;
-  virtual void handleAddDataFromFile(IAddWorkspaceDialog const *dialog) = 0;
+  virtual void handleAddData(MantidWidgets::IAddWorkspaceDialog const *dialog) = 0;
+  virtual void handleAddDataFromFile(MantidWidgets::IAddWorkspaceDialog const *dialog) = 0;
   virtual void handleRemoveSelectedData() = 0;
   virtual void updateAvailableSpectra() = 0;
 };
@@ -60,15 +60,15 @@ class MANTIDQT_INELASTIC_DLL InelasticDataManipulationElwinTab : public Inelasti
   void handleFilesFound() override;
   void handlePreviewSpectrumChanged(int spectrum) override;
   void handlePreviewIndexChanged(int index) override;
-  void handleAddData(IAddWorkspaceDialog const *dialog) override;
-  void handleAddDataFromFile(IAddWorkspaceDialog const *dialog) override;
+  void handleAddData(MantidWidgets::IAddWorkspaceDialog const *dialog) override;
+  void handleAddDataFromFile(MantidWidgets::IAddWorkspaceDialog const *dialog) override;
   void handleRemoveSelectedData() override;
   void updateAvailableSpectra() override;
 
 protected:
   void runComplete(bool error) override;
-  void newInputFilesFromDialog(IAddWorkspaceDialog const *dialog);
-  virtual void addDataToModel(IAddWorkspaceDialog const *dialog);
+  void newInputFilesFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog);
+  virtual void addDataToModel(MantidWidgets::IAddWorkspaceDialog const *dialog);
 
 private:
   void runFileInput();

qt/scientific_interfaces/Inelastic/Manipulation/InelasticDataManipulationElwinTabView.cpp

@@ -204,7 +204,7 @@ void InelasticDataManipulationElwinTabView::notifyRemoveDataClicked() { m_presen
 void InelasticDataManipulationElwinTabView::notifyAddWorkspaceDialog() { showAddWorkspaceDialog(); }
 
 void InelasticDataManipulationElwinTabView::showAddWorkspaceDialog() {
-  auto dialog = new AddWorkspaceDialog(parentWidget());
+  auto dialog = new MantidWidgets::AddWorkspaceDialog(parentWidget());
   connect(dialog, SIGNAL(addData()), this, SLOT(notifyAddData()));
 
   dialog->setAttribute(Qt::WA_DeleteOnClose);
@@ -222,9 +222,9 @@ void InelasticDataManipulationElwinTabView::notifyAddData() { addDataWksOrFile(m
  * A File requires additional checks to ensure a file of the correct type is being loaded. The Workspace list is
  * already filtered.
  */
-void InelasticDataManipulationElwinTabView::addDataWksOrFile(IAddWorkspaceDialog const *dialog) {
+void InelasticDataManipulationElwinTabView::addDataWksOrFile(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   try {
-    const auto indirectDialog = dynamic_cast<AddWorkspaceDialog const *>(dialog);
+    const auto indirectDialog = dynamic_cast<MantidWidgets::AddWorkspaceDialog const *>(dialog);
     if (indirectDialog) {
       // getFileName will be empty if the addWorkspaceDialog is set to Workspace instead of File.
       if (indirectDialog->getFileName().empty()) {
@@ -333,11 +333,11 @@ void InelasticDataManipulationElwinTabView::newInputFiles() {
  *
  * Updates preview selection combo box.
  */
-void InelasticDataManipulationElwinTabView::newInputFilesFromDialog(IAddWorkspaceDialog const *dialog) {
+void InelasticDataManipulationElwinTabView::newInputFilesFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog) {
   // Populate the combo box with the filenames
   QString workspaceNames;
   QString filename;
-  if (const auto indirectDialog = dynamic_cast<AddWorkspaceDialog const *>(dialog)) {
+  if (const auto indirectDialog = dynamic_cast<MantidWidgets::AddWorkspaceDialog const *>(dialog)) {
     workspaceNames = QString::fromStdString(indirectDialog->workspaceName());
     filename = QString::fromStdString(indirectDialog->getFileName());
   }

qt/scientific_interfaces/Inelastic/Manipulation/InelasticDataManipulationElwinTabView.h

@@ -46,7 +46,7 @@ class MANTIDQT_INELASTIC_DLL InelasticDataManipulationElwinTabView : public QWid
 
   void plotInput(MatrixWorkspace_sptr inputWS, int spectrum) override;
   void newInputFiles() override;
-  void newInputFilesFromDialog(IAddWorkspaceDialog const *dialog) override;
+  void newInputFilesFromDialog(MantidWidgets::IAddWorkspaceDialog const *dialog) override;
   void clearPreviewFile() override;
   void clearInputFiles() override;
   void setRunIsRunning(const bool running) override;
@@ -117,11 +117,11 @@ private slots:
   void setButtonsEnabled(const bool enabled);
   void setRunEnabled(const bool enabled);
   void setCell(std::unique_ptr<QTableWidgetItem> cell, int row, int column);
-  void addDataWksOrFile(IAddWorkspaceDialog const *dialog);
+  void addDataWksOrFile(MantidWidgets::IAddWorkspaceDialog const *dialog);
 
   IElwinPresenter *m_presenter;
   QtTreePropertyBrowser *m_elwTree;
-  IAddWorkspaceDialog *m_addWorkspaceDialog;
+  MantidWidgets::IAddWorkspaceDialog *m_addWorkspaceDialog;
 
   Ui::InelasticDataManipulationElwinTab m_uiForm;
   QtDoublePropertyManager *m_dblManager;