From 38810e36e27539c0aefa3eec4645d0b4a6b754bd Mon Sep 17 00:00:00 2001
From: Gemma Guest <gemma.guest@stfc.ac.uk>
Date: Fri, 2 Aug 2019 09:06:22 +0100
Subject: [PATCH] Add namespace for the ISISReflectometry GUI
Recent changes mean the classes now have shorter names so the namespace ensures will will not have any clashes with other GUIs.
Re #26535
---
.../ISISReflectometry/Common/Clipboard.cpp | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/First.h | 2 ++
.../ISISReflectometry/Common/GetInstrumentParameter.cpp | 2 ++
.../ISISReflectometry/Common/GetInstrumentParameter.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h | 2 ++
.../ISISReflectometry/Common/InstrumentParameters.cpp | 2 ++
.../ISISReflectometry/Common/InstrumentParameters.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/Map.h | 2 ++
.../ISISReflectometry/Common/OptionDefaults.cpp | 2 ++
.../ISISReflectometry/Common/OptionDefaults.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/Parse.h | 2 ++
.../ISISReflectometry/Common/QWidgetGroup.h | 2 ++
.../ISISReflectometry/Common/ValidationResult.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h | 2 ++
.../ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp | 4 +++-
.../ISISReflectometry/GUI/Batch/AlgorithmProperties.h | 2 ++
.../ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp | 2 ++
.../ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h | 2 ++
.../ISISReflectometry/GUI/Batch/BatchJobRunner.cpp | 2 ++
.../ISISReflectometry/GUI/Batch/BatchJobRunner.h | 2 ++
.../ISISReflectometry/GUI/Batch/BatchPresenter.cpp | 2 ++
.../ISISReflectometry/GUI/Batch/BatchPresenter.h | 2 ++
.../ISISReflectometry/GUI/Batch/BatchPresenterFactory.h | 2 ++
.../ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp | 2 ++
.../ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h | 2 ++
.../ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h | 2 ++
.../ISISReflectometry/GUI/Batch/IBatchJobRunner.h | 2 ++
.../ISISReflectometry/GUI/Batch/IBatchPresenter.h | 2 ++
.../ISISReflectometry/GUI/Batch/IBatchView.h | 2 ++
.../ISISReflectometry/GUI/Batch/QtBatchView.cpp | 2 ++
.../ISISReflectometry/GUI/Batch/QtBatchView.h | 2 ++
.../ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp | 2 ++
.../ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h | 2 ++
.../ISISReflectometry/GUI/Common/IMessageHandler.h | 2 ++
.../ISISReflectometry/GUI/Common/IPlotter.h | 4 +++-
.../ISISReflectometry/GUI/Common/IPythonRunner.h | 2 ++
.../ISISReflectometry/GUI/Common/Plotter.cpp | 2 ++
.../ISISReflectometry/GUI/Common/Plotter.h | 2 ++
.../ISISReflectometry/GUI/Event/EventPresenter.cpp | 2 ++
.../ISISReflectometry/GUI/Event/EventPresenter.h | 2 ++
.../ISISReflectometry/GUI/Event/EventPresenterFactory.h | 2 ++
.../ISISReflectometry/GUI/Event/IEventPresenter.h | 2 ++
.../ISISReflectometry/GUI/Event/IEventView.h | 2 ++
.../ISISReflectometry/GUI/Event/QtEventView.cpp | 2 ++
.../ISISReflectometry/GUI/Event/QtEventView.h | 2 ++
.../GUI/Experiment/ExperimentOptionDefaults.cpp | 2 ++
.../GUI/Experiment/ExperimentOptionDefaults.h | 2 ++
.../ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp | 2 ++
.../ISISReflectometry/GUI/Experiment/ExperimentPresenter.h | 2 ++
.../GUI/Experiment/ExperimentPresenterFactory.h | 2 ++
.../ISISReflectometry/GUI/Experiment/IExperimentPresenter.h | 2 ++
.../ISISReflectometry/GUI/Experiment/IExperimentView.h | 2 ++
.../ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp | 2 ++
.../ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h | 2 ++
.../GUI/Experiment/PerThetaDefaultsTableValidationError.cpp | 2 ++
.../GUI/Experiment/PerThetaDefaultsTableValidationError.h | 2 ++
.../GUI/Experiment/PerThetaDefaultsTableValidator.cpp | 2 ++
.../GUI/Experiment/PerThetaDefaultsTableValidator.h | 2 ++
.../ISISReflectometry/GUI/Experiment/QtExperimentView.cpp | 2 ++
.../ISISReflectometry/GUI/Experiment/QtExperimentView.h | 2 ++
.../GUI/Experiment/ThetaValuesValidationError.h | 4 +++-
.../ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h | 2 ++
.../ISISReflectometry/GUI/Instrument/IInstrumentView.h | 2 ++
.../GUI/Instrument/InstrumentOptionDefaults.cpp | 2 ++
.../GUI/Instrument/InstrumentOptionDefaults.h | 2 ++
.../ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp | 2 ++
.../ISISReflectometry/GUI/Instrument/InstrumentPresenter.h | 2 ++
.../GUI/Instrument/InstrumentPresenterFactory.h | 2 ++
.../ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp | 2 ++
.../ISISReflectometry/GUI/Instrument/QtInstrumentView.h | 2 ++
.../ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h | 2 ++
.../ISISReflectometry/GUI/MainWindow/IMainWindowView.h | 2 ++
.../ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp | 2 ++
.../ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h | 2 ++
.../ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp | 2 ++
.../ISISReflectometry/GUI/MainWindow/QtMainWindowView.h | 2 ++
.../ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp | 2 ++
.../ISISReflectometry/GUI/Runs/CatalogRunNotifier.h | 2 ++
.../ISISReflectometry/GUI/Runs/IRunNotifier.h | 2 ++
.../ISISReflectometry/GUI/Runs/IRunsPresenter.h | 2 ++
.../ISISReflectometry/GUI/Runs/IRunsView.h | 2 ++
.../ISISReflectometry/GUI/Runs/ISearchModel.h | 2 ++
.../ISISReflectometry/GUI/Runs/ISearcher.h | 2 ++
.../ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp | 2 ++
.../ISISReflectometry/GUI/Runs/QtCatalogSearcher.h | 2 ++
.../ISISReflectometry/GUI/Runs/QtRunsView.cpp | 2 ++
.../ISISReflectometry/GUI/Runs/QtRunsView.h | 2 ++
.../ISISReflectometry/GUI/Runs/QtSearchModel.cpp | 2 ++
.../ISISReflectometry/GUI/Runs/QtSearchModel.h | 2 ++
.../ISISReflectometry/GUI/Runs/RunsPresenter.cpp | 2 ++
.../ISISReflectometry/GUI/Runs/RunsPresenter.h | 2 ++
.../ISISReflectometry/GUI/Runs/RunsPresenterFactory.h | 2 ++
.../ISISReflectometry/GUI/Runs/SearchResult.cpp | 2 ++
.../ISISReflectometry/GUI/Runs/SearchResult.h | 2 ++
.../ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h | 2 ++
.../ISISReflectometry/GUI/RunsTable/IRunsTableView.h | 2 ++
.../ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h | 2 ++
.../ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp | 2 ++
.../ISISReflectometry/GUI/RunsTable/QtRunsTableView.h | 2 ++
.../ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp | 2 ++
.../ISISReflectometry/GUI/RunsTable/RegexRowFilter.h | 2 ++
.../ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp | 2 ++
.../ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h | 2 ++
.../GUI/RunsTable/RunsTablePresenterFactory.cpp | 2 ++
.../GUI/RunsTable/RunsTablePresenterFactory.h | 2 ++
.../ISISReflectometry/GUI/Save/AsciiSaver.cpp | 2 ++
.../ISISReflectometry/GUI/Save/AsciiSaver.h | 2 ++
.../ISISReflectometry/GUI/Save/IAsciiSaver.cpp | 2 ++
.../ISISReflectometry/GUI/Save/IAsciiSaver.h | 2 ++
.../ISISReflectometry/GUI/Save/ISavePresenter.h | 2 ++
.../ISISReflectometry/GUI/Save/ISaveView.h | 2 ++
.../ISISReflectometry/GUI/Save/QtSaveView.cpp | 2 ++
.../ISISReflectometry/GUI/Save/QtSaveView.h | 2 ++
.../ISISReflectometry/GUI/Save/SavePresenter.cpp | 2 ++
.../ISISReflectometry/GUI/Save/SavePresenter.h | 2 ++
.../ISISReflectometry/GUI/Save/SavePresenterFactory.h | 2 ++
.../ISISReflectometry/Reduction/AllInitialized.h | 2 ++
.../ISISReflectometry/Reduction/AnalysisMode.h | 2 ++
.../ISISReflectometry/Reduction/Batch.cpp | 2 ++
qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h | 2 ++
.../ISISReflectometry/Reduction/DetectorCorrections.cpp | 2 ++
.../ISISReflectometry/Reduction/DetectorCorrections.h | 2 ++
.../ISISReflectometry/Reduction/Experiment.cpp | 2 ++
.../ISISReflectometry/Reduction/Experiment.h | 2 ++
.../ISISReflectometry/Reduction/FloodCorrections.cpp | 2 ++
.../ISISReflectometry/Reduction/FloodCorrections.h | 2 ++
.../ISISReflectometry/Reduction/Group.cpp | 2 ++
qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h | 2 ++
.../ISISReflectometry/Reduction/Instrument.cpp | 2 ++
.../ISISReflectometry/Reduction/Instrument.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp | 2 ++
qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h | 2 ++
.../ISISReflectometry/Reduction/ItemState.cpp | 2 ++
.../ISISReflectometry/Reduction/ItemState.h | 2 ++
.../ISISReflectometry/Reduction/MonitorCorrections.cpp | 2 ++
.../ISISReflectometry/Reduction/MonitorCorrections.h | 2 ++
.../ISISReflectometry/Reduction/ParseReflectometryStrings.cpp | 2 ++
.../ISISReflectometry/Reduction/ParseReflectometryStrings.h | 2 ++
.../ISISReflectometry/Reduction/PerThetaDefaults.cpp | 2 ++
.../ISISReflectometry/Reduction/PerThetaDefaults.h | 2 ++
.../ISISReflectometry/Reduction/PolarizationCorrections.cpp | 2 ++
.../ISISReflectometry/Reduction/PolarizationCorrections.h | 2 ++
.../ISISReflectometry/Reduction/ProcessingInstructions.h | 2 ++
.../ISISReflectometry/Reduction/RangeInLambda.cpp | 2 ++
.../ISISReflectometry/Reduction/RangeInLambda.h | 2 ++
.../ISISReflectometry/Reduction/RangeInQ.cpp | 2 ++
.../ISISReflectometry/Reduction/RangeInQ.h | 2 ++
.../ISISReflectometry/Reduction/ReductionJobs.cpp | 2 ++
.../ISISReflectometry/Reduction/ReductionJobs.h | 2 ++
.../ISISReflectometry/Reduction/ReductionOptionsMap.h | 2 ++
.../ISISReflectometry/Reduction/ReductionType.h | 2 ++
.../ISISReflectometry/Reduction/ReductionWorkspaces.cpp | 2 ++
.../ISISReflectometry/Reduction/ReductionWorkspaces.h | 2 ++
qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp | 2 ++
qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h | 2 ++
.../ISISReflectometry/Reduction/RowLocation.cpp | 2 ++
.../ISISReflectometry/Reduction/RowLocation.h | 2 ++
.../ISISReflectometry/Reduction/RunsTable.cpp | 2 ++
.../ISISReflectometry/Reduction/RunsTable.h | 2 ++
.../ISISReflectometry/Reduction/Slicing.cpp | 2 ++
.../ISISReflectometry/Reduction/Slicing.h | 2 ++
.../ISISReflectometry/Reduction/SummationType.h | 2 ++
.../ISISReflectometry/Reduction/TransmissionRunPair.cpp | 2 ++
.../ISISReflectometry/Reduction/TransmissionRunPair.h | 2 ++
.../ISISReflectometry/Reduction/TransmissionStitchOptions.cpp | 2 ++
.../ISISReflectometry/Reduction/TransmissionStitchOptions.h | 2 ++
.../ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp | 2 ++
.../ISISReflectometry/Reduction/ValidatePerThetaDefaults.h | 2 ++
.../ISISReflectometry/Reduction/ValidateRow.cpp | 2 ++
.../ISISReflectometry/Reduction/ValidateRow.h | 2 ++
.../ISISReflectometry/TestHelpers/ModelCreationHelper.cpp | 2 ++
.../ISISReflectometry/TestHelpers/ModelCreationHelper.h | 2 ++
174 files changed, 351 insertions(+), 3 deletions(-)
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp
index c2be61dd68e..869d392eb5d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Clipboard::Clipboard() : m_subtrees(boost::none), m_subtreeRoots(boost::none) {}
@@ -156,5 +157,6 @@ Clipboard::mutableSubtreeRoots() {
bool containsGroups(Clipboard const &clipboard) {
return containsGroups(clipboard.subtreeRoots());
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h
index 03bd87ecaef..46ffb6e7bc8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Clipboard {
public:
@@ -67,6 +68,7 @@ private:
};
bool containsGroups(Clipboard const &clipboard);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_CLIPBOARD_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/First.h b/qt/scientific_interfaces/ISISReflectometry/Common/First.h
index 2d22da4828e..5de221013ac 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/First.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/First.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T> boost::optional<T> first(std::vector<T> const &values) {
if (values.size() > 0)
@@ -39,6 +40,7 @@ public:
return boost::none;
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_FIRST_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp
index 0e0f99ba309..ec5a1dc1c93 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp
@@ -7,6 +7,7 @@
#include "GetInstrumentParameter.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
std::vector<std::string> InstrumentParameter<std::string>::get(
Mantid::Geometry::Instrument_const_sptr instrument,
@@ -69,5 +70,6 @@ std::string const &InstrumentParameterTypeMissmatch::expectedType() const {
std::string const &InstrumentParameterTypeMissmatch::originalMessage() const {
return m_originalMessage;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h
index 8a5de6c134b..ee576030250 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h
@@ -12,6 +12,7 @@
#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T> class InstrumentParameter;
template <> class InstrumentParameter<std::string> {
@@ -131,6 +132,7 @@ auto getInstrumentParameter(Mantid::Geometry::Instrument_const_sptr instrument,
std::declval<std::string const &>())) {
return InstrumentParameter<T>::get(instrument, parameterName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_GETINSTRUMENTPARAMETER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h b/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h
index 126aa99283d..d222f9c2610 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Container, typename Predicate>
boost::optional<int> indexOf(Container const &container, Predicate pred) {
@@ -30,6 +31,7 @@ boost::optional<int> indexOfValue(Container const &container, ValueType value) {
else
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INDEXOF_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp
index 3267fc7dd2e..43f3e9ae622 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp
@@ -7,6 +7,7 @@
#include "InstrumentParameters.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
InstrumentParameters::InstrumentParameters(
Mantid::Geometry::Instrument_const_sptr instrument)
: m_instrument(std::move(instrument)) {}
@@ -32,5 +33,6 @@ bool InstrumentParameters::hasMissingValues() const {
std::string const &MissingInstrumentParameterValue::parameterName() const {
return m_parameterName;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h
index 7c0f9700dc5..dd883d98edd 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T>
boost::optional<T>
@@ -133,6 +134,7 @@ private:
std::vector<InstrumentParameterTypeMissmatch> m_typeErrors;
std::vector<MissingInstrumentParameterValue> m_missingValueErrors;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPARAMETERS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Map.h b/qt/scientific_interfaces/ISISReflectometry/Common/Map.h
index a46ecc00a4c..1fe767386ec 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Map.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Map.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Container, typename Transform,
typename Out = typename std::result_of<
@@ -42,6 +43,7 @@ std::string optionalToString(boost::optional<T> maybeValue) {
})
.get_value_or(std::string());
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_MAP_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp
index 8828d84f582..684edeb5826 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
OptionDefaults::OptionDefaults(
Mantid::Geometry::Instrument_const_sptr instrument)
@@ -57,5 +58,6 @@ std::string OptionDefaults::getString(std::string const &propertyName,
std::string const ¶meterName) const {
return getValue<std::string>(propertyName, parameterName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h
index 9fe038f48b5..9c56920ee66 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class OptionDefaults
@@ -78,6 +79,7 @@ T OptionDefaults::getValue(std::string const &propertyName,
return Mantid::API::checkForMandatoryInstrumentDefault<T>(
m_algorithm.get(), propertyName, m_instrument, parameterName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_OPTIONDEFAULTS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp
index aed41e164b8..bc848c05e93 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
bool isEntirelyWhitespace(std::string const &string) {
return std::all_of(string.cbegin(), string.cend(),
@@ -70,5 +71,6 @@ boost::optional<int> parseNonNegativeInt(std::string string) {
else
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h
index 9b8af9f80c5..83ec23b82a0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
MANTIDQT_ISISREFLECTOMETRY_DLL boost::optional<double>
parseDouble(std::string string);
@@ -56,6 +57,7 @@ parseList(std::string commaSeparatedValues, ParseItemFunction parseItem) {
return std::vector<ParsedItem>();
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PARSE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h b/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h
index 0bd033cb89d..be15f6996b4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h
@@ -11,6 +11,7 @@
#include <cstddef>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <std::size_t N> class QWidgetGroup {
public:
QWidgetGroup() : m_widgets() {}
@@ -36,6 +37,7 @@ QWidgetGroup<sizeof...(Ts)> makeQWidgetGroup(Ts... widgets) {
return QWidgetGroup<sizeof...(Ts)>(
std::array<QWidget *, sizeof...(Ts)>({{widgets...}}));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_QWIDGETGROUP_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h b/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h
index 48f900717aa..f76c51cf4ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Validated, typename Error = boost::blank>
class ValidationResult {
@@ -69,6 +70,7 @@ ValidationResult<Validated, Error>::validElseNone() const {
else
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_RESULT_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h b/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h
index 5fc1224e9f3..6b22749cc6a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <class... Containers>
auto zip_range(Containers &... containers)
@@ -20,6 +21,7 @@ auto zip_range(Containers &... containers)
return {boost::make_zip_iterator(boost::make_tuple(containers.begin()...)),
boost::make_zip_iterator(boost::make_tuple(containers.end()...))};
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_ZIPRANGE_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp
index 0c571a71d4f..67228f863ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp
@@ -11,12 +11,13 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
+namespace AlgorithmProperties {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
using Mantid::API::Workspace_sptr;
-namespace AlgorithmProperties {
std::string boolToString(bool value) { return value ? "1" : "0"; }
void update(std::string const &property, std::string const &value,
@@ -77,5 +78,6 @@ std::string getOutputWorkspace(IAlgorithm_sptr algorithm,
return workspaceName;
}
} // namespace AlgorithmProperties
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h
index 94da50106c5..fdc4920a497 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace AlgorithmProperties {
using AlgorithmRuntimeProps = std::map<std::string, std::string>;
@@ -61,6 +62,7 @@ void update(std::string const &property, std::vector<VALUE_TYPE> const &values,
update(property, value, properties);
}
} // namespace AlgorithmProperties
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp
index bdb8642839f..8cc23e5c2f8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
@@ -26,5 +27,6 @@ void BatchJobAlgorithm::updateItem() {
if (m_item)
m_updateFunction(m_algorithm, *m_item);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h
index 57821d98b8a..837951ad977 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/**
* The BatchJobAlgorithm class overrides ConfiguredAlgorithm so that
@@ -41,6 +42,7 @@ private:
};
using BatchJobAlgorithm_sptr = boost::shared_ptr<BatchJobAlgorithm>;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp
index 842dd087d5f..c7c2175a001 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
@@ -294,5 +295,6 @@ void BatchJobRunner::notifyAllWorkspacesDeleted() {
// All output workspaces will be deleted so reset all rows and groups
m_batch.resetState();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h
index a7a0de0a6d9..de7eb176d4f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/**
* The BatchJobRunner class sets up algorithms to run based on the reduction
@@ -80,6 +81,7 @@ private:
Row &row,
std::deque<MantidQt::API::IConfiguredAlgorithm_sptr> &algorithms);
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp
index 73d946eceb3..13e263dbece 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp
@@ -21,6 +21,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::AlgorithmManager;
@@ -353,5 +354,6 @@ void BatchPresenter::clearADSHandle() {
m_runsPresenter->notifyRowOutputsChanged();
m_runsPresenter->notifyRowStateChanged();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h
index b890fdf0b02..10d410309e5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h
@@ -22,6 +22,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchView;
@@ -108,6 +109,7 @@ private:
protected:
std::unique_ptr<IBatchJobRunner> m_jobRunner;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_BATCHPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h
index 4837f36f6f1..a65085140a6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class BatchPresenterFactory {
public:
BatchPresenterFactory(
@@ -60,6 +61,7 @@ private:
InstrumentPresenterFactory m_instrumentPresenterFactory;
SavePresenterFactory m_savePresenterFactory;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_BATCHPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp
index 9a7990ef9ec..9ea50269369 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
@@ -144,5 +145,6 @@ AlgorithmRuntimeProps createAlgorithmRuntimeProps(Batch const &model,
updateStitchProperties(properties, model.experiment().stitchParameters());
return properties;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h
index 395db59ab0f..45880fd9627 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Batch;
class Group;
class IConfiguredAlgorithm;
@@ -26,6 +27,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL MantidQt::API::IConfiguredAlgorithm_sptr
createConfiguredAlgorithm(Batch const &model, Group &group);
MANTIDQT_ISISREFLECTOMETRY_DLL AlgorithmRuntimeProps
createAlgorithmRuntimeProps(Batch const &model, Group const &group);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h
index ad96dfd80a6..a536b933eb7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Item;
@@ -26,6 +27,7 @@ public:
virtual void updateItem() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h
index 618e196932b..3b77b3d1de7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IBatchJobRunner {
public:
@@ -46,6 +47,7 @@ public:
getAlgorithms() = 0;
virtual AlgorithmRuntimeProps rowProcessingProperties() const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h
index 67c40314d4e..439668b7b4f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IMainWindowPresenter;
@@ -53,6 +54,7 @@ public:
virtual Mantid::Geometry::Instrument_const_sptr instrument() const = 0;
virtual std::string instrumentName() const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IBATCHPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h
index 5eb64a069b1..4b1944f5f0e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h
@@ -23,6 +23,7 @@ using IConfiguredAlgorithm_sptr = boost::shared_ptr<IConfiguredAlgorithm>;
} // namespace API
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL BatchViewSubscriber {
public:
@@ -57,6 +58,7 @@ public:
virtual void executeAlgorithmQueue() = 0;
virtual void cancelAlgorithmQueue() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IBATCHVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp
index 9a48ee56e3c..4a4cab04611 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::BatchAlgorithmRunner;
using Mantid::API::IAlgorithm_sptr;
@@ -135,5 +136,6 @@ IAlgorithm_sptr QtBatchView::createReductionAlg() {
std::unique_ptr<QtSaveView> QtBatchView::createSaveTab() {
return std::make_unique<QtSaveView>(this);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h
index bc5f29b3ff4..86d2c720cc9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h
@@ -22,6 +22,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class QtBatchView : public QWidget, public IBatchView {
Q_OBJECT
@@ -66,6 +67,7 @@ private:
std::unique_ptr<QtInstrumentView> m_instrument;
API::BatchAlgorithmRunner m_batchAlgoRunner;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTBATCHVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp
index 6835be161bd..320fa6b7d86 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
@@ -311,5 +312,6 @@ AlgorithmRuntimeProps createAlgorithmRuntimeProps(Batch const &model) {
updatePerThetaDefaultProperties(properties, model.wildcardDefaults());
return properties;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h
index 648f5e90f69..80d17d47bce 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Batch;
class Row;
class IConfiguredAlgorithm;
@@ -29,6 +30,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL AlgorithmRuntimeProps
createAlgorithmRuntimeProps(Batch const &model, Row const &row);
MANTIDQT_ISISREFLECTOMETRY_DLL AlgorithmRuntimeProps
createAlgorithmRuntimeProps(Batch const &model);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h
index b7f111fd15b..16bb9666da5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h
@@ -10,6 +10,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IMessageHandler
IMessageHandler is an interface for passing messages to the user
@@ -24,6 +25,7 @@ public:
virtual bool askUserYesNo(const std::string &prompt,
const std::string &title) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h
index 0212bd006f5..3c3ec216039 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IPlotter {
public:
@@ -21,7 +22,8 @@ public:
reflectometryPlot(const std::vector<std::string> &workspaces) const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif /* MANTID_ISISREFLECTOMETRY_IPLOTTER_H */
\ No newline at end of file
+#endif /* MANTID_ISISREFLECTOMETRY_IPLOTTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h
index 191fe2f6b06..0d744909ae9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IPythonRunner
IPythonRunner is an interface for running python code
@@ -23,6 +24,7 @@ public:
virtual ~IPythonRunner(){};
virtual std::string runPythonAlgorithm(const std::string &pythonCode) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp
index 2de84b6d257..e4c9a1ff3a1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp
@@ -23,6 +23,7 @@ using namespace MantidQt::Widgets::MplCpp;
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Plotter::Plotter(MantidQt::CustomInterfaces::IPythonRunner *pythonRunner)
@@ -90,5 +91,6 @@ void Plotter::runPython(const std::string &pythonCode) const {
}
#endif
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h
index 06f7be74883..16589be7988 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
class IPythonRunner;
#endif
@@ -36,6 +37,7 @@ private:
#endif
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
index 3cbcbdccdfc..6b54a265809 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param view :: The view we are handling
@@ -148,5 +149,6 @@ bool EventPresenter::isProcessing() const {
bool EventPresenter::isAutoreducing() const {
return m_mainPresenter->isAutoreducing();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
index 7952fe1ec5c..daece40d0f6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class EventPresenter
@@ -58,6 +59,7 @@ private:
IEventView *m_view;
SliceType m_sliceType;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
index e28d25f588b..4f62cd74935 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class EventPresenterFactory {
public:
@@ -21,6 +22,7 @@ public:
return std::make_unique<EventPresenter>(view);
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
index 0a9e6e4c4d2..722ee6b0460 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IEventPresenter
@@ -30,6 +31,7 @@ public:
virtual void autoreductionResumed() = 0;
virtual Slicing const &slicing() const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLEVENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h
index f0a77b99a53..49f32340a49 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class SliceType { None, UniformEven, Uniform, Custom, LogValue };
@@ -54,6 +55,7 @@ public:
virtual void enableSliceTypeSelection() = 0;
virtual void disableSliceTypeSelection() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_IREFLEVENTVIEW_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp
index aa594f76ea7..d04d6bb986a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param parent :: [input] The parent of this widget
@@ -214,5 +215,6 @@ void QtEventView::onToggleDisabledSlicing(bool isChecked) {
m_notifyee->notifySliceTypeChanged(SliceType::None);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h
index fb5485ab6e8..87520ae24ca 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtEventView : Provides an interface for the "Event Handling" widget
in
@@ -79,6 +80,7 @@ private:
EventViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp
index 9cee8d09354..affbafed7fb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// unnamed namespace
namespace {
@@ -110,5 +111,6 @@ Experiment ExperimentOptionDefaults::get(
Mantid::Geometry::Instrument_const_sptr instrument) {
return getExperimentDefaults(instrument);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h
index a9086765f5a..a161d691008 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IExperimentOptionDefaults {
public:
@@ -30,6 +31,7 @@ class MANTIDQT_ISISREFLECTOMETRY_DLL ExperimentOptionDefaults
public:
Experiment get(Mantid::Geometry::Instrument_const_sptr instrument) override;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTOPTIONDEFAULTS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
index a93ee13aa67..e1631fa9864 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// unnamed namespace
namespace {
Mantid::Kernel::Logger g_log("Reflectometry GUI");
@@ -329,5 +330,6 @@ void ExperimentPresenter::updateViewFromModel() {
// Reconnect settings change notifications
m_view->connectExperimentSettingsWidgets();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
index ef6eeb1ef5f..d168015e4ec 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
@@ -18,6 +18,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class ExperimentValidationErrors {
public:
@@ -103,6 +104,7 @@ private:
Experiment m_model;
double m_thetaTolerance;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
index 58196b1589f..3200d723461 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class ExperimentPresenterFactory {
public:
@@ -29,6 +30,7 @@ public:
private:
double m_thetaTolerance;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
index 12042dd89c3..12fed381e6f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Instrument_const_sptr;
class IExperimentPresenter {
@@ -29,6 +30,7 @@ public:
virtual void instrumentChanged(std::string const &instrumentName) = 0;
virtual void restoreDefaults() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IEXPERIMENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
index 7442bd0dabc..0fff1054a61 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
@@ -18,6 +18,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IExperimentView
@@ -117,6 +118,7 @@ public:
virtual ~IExperimentView() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IEXPERIMENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
index 29abd74202e..02a933b1edb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
InvalidDefaultsError::InvalidDefaultsError( // cppcheck-suppress passedByValue
int row, std::vector<int> invalidColumns)
@@ -28,5 +29,6 @@ bool operator!=(InvalidDefaultsError const &lhs,
InvalidDefaultsError const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
index f3bc871557b..f5d50752a82 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL InvalidDefaultsError {
public:
@@ -27,6 +28,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(InvalidDefaultsError const &lhs,
InvalidDefaultsError const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(InvalidDefaultsError const &lhs,
InvalidDefaultsError const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INVALIDDEFAULTSERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
index 8c3ae78dff4..8fb79d11ae5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
@@ -8,6 +8,7 @@
#include "ThetaValuesValidationError.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
PerThetaDefaultsTableValidationError::PerThetaDefaultsTableValidationError(
// cppcheck-suppress passedByValue
@@ -25,5 +26,6 @@ boost::optional<ThetaValuesValidationError>
PerThetaDefaultsTableValidationError::fullTableError() const {
return m_fullTableError;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
index 8aa0e950182..6213599d1ab 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL PerThetaDefaultsTableValidationError {
public:
@@ -28,6 +29,7 @@ private:
boost::optional<ThetaValuesValidationError> m_fullTableError;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATIONERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
index 6db40973b6e..c1cd843f0a5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
auto PerThetaDefaultsTableValidator::
operator()(ContentType const &perThetaDefaultsContent,
@@ -124,5 +125,6 @@ void PerThetaDefaultsTableValidator::appendThetaErrorForAllRows(
for (auto row = 0u; row < rowCount; ++row)
validationErrors.emplace_back(row, std::vector<int>({0}));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
index e64999ec045..182d517c8d6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL PerThetaDefaultsTableValidator {
public:
@@ -44,6 +45,7 @@ public:
std::vector<InvalidDefaultsError> &validationErrors,
std::size_t rowCount) const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATOR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
index 509f56ce1d9..639357a97c7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
// Changing the palette for spin boxes doesn't work but we can
@@ -711,5 +712,6 @@ void showOptionLoadErrors(
std::vector<InstrumentParameterTypeMissmatch> const &typeErrors,
std::vector<MissingInstrumentParameterValue> const &missingValues);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
index a7d1afec11e..e287d14d475 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** ExperiementView : Provides an interface for the "Experiement" tab in the
ISIS Reflectometry interface.
@@ -176,6 +177,7 @@ private:
ExperimentViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
index e7c0e6b798e..62585b3a0ff 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
@@ -8,8 +8,10 @@
#define MANTID_ISISREFLECTOMETRY_THETAVALUESVALIDATIONERROR_H
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class ThetaValuesValidationError { MultipleWildcards, NonUniqueTheta };
-}
+} // namespace ISISReflectometry
+} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_THETAVALUESVALIDATIONERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
index 05bf4aacde1..8411d910f3c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchPresenter;
@@ -34,6 +35,7 @@ public:
virtual void instrumentChanged(std::string const &instrumentName) = 0;
virtual void restoreDefaults() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IINSTRUMENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
index bf6b33f9bf6..a353aca2709 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IInstrumentView
@@ -71,6 +72,7 @@ public:
virtual void enableDetectorCorrectionType() = 0;
virtual void disableDetectorCorrectionType() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IINSTRUMENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp
index e5db4a8a2d2..a1c3b4f1f4c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// unnamed namespace
namespace {
@@ -66,5 +67,6 @@ Instrument InstrumentOptionDefaults::get(
Mantid::Geometry::Instrument_const_sptr instrument) {
return getInstrumentDefaults(instrument);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h
index 433262703b2..7563380e870 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IInstrumentOptionDefaults {
public:
@@ -32,6 +33,7 @@ class MANTIDQT_ISISREFLECTOMETRY_DLL InstrumentOptionDefaults
public:
Instrument get(Mantid::Geometry::Instrument_const_sptr instrument) override;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTOPTIONDEFAULTS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
index 5ce16626a05..279b851932a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
Mantid::Kernel::Logger g_log("Reflectometry GUI");
@@ -230,5 +231,6 @@ void InstrumentPresenter::updateViewFromModel() {
// Reconnect settings change notifications
m_view->connectInstrumentSettingsWidgets();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
index d7d53009a3f..e9c40ec3d93 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class InstrumentPresenter
@@ -67,6 +68,7 @@ private:
bool isProcessing() const;
bool isAutoreducing() const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
index b64b49c49a7..050a2d59288 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class InstrumentPresenterFactory {
public:
@@ -24,6 +25,7 @@ public:
return std::make_unique<InstrumentPresenter>(view, Instrument());
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp
index 5e51074ca9b..802d285c09c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
// Changing the palette for spin boxes doesn't work but we can
@@ -382,5 +383,6 @@ std::string QtInstrumentView::getDetectorCorrectionType() const {
void QtInstrumentView::setDetectorCorrectionType(std::string const &value) {
setSelected(*m_ui.detectorCorrectionTypeComboBox, value);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h
index cf025d59644..873561e9712 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtInstrumentView : Provides an interface for the "Instrument" tab in the
ISIS Reflectometry interface.
@@ -111,6 +112,7 @@ private:
InstrumentViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h
index 5ae6dc5c0e5..0693f339b6f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IMainWindowPresenter
@@ -27,6 +28,7 @@ public:
virtual void notifyAutoreductionPaused() = 0;
virtual ~IMainWindowPresenter() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IMAINWINDOWPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h
index 59c16a5fbae..07c6d5c5cc2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IMainWindowView
@@ -38,6 +39,7 @@ public:
virtual ~IMainWindowView() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLWINDOWVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
index bc245d7b262..d62d6bf4642 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param view :: [input] The view we are managing
@@ -99,5 +100,6 @@ void MainWindowPresenter::showHelp() {
MantidQt::API::HelpWindow::showCustomInterface(nullptr,
QString("ISIS Reflectometry"));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
index d4694d338c6..29caa2e4a68 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IMainWindowView;
class IMessageHandler;
@@ -52,6 +53,7 @@ private:
BatchPresenterFactory m_batchPresenterFactory;
std::vector<std::shared_ptr<IBatchPresenter>> m_batchPresenters;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_MAINWINDOWPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp
index 1b455319205..c22b9531d67 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
@@ -168,5 +169,6 @@ bool QtMainWindowView::askUserYesNo(const std::string &prompt,
return false;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h
index 0402efc5909..0154005818f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class QtMainWindowView
@@ -70,6 +71,7 @@ private:
std::unique_ptr<MainWindowPresenter> m_presenter;
std::vector<IBatchView *> m_batchViews;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTMAINWINDOWVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp
index f97eb03b4ab..950e58fbe37 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
CatalogRunNotifier::CatalogRunNotifier(IRunsView *view) : m_view(view) {
m_view->subscribeTimer(this);
@@ -27,5 +28,6 @@ void CatalogRunNotifier::notifyTimerEvent() {
if (m_notifyee)
m_notifyee->notifyCheckForNewRuns();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h
index 6839446a7b6..bdd27f87707 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class CatalogRunNotifier
CatalogRunNotifier implements IRunNotifier to provide functionality to
@@ -39,6 +40,7 @@ private:
IRunsView *m_view;
RunNotifierSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h
index 580644a95e6..e4f09216204 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RunNotifierSubscriber {
public:
@@ -29,6 +30,7 @@ public:
virtual void startPolling() = 0;
virtual void stopPolling() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h
index 224a7e87dda..ecb3baa61e3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchPresenter;
@@ -51,6 +52,7 @@ public:
virtual int percentComplete() const = 0;
virtual void notifySearchComplete() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLRUNSPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h
index 1c1a9a1a52f..6d915f37f3d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h
@@ -23,6 +23,7 @@ class AlgorithmRunner;
}
namespace CustomInterfaces {
+namespace ISISReflectometry {
/**
IRunsView is the base view class for the Reflectometry "Runs"
@@ -107,6 +108,7 @@ public:
virtual void startMonitor() = 0;
virtual void stopMonitor() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IRUNSVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h
index 0eb68c7d261..fae776dc8a7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL ISearchModel {
public:
@@ -27,6 +28,7 @@ public:
/// Typedef for a shared pointer to \c SearchModel
using ISearchModel_sptr = boost::shared_ptr<ISearchModel>;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h
index 755cf5425cc..e1a7ef9532b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class SearcherSubscriber {
public:
@@ -46,6 +47,7 @@ public:
const std::string &instrument,
SearchType searchType) const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp
index 8b8403dbdda..c93460d5ad1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp
@@ -18,6 +18,7 @@ using namespace Mantid::API;
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
void removeResultsWithoutFilenameExtension(ITableWorkspace_sptr results) {
@@ -204,5 +205,6 @@ QtCatalogSearcher::createSearchAlgorithm(const std::string &text) {
ISearchModel &QtCatalogSearcher::results() const {
return m_view->mutableSearchResults();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h
index efde9df0f93..2db10904977 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IMainWindowView;
@@ -75,6 +76,7 @@ private:
void searchAsync();
};
bool hasActiveCatalogSession();
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTCATALOGSEARCHER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp
index 6438cf23161..1c79c7b9eea 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using namespace Mantid::API;
using namespace MantidQt::MantidWidgets;
using namespace MantidQt::Icons;
@@ -404,5 +405,6 @@ void QtRunsView::startTimer(const int millisecs) {
/** stop
*/
void QtRunsView::stopTimer() { m_timer.stop(); }
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h
index c8686befbd8..96fb6d903a1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h
@@ -27,6 +27,7 @@ class AlgorithmRunner;
}
namespace CustomInterfaces {
+namespace ISISReflectometry {
using MantidWidgets::SlitCalculator;
@@ -129,6 +130,7 @@ private slots:
void onShowSearchContextMenuRequested(const QPoint &pos);
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp
index 2c81dd60541..b783abc6309 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using namespace Mantid::API;
namespace { // unnamed
@@ -217,5 +218,6 @@ bool QtSearchModel::runHasError(const SearchResult &run) const {
SearchResult const &QtSearchModel::getRowData(int index) const {
return m_runDetails[index];
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h
index 650feeaeaf0..16146ab747d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtSearchModel : Provides a QAbstractTableModel for a Mantid
ITableWorkspace of Reflectometry search results.
@@ -59,6 +60,7 @@ private:
bool runHasError(const SearchResult &run) const;
void mergeNewResults(std::vector<SearchResult> const &source);
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp
index 923f41c61ad..5542cd6bb8e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp
@@ -30,6 +30,7 @@ using namespace MantidQt::MantidWidgets;
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param mainView :: [input] The view we're managing
@@ -528,5 +529,6 @@ void RunsPresenter::errorHandle(const IAlgorithm *alg,
m_monitorAlg.reset();
updateViewWhenMonitorStopped();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h
index 77076138e72..5cb2ed7142e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h
@@ -29,6 +29,7 @@ class ProgressableView;
} // namespace MantidWidgets
namespace CustomInterfaces {
+namespace ISISReflectometry {
// Forward decs
class IMessageHandler;
@@ -179,6 +180,7 @@ private:
void updateViewWhenMonitorStarted();
void updateViewWhenMonitorStopped();
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_RUNSPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h
index 285e1cc29e1..b22b1077b9d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RunsPresenterFactory {
public:
@@ -44,6 +45,7 @@ private:
IMessageHandler *m_messageHandler;
IPythonRunner *m_pythonRunner;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_RUNSPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp
index eebf01afa36..650c478735c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
SearchResult::SearchResult(const std::string &runNumber,
const std::string &desc, const std::string &loc)
@@ -55,5 +56,6 @@ bool operator==(SearchResult const &lhs, SearchResult const &rhs) {
bool operator!=(SearchResult const &lhs, SearchResult const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h
index 6c60c20f3a2..aede6579737 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL SearchResult {
public:
@@ -40,6 +41,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(SearchResult const &lhs,
SearchResult const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(SearchResult const &lhs,
SearchResult const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_SEARCHRESULT_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h
index 09f693d733e..c7e245ea2f9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IRunsPresenter;
class RunsTable;
@@ -45,6 +46,7 @@ public:
virtual void instrumentChanged(std::string const &instrumentName) = 0;
virtual void settingsChanged() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLRUNSTABLEPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h
index bfd9f8acbe3..01c53342512 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RunsTableViewSubscriber
: public MantidQt::MantidWidgets::Batch::JobTreeViewSubscriber {
@@ -81,6 +82,7 @@ public:
virtual void setProcessButtonEnabled(bool enable) = 0;
virtual void setActionEnabled(Action action, bool enable) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_IBATCHVIEW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
index 3e2c284b817..9027e1d638c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
std::vector<MantidQt::MantidWidgets::Batch::Cell>
@@ -96,6 +97,7 @@ public:
private:
MantidQt::MantidWidgets::Batch::IJobTreeView &m_view;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_JOBVIEWUPDATER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp
index bc3a8e2bdaf..a7548ce45e4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
QtRunsTableView::QtRunsTableView(std::vector<std::string> const &instruments,
int defaultInstrumentIndex)
@@ -314,5 +315,6 @@ int RunsTableViewFactory::defaultInstrumentFromConfig() const {
return indexOfElseFirst(Mantid::Kernel::ConfigService::Instance().getString(
"default.instrument"));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h
index 0e9d502542a..aaa0545a057 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL QtRunsTableView : public QWidget,
public IRunsTableView {
@@ -87,6 +88,7 @@ public:
private:
std::vector<std::string> m_instruments;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_QTRUNSTABLEVIEW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp
index b660ff9d6f1..e3c53bf6fa7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using MantidQt::MantidWidgets::Batch::IJobTreeView;
using MantidQt::MantidWidgets::Batch::RowLocation;
@@ -36,5 +37,6 @@ std::unique_ptr<RegexFilter> filterFromRegexString(std::string const ®ex,
ReductionJobs const &jobs) {
return std::make_unique<RegexFilter>(boost::regex(regex), view, jobs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h
index bc8c298cd7c..2ad5f4540d8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RegexFilter : public MantidQt::MantidWidgets::Batch::RowPredicate {
public:
@@ -37,6 +38,7 @@ std::unique_ptr<RegexFilter>
filterFromRegexString(std::string const ®ex,
MantidQt::MantidWidgets::Batch::IJobTreeView const &view,
ReductionJobs const &jobs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
index 89ab55c07b1..866987eb3c3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
@@ -18,6 +18,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace Colour {
constexpr const char *DEFAULT = "#ffffff"; // white
constexpr const char *INVALID = "#dddddd"; // very pale grey
@@ -874,5 +875,6 @@ void RunsTablePresenter::notifyPlotSelectedStitchedOutputPressed() {
m_plotter.reflectometryPlot(workspaces);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
index a8803b86750..46879f3e073 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
@@ -20,6 +20,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL RunsTablePresenter
: public IRunsTablePresenter,
@@ -163,6 +164,7 @@ private:
IRunsPresenter *m_mainPresenter;
const IPlotter &m_plotter;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RUNSTABLEPRESENTER_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp
index 30f7642755f..4176cd4afc4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
RunsTablePresenterFactory::RunsTablePresenterFactory(
std::vector<std::string> const &instruments, double thetaTolerance,
@@ -21,5 +22,6 @@ operator()(IRunsTableView *view) const {
return std::make_unique<RunsTablePresenter>(
view, m_instruments, m_thetaTolerance, ReductionJobs(), m_plotter);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
index 5dfc3dc944e..9e6f061da7a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IRunsTableView;
@@ -31,6 +32,7 @@ protected:
double m_thetaTolerance;
Plotter m_plotter;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_BATCHPRESENTERFACTORY_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp
index b84b6915e21..7e788cfd64a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp
@@ -13,6 +13,7 @@
#include <Poco/Path.h>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Mantid::API::IAlgorithm_sptr
AsciiSaver::algorithmForFormat(NamedFormat format) {
@@ -145,5 +146,6 @@ void AsciiSaver::save(std::string const &saveDirectory,
throw InvalidSavePath(saveDirectory);
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h
index 986d09a85d7..c0625cce772 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class AsciiSaver : public IAsciiSaver {
public:
static Mantid::API::IAlgorithm_sptr algorithmForFormat(NamedFormat format);
@@ -43,6 +44,7 @@ private:
std::vector<std::string> const &logParameters,
FileFormatOptions const &fileFormat) const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_ASCIISAVER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp
index 9d523796ff2..719ec59d487 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp
@@ -7,6 +7,7 @@
#include "IAsciiSaver.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
InvalidSavePath::InvalidSavePath(std::string const &path)
: std::runtime_error("The path" + path +
"does not exist or is not a directory."),
@@ -34,5 +35,6 @@ bool FileFormatOptions::shouldIncludeQResolution() const {
std::string const &FileFormatOptions::separator() const { return m_separator; }
std::string const &FileFormatOptions::prefix() const { return m_prefix; }
NamedFormat FileFormatOptions::format() const { return m_format; }
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h
index 32de2ae835b..7b53dcb587f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h
@@ -13,6 +13,7 @@
#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class NamedFormat { Custom, ThreeColumn, ANSTO, ILLCosmos };
@@ -75,6 +76,7 @@ public:
FileFormatOptions const &inputParameters) const = 0;
virtual ~IAsciiSaver() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_IASCIISAVER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h
index 50e8712fdae..2515b313513 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchPresenter;
@@ -32,6 +33,7 @@ public:
virtual void autoreductionPaused() = 0;
virtual void autoreductionResumed() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_ISAVEPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h
index b3737ca8d67..d347a2fabc7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL SaveViewSubscriber {
public:
@@ -71,6 +72,7 @@ public:
virtual void cannotSaveWorkspaces() = 0;
virtual void cannotSaveWorkspaces(std::string const &fullError) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_ISAVEVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp
index f6185d1e72f..97ca8bd25ce 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param parent :: The parent of this view
@@ -288,5 +289,6 @@ void QtSaveView::cannotSaveWorkspaces() {
void QtSaveView::cannotSaveWorkspaces(std::string const &fullError) {
error("Error", fullError);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h
index 471717cd12f..104299d21e2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtSaveView : Provides an interface for the "Save ASCII" tab in the
ISIS Reflectometry interface.
@@ -108,6 +109,7 @@ private:
SaveViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp
index dbe1fd37516..78c3209c759 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp
@@ -21,6 +21,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using namespace Mantid::API;
@@ -267,5 +268,6 @@ std::vector<std::string> SavePresenter::getAvailableWorkspaceNames() {
return validNames;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h
index 9d40018ef96..ccd6b55dfa6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class SavePresenter
@@ -85,6 +86,7 @@ private:
std::unique_ptr<IAsciiSaver> m_saver;
bool m_shouldAutosave;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_CUSTOMINTERFACES_SAVEPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h
index 23ab1fcd208..99bf60f5b26 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class SavePresenterFactory {
public:
@@ -23,6 +24,7 @@ public:
std::make_unique<AsciiSaver>());
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_SAVEPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
index 9474083e97e..04921c305e3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
@@ -10,6 +10,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Param>
bool allInitialized(boost::optional<Param> const ¶m) {
@@ -32,6 +33,7 @@ makeIfAllInitialized(boost::optional<Params> const &... params) {
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_ALLINITIALIZED_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
index 554a1cbc4b0..06a200553b1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
@@ -10,6 +10,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class AnalysisMode { PointDetector, MultiDetector };
inline AnalysisMode analysisModeFromString(std::string const &analysisMode) {
@@ -30,6 +31,7 @@ inline std::string analysisModeToString(AnalysisMode analysisMode) {
}
throw std::invalid_argument("Unexpected analysis mode");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_ANALYSISMODE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp
index ba429702c24..e90ddc2636f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp
@@ -7,6 +7,7 @@
#include "Batch.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Batch::Batch(Experiment const &experiment, Instrument const &instrument,
RunsTable &runsTable, Slicing const &slicing)
@@ -45,5 +46,6 @@ boost::optional<Item &>
Batch::getItemWithOutputWorkspaceOrNone(std::string const &wsName) {
return m_runsTable.getItemWithOutputWorkspaceOrNone(wsName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h
index 64d53486697..b40ac507925 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Batch
@@ -57,6 +58,7 @@ bool Batch::isInSelection(T const &item,
&selectedRowLocations) const {
return m_runsTable.isInSelection(item, selectedRowLocations);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_BATCH_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
index bcc4ffaa525..ca0f9cb10c7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
@@ -7,6 +7,7 @@
#include "DetectorCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
DetectorCorrections::DetectorCorrections(bool correctPositions,
DetectorCorrectionType correctionType)
@@ -30,5 +31,6 @@ bool operator==(DetectorCorrections const &lhs,
return lhs.correctPositions() == rhs.correctPositions() &&
lhs.correctionType() == rhs.correctionType();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
index cfdaef056aa..76a0d2883ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class DetectorCorrectionType
@@ -60,6 +61,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(DetectorCorrections const &lhs,
DetectorCorrections const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(DetectorCorrections const &lhs,
DetectorCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_DETECTORCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
index 7648e939c32..d6d798ba33f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
@@ -10,6 +10,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Experiment::Experiment()
: m_analysisMode(AnalysisMode::PointDetector),
@@ -124,5 +125,6 @@ bool operator==(Experiment const &lhs, Experiment const &rhs) {
lhs.stitchParameters() == rhs.stitchParameters() &&
lhs.perThetaDefaults() == rhs.perThetaDefaults();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
index 5d657850a7e..c3910595fbb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
@@ -21,6 +21,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Experiment
@@ -74,6 +75,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Experiment const &lhs,
Experiment const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Experiment const &lhs,
Experiment const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_EXPERIMENT_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp
index fc3f1ce92b6..83f688461b1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp
@@ -7,6 +7,7 @@
#include "FloodCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
FloodCorrections::FloodCorrections(FloodCorrectionType correctionType,
boost::optional<std::string> workspace)
@@ -28,5 +29,6 @@ bool operator==(FloodCorrections const &lhs, FloodCorrections const &rhs) {
return lhs.correctionType() == rhs.correctionType() &&
lhs.workspace() == rhs.workspace();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h
index e0f8e009008..65db0caeb95 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h
@@ -11,6 +11,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class FloodCorrectionType { Workspace, ParameterFile };
inline FloodCorrectionType
@@ -60,6 +61,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(FloodCorrections const &lhs,
FloodCorrections const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(FloodCorrections const &lhs,
FloodCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_FLOODCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp
index 859914f5676..15e260f84af 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Group::Group( // cppcheck-suppress passedByValue
std::string name, std::vector<boost::optional<Row>> rows)
@@ -227,5 +228,6 @@ bool operator==(Group const &lhs, Group const &rhs) {
lhs.postprocessedWorkspaceName() == rhs.postprocessedWorkspaceName() &&
lhs.rows() == rhs.rows();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h
index afabc34ef43..d9f4e7edff7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Group
@@ -95,6 +96,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Group const &lhs,
Group const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Group const &lhs,
Group const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_GROUP_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
index ba2e46d8ff5..b2ee01f1a8d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
@@ -7,6 +7,7 @@
#include "Instrument.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Instrument::Instrument()
: m_wavelengthRange(RangeInLambda(0.0, 0.0)),
@@ -67,5 +68,6 @@ bool operator==(Instrument const &lhs, Instrument const &rhs) {
lhs.monitorCorrections() == rhs.monitorCorrections() &&
lhs.detectorCorrections() == rhs.detectorCorrections();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
index c72404ef278..255297f7167 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Instrument
@@ -48,6 +49,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Instrument const &lhs,
Instrument const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Instrument const &lhs,
Instrument const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_INSTRUMENT_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp
index e38e8a2e139..ae1482e4e80 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Item::Item() : m_itemState(), m_skipped(false) {}
@@ -66,5 +67,6 @@ bool Item::requiresProcessing(bool reprocessFailed) const {
}
return false;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h
index 8ac74b64738..abda539341a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Item
@@ -55,6 +56,7 @@ protected:
ItemState m_itemState;
bool m_skipped;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACE_ITEM_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp
index d5f152dfa79..fe37635c6b7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
ItemState::ItemState()
: m_state(State::ITEM_NOT_STARTED), m_message(boost::none),
@@ -48,5 +49,6 @@ void ItemState::reset() {
m_state = State::ITEM_NOT_STARTED;
m_message = std::string();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h
index 79631701537..725f1a083c8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class State {
ITEM_NOT_STARTED,
@@ -51,6 +52,7 @@ private:
bool requiresMessage() const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACE_STATE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
index b980ac82f4d..14b114d9c77 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
@@ -7,6 +7,7 @@
#include "MonitorCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
MonitorCorrections::MonitorCorrections(
size_t monitorIndex, bool integrate,
@@ -37,5 +38,6 @@ bool operator==(MonitorCorrections const &lhs, MonitorCorrections const &rhs) {
lhs.backgroundRange() == rhs.backgroundRange() &&
lhs.integralRange() == rhs.integralRange();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
index 650e79660f2..02ff3805376 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
@@ -11,6 +11,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class MonitorCorrections
@@ -39,6 +40,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(MonitorCorrections const &lhs,
MonitorCorrections const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(MonitorCorrections const &lhs,
MonitorCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_MONITORCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
index 9fabb1b0bd9..3ad0a93c5b9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
@@ -13,6 +13,7 @@
#include <set>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
boost::optional<std::vector<std::string>>
@@ -194,5 +195,6 @@ parseTransmissionRuns(std::string const &firstTransmissionRun,
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
index fe5e97e929d..80ae86b7179 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
MANTIDQT_ISISREFLECTOMETRY_DLL boost::optional<std::vector<std::string>>
parseRunNumbers(std::string const &runNumbers);
@@ -52,6 +53,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL
boost::optional<boost::optional<std::string>>
parseProcessingInstructions(std::string const &instructions);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PARSEREFLECTOMETRYSTRINGS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
index 79e2fd284c1..10b17fd1fad 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
PerThetaDefaults::PerThetaDefaults(
boost::optional<double> theta,
@@ -84,5 +85,6 @@ perThetaDefaultsToArray(PerThetaDefaults const &perThetaDefaults) {
result[8] = *perThetaDefaults.processingInstructions();
return result;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
index dce78c52f22..0d0e54bd7e3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
@@ -15,6 +15,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class PerThetaDefaults
@@ -73,6 +74,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(PerThetaDefaults const &lhs,
PerThetaDefaults const &rhs);
PerThetaDefaults::ValueArray
perThetaDefaultsToArray(PerThetaDefaults const &perThetaDefaults);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PERTHETADEFAULTS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
index c49cc0e5931..c5defaa43ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
@@ -7,6 +7,7 @@
#include "PolarizationCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
PolarizationCorrections::PolarizationCorrections(
PolarizationCorrectionType correctionType)
@@ -25,5 +26,6 @@ bool operator==(PolarizationCorrections const &lhs,
PolarizationCorrections const &rhs) {
return lhs.correctionType() == rhs.correctionType();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
index 8c6a5f3074b..809b6123640 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
@@ -12,6 +12,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class PolarizationCorrectionType { None, ParameterFile };
inline PolarizationCorrectionType
@@ -58,6 +59,7 @@ operator==(PolarizationCorrections const &lhs,
MANTIDQT_ISISREFLECTOMETRY_DLL bool
operator!=(PolarizationCorrections const &lhs,
PolarizationCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_POLARIZATIONCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h
index 04364d245ac..bcc0b772ded 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h
@@ -11,11 +11,13 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** For now processing instructions are just a string but we expect them to
become more complicated so this can be changed to a class in the future
*/
using ProcessingInstructions = std::string;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PROCESSINGINSTRUCTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
index e6414ffc871..812a66517f1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
@@ -8,6 +8,7 @@
#include "MantidKernel/Tolerance.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
RangeInLambda::RangeInLambda(double min, double max) : m_min(min), m_max(max) {}
@@ -39,5 +40,6 @@ bool operator==(RangeInLambda const &lhs, RangeInLambda const &rhs) {
bool operator!=(RangeInLambda const &lhs, RangeInLambda const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
index 315d54e036d..2eadf11f22e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
@@ -9,6 +9,7 @@
#include "Common/DllConfig.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL RangeInLambda {
public:
@@ -30,6 +31,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(RangeInLambda const &lhs,
RangeInLambda const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(RangeInLambda const &lhs,
RangeInLambda const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RANGEINLAMBDA_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp
index 7cd433b5ff2..62a3781126c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp
@@ -8,6 +8,7 @@
#include <cassert>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
RangeInQ::RangeInQ(boost::optional<double> min, boost::optional<double> step,
boost::optional<double> max)
@@ -29,5 +30,6 @@ bool operator==(RangeInQ const &lhs, RangeInQ const &rhs) {
bool operator!=(RangeInQ const &lhs, RangeInQ const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h
index 1c3928c1963..35edd7d40ad 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL RangeInQ {
public:
@@ -32,6 +33,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(RangeInQ const &lhs,
RangeInQ const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(RangeInQ const &lhs,
RangeInQ const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RANGEINQ_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
index 698dac1a21d..70e9fc6f541 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
Group &findOrMakeGroupWithName(ReductionJobs &jobs,
@@ -331,5 +332,6 @@ bool operator!=(ReductionJobs const &lhs, ReductionJobs const &rhs) {
bool operator==(ReductionJobs const &lhs, ReductionJobs const &rhs) {
return lhs.groups() == rhs.groups();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h
index 80184e164ef..3c149b9b40d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class ReductionJobs
@@ -114,6 +115,7 @@ void mergeJobsInto(ReductionJobs &intoHere, ReductionJobs const &fromHere,
listener.groupRemoved(0);
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
index bac6b7af563..1cafcd97e66 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
@@ -9,11 +9,13 @@
#include <map>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** The ReductionOptionsMap holds information relating to the settings
* in the Options column in the runs table. These are user-specified
* options specified as key=value pairs.
*/
using ReductionOptionsMap = std::map<std::string, std::string>;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONOPTIONSMAP_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
index 822cd3470c3..7a2402dcf69 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
@@ -10,6 +10,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** The ReductionType determines what type of reduction is to be performed
* by the reduction algorithm
*/
@@ -37,6 +38,7 @@ inline std::string reductionTypeToString(ReductionType reductionType) {
}
throw std::invalid_argument("Unexpected reduction type");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONTYPE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp
index 63c9933b92b..dc067b646b3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
ReductionWorkspaces::ReductionWorkspaces(
// cppcheck-suppress passedByValue
std::vector<std::string> inputRunNumbers,
@@ -90,5 +91,6 @@ std::string postprocessedWorkspaceName(
});
return boost::algorithm::join(summedRunList, "_");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h
index c9afa96961e..572cec16111 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class ReductionWorkspaces
@@ -62,6 +63,7 @@ workspaceNames(std::vector<std::string> const &inputRunNumbers,
MANTIDQT_ISISREFLECTOMETRY_DLL std::string postprocessedWorkspaceName(
std::vector<std::vector<std::string> const *> const &summedRunNumbers);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONWORKSPACES_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp
index 4eacb2b8cd7..a239ec73198 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Row::Row( // cppcheck-suppress passedByValue
std::vector<std::string> runNumbers, double theta,
@@ -117,5 +118,6 @@ bool operator==(Row const &lhs, Row const &rhs) {
lhs.reducedWorkspaceNames() == rhs.reducedWorkspaceNames() &&
lhs.reductionOptions() == rhs.reductionOptions();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
index d6a0e393682..cdc70f3101c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
@@ -20,6 +20,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Row
@@ -69,6 +70,7 @@ private:
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Row const &lhs, Row const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Row const &lhs, Row const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL Row mergedRow(Row const &rowA, Row const &rowB);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACE_RUN_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp
index f7c74c55673..645baacf42f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp
@@ -10,6 +10,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T>
void sortAndRemoveDuplicatesInplace(std::vector<T> &items) {
@@ -68,5 +69,6 @@ bool containsPath(
[&path](MantidQt::MantidWidgets::Batch::RowLocation const &location)
-> bool { return location.path() == path; });
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h
index 2b1bee043ef..91d4fa34066 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
std::vector<int> groupIndexesFromSelection(
std::vector<MantidWidgets::Batch::RowLocation> const &selected);
@@ -28,6 +29,7 @@ int rowOf(MantidQt::MantidWidgets::Batch::RowLocation const &rowLocation);
bool containsPath(
std::vector<MantidQt::MantidWidgets::Batch::RowLocation> const &locations,
MantidQt::MantidWidgets::Batch::RowPath const &path);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_ROWLOCATION_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp
index e8af16eb7c7..101d671004a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using MantidWidgets::Batch::RowLocation;
@@ -66,5 +67,6 @@ std::vector<Row> RunsTable::selectedRows() const {
}
return rows;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h
index cefd139ffcd..d4782d0ffbf 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class RunsTable
@@ -60,6 +61,7 @@ bool RunsTable::isInSelection(
auto const path = m_reductionJobs.getPath(item);
return containsPath(selectedRowLocations, path);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RUNSTABLE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
index 9c81767525d..17bd9ec1180 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
UniformSlicingByTime::UniformSlicingByTime(double secondsPerSlice)
: m_secondsPerSlice(secondsPerSlice) {}
@@ -115,5 +116,6 @@ std::ostream &operator<<(std::ostream &os, SlicingByEventLog const &slicing) {
}
return os;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
index 7e32b115c6a..2e7861be504 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL UniformSlicingByTime {
public:
@@ -97,6 +98,7 @@ using Slicing =
MANTIDQT_ISISREFLECTOMETRY_DLL bool isInvalid(Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isValid(Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isNoSlicing(Slicing const &slicing);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
index 04788365122..1e1125f3cb6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** SummationType holds information about what type of summation should be
* done in the reduction
@@ -36,6 +37,7 @@ inline std::string summationTypeToString(SummationType summationType) {
}
throw std::invalid_argument("Unexpected summation type");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_SUMMATIONTYPE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp
index 8cc2c4c842d..74cb29ff40b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
TransmissionRunPair::TransmissionRunPair()
: m_firstTransmissionRunNumbers(), m_secondTransmissionRunNumbers() {}
@@ -58,5 +59,6 @@ bool operator!=(TransmissionRunPair const &lhs,
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
index 1e70438e91b..337f607a862 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class TransmissionRunPair
The TransmissionRunPair model holds information about the two possible
@@ -41,6 +42,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(TransmissionRunPair const &lhs,
TransmissionRunPair const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(TransmissionRunPair const &lhs,
TransmissionRunPair const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_TRANSMISSIONRUNPAIR_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp
index feb0e680aaf..8a6ba8d4a24 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
TransmissionStitchOptions::TransmissionStitchOptions()
: m_overlapRange(boost::none), m_rebinParameters(), m_scaleRHS(false) {}
@@ -39,5 +40,6 @@ bool operator!=(TransmissionStitchOptions const &lhs,
TransmissionStitchOptions const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h
index 321fd7ca9ce..3fe2fba42ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h
@@ -13,6 +13,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// For now just pass rebin params as a string but in future we may want to
// expand this
@@ -46,6 +47,7 @@ operator==(TransmissionStitchOptions const &lhs,
MANTIDQT_ISISREFLECTOMETRY_DLL bool
operator!=(TransmissionStitchOptions const &lhs,
TransmissionStitchOptions const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_TRANSMISSIONSTITCHOPTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
index 7c0912344f8..38015c3ff51 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T>
class AppendErrorIfNotType : public boost::static_visitor<boost::optional<T>> {
@@ -130,5 +131,6 @@ validatePerThetaDefaults(CellText const &cells) {
auto validate = PerThetaDefaultsValidator();
return validate(cells);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
index 1fc87cca4dc..1e99a7c1a9c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
@@ -16,6 +16,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class PerThetaDefaultsValidator
@@ -50,6 +51,7 @@ private:
ValidationResult<PerThetaDefaults, std::vector<int>>
validatePerThetaDefaults(PerThetaDefaults::ValueArray const &cellText);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PERTHETADEFAUTSVALIDATOR_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
index 55adeed3b61..ab8dfa8631a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
enum ColumnNumber {
@@ -145,5 +146,6 @@ boost::optional<Row> validateRowFromRunAndTheta(std::string const &run,
std::vector<std::string> cells = {run, theta, "", "", "", "", "", "", ""};
return validateRow(cells).validElseNone();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
index 3dcb7279b7e..7f5f9af9f0f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
@@ -16,6 +16,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class RowValidator
@@ -49,6 +50,7 @@ RowValidationResult validateRow(std::vector<std::string> const &cellText);
boost::optional<Row> validateRowFromRunAndTheta(std::string const &run,
std::string const &theta);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_VALIDATEROW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp
index 8069723ca3e..426f2598320 100644
--- a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace ModelCreationHelper {
namespace { // unnamed
@@ -381,5 +382,6 @@ Instrument makeEmptyInstrument() {
DetectorCorrections(false, DetectorCorrectionType::VerticalShift));
}
} // namespace ModelCreationHelper
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h
index be183063dd0..a6803b9ebe6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h
+++ b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace ModelCreationHelper {
/* Helper methods to create reduction configuration models for the
@@ -90,6 +91,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL DetectorCorrections makeDetectorCorrections();
MANTIDQT_ISISREFLECTOMETRY_DLL Instrument makeInstrument();
MANTIDQT_ISISREFLECTOMETRY_DLL Instrument makeEmptyInstrument();
} // namespace ModelCreationHelper
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_MODELCREATIONHELPER_H_
--
GitLab