From aeafef65f5d91afd7c150acc1aa9bf542872c9e1 Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Mon, 19 Sep 2016 15:06:13 +0100
Subject: [PATCH] clang format
---
Framework/Algorithms/src/ConvertAxisByFormula.cpp | 7 +++----
.../src/MergeRuns/SampleLogsBehaviour.cpp | 5 ++---
.../CurveFitting/src/HistogramDomainCreator.cpp | 7 +++----
Framework/DataHandling/src/LoadMask.cpp | 12 ++++++------
.../DataProcessorGenerateNotebook.h | 10 +++++-----
.../DataProcessorOpenTableCommand.h | 3 ++-
.../DataProcessorOneLevelTreeManager.cpp | 15 ++++++---------
.../DataProcessorTwoLevelTreeManager.cpp | 15 ++++++---------
.../GenericDataProcessorPresenter.cpp | 14 ++++++--------
.../QDataProcessorTwoLevelTreeModel.cpp | 4 ++--
.../src/DataProcessorUI/QDataProcessorWidget.cpp | 4 ++--
.../src/ProxyCompositePeaksPresenter.cpp | 8 ++++----
12 files changed, 47 insertions(+), 57 deletions(-)
diff --git a/Framework/Algorithms/src/ConvertAxisByFormula.cpp b/Framework/Algorithms/src/ConvertAxisByFormula.cpp
index ad2dbbf1b1d..050fb69fc57 100644
--- a/Framework/Algorithms/src/ConvertAxisByFormula.cpp
+++ b/Framework/Algorithms/src/ConvertAxisByFormula.cpp
@@ -277,10 +277,9 @@ void ConvertAxisByFormula::calculateValues(
}
}
-void
-ConvertAxisByFormula::setGeometryValues(const API::SpectrumInfo &specInfo,
- const size_t index,
- std::vector<Variable_ptr> &variables) {
+void ConvertAxisByFormula::setGeometryValues(
+ const API::SpectrumInfo &specInfo, const size_t index,
+ std::vector<Variable_ptr> &variables) {
for (auto variable : variables) {
if (variable->isGeometric) {
if (variable->name == "twotheta") {
diff --git a/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp b/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp
index 89456f0c700..000c88e698e 100644
--- a/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp
+++ b/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp
@@ -500,9 +500,8 @@ bool SampleLogsBehaviour::isWithinTolerance(const SampleLogBehaviour &behaviour,
* @param addeeWSProperty a pointer to the property in the workspace being added
* @return true if the sample logs match, false otherwise
*/
-bool
-SampleLogsBehaviour::stringPropertiesMatch(const SampleLogBehaviour &behaviour,
- const Property *addeeWSProperty) {
+bool SampleLogsBehaviour::stringPropertiesMatch(
+ const SampleLogBehaviour &behaviour, const Property *addeeWSProperty) {
return behaviour.property->value().compare(addeeWSProperty->value()) == 0;
}
diff --git a/Framework/CurveFitting/src/HistogramDomainCreator.cpp b/Framework/CurveFitting/src/HistogramDomainCreator.cpp
index 593b87046a9..59f68c4fae4 100644
--- a/Framework/CurveFitting/src/HistogramDomainCreator.cpp
+++ b/Framework/CurveFitting/src/HistogramDomainCreator.cpp
@@ -29,10 +29,9 @@ HistogramDomainCreator::HistogramDomainCreator(
* @param values :: Pointer to outgoing FunctionValues object.
* @param i0 :: Size offset for values object if it already contains data.
*/
-void
-HistogramDomainCreator::createDomain(boost::shared_ptr<FunctionDomain> &domain,
- boost::shared_ptr<FunctionValues> &values,
- size_t i0) {
+void HistogramDomainCreator::createDomain(
+ boost::shared_ptr<FunctionDomain> &domain,
+ boost::shared_ptr<FunctionValues> &values, size_t i0) {
setParameters();
diff --git a/Framework/DataHandling/src/LoadMask.cpp b/Framework/DataHandling/src/LoadMask.cpp
index 56a35c34122..6544f336eb3 100644
--- a/Framework/DataHandling/src/LoadMask.cpp
+++ b/Framework/DataHandling/src/LoadMask.cpp
@@ -403,9 +403,9 @@ void LoadMask::initDetectors() {
* @param tomask: true to mask, false to unmask
* @param singledetids: list of individual det ids to mask
*/
-void
-LoadMask::processMaskOnDetectors(const detid2index_map &indexmap, bool tomask,
- const std::vector<detid_t> &singledetids) {
+void LoadMask::processMaskOnDetectors(
+ const detid2index_map &indexmap, bool tomask,
+ const std::vector<detid_t> &singledetids) {
// 1. Get index map
// 2. Mask
g_log.debug() << "Mask = " << tomask
@@ -434,9 +434,9 @@ LoadMask::processMaskOnDetectors(const detid2index_map &indexmap, bool tomask,
* @param detectors -- vector of detector ids, which belongs to components
*provided as input.
*/
-void
-LoadMask::componentToDetectors(const std::vector<std::string> &componentnames,
- std::vector<detid_t> &detectors) {
+void LoadMask::componentToDetectors(
+ const std::vector<std::string> &componentnames,
+ std::vector<detid_t> &detectors) {
Geometry::Instrument_const_sptr minstrument = m_maskWS->getInstrument();
for (auto &componentname : componentnames) {
diff --git a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorGenerateNotebook.h b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorGenerateNotebook.h
index 714115c93b9..90e576aacb0 100644
--- a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorGenerateNotebook.h
+++ b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorGenerateNotebook.h
@@ -52,8 +52,8 @@ splitByCommas(const std::string &names_string);
std::string DLLExport plot1DString(const std::vector<std::string> &ws_names);
-std::string DLLExport tableString(const TreeData &treeData,
- const DataProcessorWhiteList &whitelist);
+std::string DLLExport
+tableString(const TreeData &treeData, const DataProcessorWhiteList &whitelist);
std::string DLLExport titleString(const std::string &wsName);
@@ -69,9 +69,9 @@ plotsString(const std::vector<std::string> &output_ws,
const DataProcessorProcessingAlgorithm &processor);
std::string DLLExport
- getReducedWorkspaceName(const RowData &data,
- const DataProcessorWhiteList &whitelist,
- const std::string &prefix = "");
+getReducedWorkspaceName(const RowData &data,
+ const DataProcessorWhiteList &whitelist,
+ const std::string &prefix = "");
boost::tuple<std::string, std::string> DLLExport reduceRowString(
const RowData &data, const std::string &instrument,
diff --git a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorOpenTableCommand.h b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorOpenTableCommand.h
index 3c69d99c29c..c4e03083547 100644
--- a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorOpenTableCommand.h
+++ b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorOpenTableCommand.h
@@ -36,7 +36,8 @@ public:
: DataProcessorCommandBase(tablePresenter){};
virtual ~DataProcessorOpenTableCommand(){};
- void execute() override{// This action should do nothing
+ void execute() override{
+ // This action should do nothing
};
std::string name() override { return std::string("Open Table"); }
std::string icon() override { return std::string("://multiload.png"); }
diff --git a/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index a4522133c07..c8a059e20d3 100644
--- a/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -356,9 +356,8 @@ void DataProcessorOneLevelTreeManager::transfer(
* @param child :: the row
* @param data :: the data
*/
-void
-DataProcessorOneLevelTreeManager::update(int parent, int child,
- const std::vector<std::string> &data) {
+void DataProcessorOneLevelTreeManager::update(
+ int parent, int child, const std::vector<std::string> &data) {
UNUSED_ARG(child);
@@ -408,9 +407,8 @@ ITableWorkspace_sptr DataProcessorOneLevelTreeManager::createDefaultWorkspace(
* @param ws :: the table workspace
* @param whitelistColumns :: the number of columns as specified in a whitelist
*/
-void
-DataProcessorOneLevelTreeManager::validateModel(ITableWorkspace_sptr ws,
- size_t whitelistColumns) const {
+void DataProcessorOneLevelTreeManager::validateModel(
+ ITableWorkspace_sptr ws, size_t whitelistColumns) const {
if (!ws)
throw std::runtime_error("Null pointer");
@@ -437,9 +435,8 @@ DataProcessorOneLevelTreeManager::validateModel(ITableWorkspace_sptr ws,
* @param whitelistColumns : [input] The number of columns in the whitelist
* @throws std::runtime_error if the number of columns in the table is incorrect
*/
-bool
-DataProcessorOneLevelTreeManager::isValidModel(Workspace_sptr ws,
- size_t whitelistColumns) const {
+bool DataProcessorOneLevelTreeManager::isValidModel(
+ Workspace_sptr ws, size_t whitelistColumns) const {
try {
validateModel(boost::dynamic_pointer_cast<ITableWorkspace>(ws),
diff --git a/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 50c6f83577a..250a97c4929 100644
--- a/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/MantidQt/MantidWidgets/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -551,9 +551,8 @@ void DataProcessorTwoLevelTreeManager::transfer(
* @param child :: the row
* @param data :: the data
*/
-void
-DataProcessorTwoLevelTreeManager::update(int parent, int child,
- const std::vector<std::string> &data) {
+void DataProcessorTwoLevelTreeManager::update(
+ int parent, int child, const std::vector<std::string> &data) {
if (static_cast<int>(data.size()) != m_model->columnCount())
throw std::invalid_argument("Can't update tree with given data");
@@ -606,9 +605,8 @@ ITableWorkspace_sptr DataProcessorTwoLevelTreeManager::createDefaultWorkspace(
* @param ws :: the table workspace
* @param whitelistColumns :: the number of columns as specified in a whitelist
*/
-void
-DataProcessorTwoLevelTreeManager::validateModel(ITableWorkspace_sptr ws,
- size_t whitelistColumns) const {
+void DataProcessorTwoLevelTreeManager::validateModel(
+ ITableWorkspace_sptr ws, size_t whitelistColumns) const {
if (!ws)
throw std::runtime_error("Null pointer");
@@ -635,9 +633,8 @@ DataProcessorTwoLevelTreeManager::validateModel(ITableWorkspace_sptr ws,
* @param whitelistColumns : [input] The number of columns in the whitelist
* @throws std::runtime_error if the number of columns in the table is incorrect
*/
-bool
-DataProcessorTwoLevelTreeManager::isValidModel(Workspace_sptr ws,
- size_t whitelistColumns) const {
+bool DataProcessorTwoLevelTreeManager::isValidModel(
+ Workspace_sptr ws, size_t whitelistColumns) const {
try {
validateModel(boost::dynamic_pointer_cast<ITableWorkspace>(ws),
diff --git a/MantidQt/MantidWidgets/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/MantidQt/MantidWidgets/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index 938372263f2..7f7d160e42b 100644
--- a/MantidQt/MantidWidgets/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/MantidQt/MantidWidgets/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -275,8 +275,8 @@ void GenericDataProcessorPresenter::saveNotebook(const TreeData &data) {
Post-processes the workspaces created by the given rows together.
@param groupData : the data in a given group as received from the tree manager
*/
-void
-GenericDataProcessorPresenter::postProcessGroup(const GroupData &groupData) {
+void GenericDataProcessorPresenter::postProcessGroup(
+ const GroupData &groupData) {
if (!m_postprocess)
throw std::runtime_error("Cannot post-process workspaces");
@@ -1245,9 +1245,8 @@ ChildItems GenericDataProcessorPresenter::selectedChildren() const {
* @param title :: the title
* @return :: Yes/No
*/
-bool
-GenericDataProcessorPresenter::askUserYesNo(const std::string &prompt,
- const std::string &title) const {
+bool GenericDataProcessorPresenter::askUserYesNo(
+ const std::string &prompt, const std::string &title) const {
return m_mainPresenter->askUserYesNo(prompt, title);
}
@@ -1256,9 +1255,8 @@ GenericDataProcessorPresenter::askUserYesNo(const std::string &prompt,
* @param prompt :: the message
* @param title :: the title
*/
-void
-GenericDataProcessorPresenter::giveUserWarning(const std::string &prompt,
- const std::string &title) const {
+void GenericDataProcessorPresenter::giveUserWarning(
+ const std::string &prompt, const std::string &title) const {
m_mainPresenter->giveUserWarning(prompt, title);
}
diff --git a/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorTwoLevelTreeModel.cpp b/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorTwoLevelTreeModel.cpp
index 88e4c14e0b0..7dfec86fb23 100644
--- a/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorTwoLevelTreeModel.cpp
+++ b/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorTwoLevelTreeModel.cpp
@@ -425,8 +425,8 @@ bool QDataProcessorTwoLevelTreeModel::setData(const QModelIndex &index,
* whitelist
* @param table : A table workspace containing the data
*/
-void
-QDataProcessorTwoLevelTreeModel::setupModelData(ITableWorkspace_sptr table) {
+void QDataProcessorTwoLevelTreeModel::setupModelData(
+ ITableWorkspace_sptr table) {
int nrows = static_cast<int>(table->rowCount());
diff --git a/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorWidget.cpp b/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorWidget.cpp
index 4c41b5fdc71..fb8b8b26e0f 100644
--- a/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorWidget.cpp
+++ b/MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorWidget.cpp
@@ -109,8 +109,8 @@ void QDataProcessorWidget::setModel(const std::string &name) {
Set a new model in the tableview
@param model : the model to be attached to the tableview
*/
-void
-QDataProcessorWidget::showTable(boost::shared_ptr<QAbstractItemModel> model) {
+void QDataProcessorWidget::showTable(
+ boost::shared_ptr<QAbstractItemModel> model) {
m_model = model;
// So we can notify the presenter when the user updates the table
connect(m_model.get(),
diff --git a/MantidQt/SliceViewer/src/ProxyCompositePeaksPresenter.cpp b/MantidQt/SliceViewer/src/ProxyCompositePeaksPresenter.cpp
index 0b0b67284fa..db3b4af0b72 100644
--- a/MantidQt/SliceViewer/src/ProxyCompositePeaksPresenter.cpp
+++ b/MantidQt/SliceViewer/src/ProxyCompositePeaksPresenter.cpp
@@ -161,13 +161,13 @@ bool ProxyCompositePeaksPresenter::hasPeakAddModeFor(
return m_compositePresenter->hasPeakAddModeFor(target);
}
-void
-ProxyCompositePeaksPresenter::setPeakSizeOnProjection(const double fraction) {
+void ProxyCompositePeaksPresenter::setPeakSizeOnProjection(
+ const double fraction) {
m_compositePresenter->setPeakSizeOnProjection(fraction);
}
-void
-ProxyCompositePeaksPresenter::setPeakSizeIntoProjection(const double fraction) {
+void ProxyCompositePeaksPresenter::setPeakSizeIntoProjection(
+ const double fraction) {
m_compositePresenter->setPeakSizeIntoProjection(fraction);
}
--
GitLab