From f200f23ae897ae7b6d5094603139fc5f6f6c6a3c Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 10 May 2016 11:53:32 +0100
Subject: [PATCH] Clang formatting changes	re #14524

---
 .../Kernel/inc/MantidKernel/ConfigService.h   |  2 +-
 Framework/Kernel/src/ConfigService.cpp        | 27 +++++++------------
 Framework/Kernel/test/ConfigServiceTest.h     |  5 ++--
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 5befecc7d92..65e9ddddb0b 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -302,7 +302,7 @@ private:
   /// Returns a list of all keys under a given root key
   void getKeysRecursive(const std::string &root,
                         std::vector<std::string> &allKeys) const;
-  ///Finds the lowest registered logging filter level
+  /// Finds the lowest registered logging filter level
   int ConfigServiceImpl::FindLowestFilterLevel() const;
 
   // Forward declaration of inner class
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 8ad0645ccdd..960a75c721c 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -237,8 +237,7 @@ ConfigServiceImpl::ConfigServiceImpl()
                       << " revision " << MantidVersion::revision() << std::endl;
   g_log.information() << "running on " << getComputerName() << " starting "
                       << DateAndTime::getCurrentTime().toFormattedString(
-                             "%Y-%m-%dT%H:%MZ")
-                      << "\n";
+                             "%Y-%m-%dT%H:%MZ") << "\n";
   g_log.information() << "Properties file(s) loaded: " << propertiesFilesList
                       << std::endl;
 #ifndef MPI_BUILD // There is no logging to file by default in MPI build
@@ -645,22 +644,18 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
         std::fstream::out);
 
     filestr << "# This file can be used to override any properties for this "
-               "installation."
-            << std::endl;
+               "installation." << std::endl;
     filestr << "# Any properties found in this file will override any that are "
-               "found in the Mantid.Properties file"
-            << std::endl;
+               "found in the Mantid.Properties file" << std::endl;
     filestr << "# As this file will not be replaced with futher installations "
-               "of Mantid it is a safe place to put "
-            << std::endl;
+               "of Mantid it is a safe place to put " << std::endl;
     filestr << "# properties that suit your particular installation."
             << std::endl;
     filestr << "#" << std::endl;
     filestr << "# See here for a list of possible options:" << std::endl;
     filestr << "# "
                "http://www.mantidproject.org/"
-               "Properties_File#Mantid.User.Properties"
-            << std::endl;
+               "Properties_File#Mantid.User.Properties" << std::endl;
     filestr << std::endl;
     filestr << "##" << std::endl;
     filestr << "## GENERAL" << std::endl;
@@ -693,21 +688,18 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
     filestr << std::endl;
     filestr << "## Sets the Q.convention" << std::endl;
     filestr << "## Set to Crystallography for kf-ki instead of default "
-               "Inelastic which is ki-kf"
-            << std::endl;
+               "Inelastic which is ki-kf" << std::endl;
     filestr << "#Q.convention=Crystallography" << std::endl;
     filestr << "##" << std::endl;
     filestr << "## DIRECTORIES" << std::endl;
     filestr << "##" << std::endl;
     filestr << std::endl;
     filestr << "## Sets a list of directories (separated by semi colons) to "
-               "search for data"
-            << std::endl;
+               "search for data" << std::endl;
     filestr << "#datasearch.directories=../data;../isis/data" << std::endl;
     filestr << std::endl;
     filestr << "## Set a list (separated by semi colons) of directories to "
-               "look for additional Python scripts"
-            << std::endl;
+               "look for additional Python scripts" << std::endl;
     filestr << "#pythonscripts.directories=../scripts;../docs/MyScripts"
             << std::endl;
     filestr << std::endl;
@@ -748,8 +740,7 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
     filestr << "#MantidOptions.ReusePlotInstances=Off" << std::endl;
     filestr << std::endl;
     filestr << "## Uncomment to disable use of OpenGL to render unwrapped "
-               "instrument views"
-            << std::endl;
+               "instrument views" << std::endl;
     filestr << "#MantidOptions.InstrumentView.UseOpenGL=Off" << std::endl;
 
     filestr.close();
diff --git a/Framework/Kernel/test/ConfigServiceTest.h b/Framework/Kernel/test/ConfigServiceTest.h
index 2448028630a..d5f2784cba9 100644
--- a/Framework/Kernel/test/ConfigServiceTest.h
+++ b/Framework/Kernel/test/ConfigServiceTest.h
@@ -715,9 +715,8 @@ protected:
   std::string m_key;
   std::string m_preValue;
   std::string m_curValue;
-  void handleConfigChange(
-      const Poco::AutoPtr<Mantid::Kernel::ConfigServiceImpl::ValueChanged>
-          &pNf) {
+  void handleConfigChange(const Poco::AutoPtr<
+      Mantid::Kernel::ConfigServiceImpl::ValueChanged> &pNf) {
     m_valueChangedSent = true;
     m_key = pNf->key();
     m_preValue = pNf->preValue();
-- 
GitLab