From 50be49e8149eb084d0e769f97492f0031232e790 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Wed, 25 Mar 2020 17:15:31 -0400
Subject: [PATCH] clang-format
Signed-off-by: Steven Hahn <hahnse@ornl.gov>
---
Framework/API/inc/MantidAPI/IFileLoader.h | 1 +
.../inc/MantidDataHandling/NexusFileLoader.h | 4 +---
Framework/DataHandling/src/NexusFileLoader.cpp | 11 +++++------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/IFileLoader.h b/Framework/API/inc/MantidAPI/IFileLoader.h
index 1f5c0c2fb51..387d5561f65 100644
--- a/Framework/API/inc/MantidAPI/IFileLoader.h
+++ b/Framework/API/inc/MantidAPI/IFileLoader.h
@@ -24,6 +24,7 @@ public:
/// Returns a value indicating whether or not loader wants to load multiple
/// files into a single workspace
virtual bool loadMutipleAsOne() { return false; }
+ virtual void execLoader() {}
};
} // namespace API
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
index 07154d6cb71..f77ed4b4f2a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
@@ -7,8 +7,8 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
-#include "MantidKernel/System.h"
#include "MantidKernel/NexusHDF5Descriptor.h"
+#include "MantidKernel/System.h"
namespace Mantid::DataHandling {
@@ -16,14 +16,12 @@ class DLLExport NexusFileLoader
: public API::IFileLoader<Mantid::Kernel::NexusHDF5Descriptor> {
public:
void exec() override;
- virtual void execLoader();
boost::shared_ptr<Algorithm> createChildAlgorithm(
const std::string &name, const double startProgress = -1.,
const double endProgress = -1., const bool enableLogging = true,
const int &version = -1) override;
virtual void
setFileInfo(std::shared_ptr<Mantid::Kernel::NexusHDF5Descriptor> fileInfo);
-
private:
std::shared_ptr<Mantid::Kernel::NexusHDF5Descriptor> m_fileInfo;
};
diff --git a/Framework/DataHandling/src/NexusFileLoader.cpp b/Framework/DataHandling/src/NexusFileLoader.cpp
index 5e651af88b1..7680174859c 100644
--- a/Framework/DataHandling/src/NexusFileLoader.cpp
+++ b/Framework/DataHandling/src/NexusFileLoader.cpp
@@ -8,7 +8,6 @@
namespace Mantid::DataHandling {
void NexusFileLoader::exec() { execLoader(); }
-void NexusFileLoader::execLoader() {}
boost::shared_ptr<Mantid::API::Algorithm> NexusFileLoader::createChildAlgorithm(
const std::string &name, const double startProgress,
const double endProgress, const bool enableLogging, const int &version) {
@@ -23,9 +22,9 @@ boost::shared_ptr<Mantid::API::Algorithm> NexusFileLoader::createChildAlgorithm(
nfl->setFileInfo(m_fileInfo);
}
return child;
- }
- void NexusFileLoader::setFileInfo(
- std::shared_ptr<Mantid::Kernel::NexusHDF5Descriptor> fileInfo) {
- m_fileInfo = std::move(fileInfo);
- }
}
+void NexusFileLoader::setFileInfo(
+ std::shared_ptr<Mantid::Kernel::NexusHDF5Descriptor> fileInfo) {
+ m_fileInfo = std::move(fileInfo);
+}
+} // namespace Mantid::DataHandling
--
GitLab