From d512d4b72edead06e43463a8f14b7d898c032252 Mon Sep 17 00:00:00 2001 From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk> Date: Thu, 8 Oct 2015 16:15:20 +0100 Subject: [PATCH] make clang-format happy about spaces and new lines, re #13689 --- Framework/API/src/Axis.cpp | 1 - Framework/API/src/IFunctionMW.cpp | 1 - Framework/Algorithms/src/Regroup.cpp | 1 - Framework/Algorithms/test/RegroupTest.h | 1 - Framework/CurveFitting/src/CostFuncLeastSquares.cpp | 1 - Framework/DataHandling/src/SaveRKH.cpp | 1 - Framework/DataHandling/test/RawFileInfoTest.h | 1 - Framework/DataHandling/test/XMLInstrumentParameterTest.h | 1 - Framework/Geometry/src/Math/PolygonIntersection.cpp | 1 - Framework/Kernel/inc/MantidKernel/ANN/ANN.h | 8 ++++---- Framework/Kernel/test/BoseEinsteinDistributionTest.h | 1 - Framework/Kernel/test/FunctionTaskTest.h | 1 - Framework/Kernel/test/MagneticFormFactorTableTest.h | 1 - Framework/Kernel/test/TaskTest.h | 1 - Framework/Kernel/test/UnitConversionTest.h | 1 - Framework/MDAlgorithms/test/SlicingAlgorithmTest.h | 1 - 16 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Framework/API/src/Axis.cpp b/Framework/API/src/Axis.cpp index e8db95989d5..6f8abc8a5af 100644 --- a/Framework/API/src/Axis.cpp +++ b/Framework/API/src/Axis.cpp @@ -5,7 +5,6 @@ #include "MantidKernel/Exception.h" #include "MantidKernel/UnitFactory.h" - namespace Mantid { namespace API { diff --git a/Framework/API/src/IFunctionMW.cpp b/Framework/API/src/IFunctionMW.cpp index 0d8f987a1e4..9797475d1d8 100644 --- a/Framework/API/src/IFunctionMW.cpp +++ b/Framework/API/src/IFunctionMW.cpp @@ -4,7 +4,6 @@ #include "MantidAPI/IFunctionMW.h" #include "MantidAPI/MatrixWorkspace.h" - namespace Mantid { namespace API { using namespace Geometry; diff --git a/Framework/Algorithms/src/Regroup.cpp b/Framework/Algorithms/src/Regroup.cpp index 9a218cf3604..b3997f78f68 100644 --- a/Framework/Algorithms/src/Regroup.cpp +++ b/Framework/Algorithms/src/Regroup.cpp @@ -12,7 +12,6 @@ #include <functional> #include <cmath> - namespace Mantid { namespace Algorithms { diff --git a/Framework/Algorithms/test/RegroupTest.h b/Framework/Algorithms/test/RegroupTest.h index 2ac82cc4188..fd329c37d4f 100644 --- a/Framework/Algorithms/test/RegroupTest.h +++ b/Framework/Algorithms/test/RegroupTest.h @@ -8,7 +8,6 @@ #include "MantidAlgorithms/Regroup.h" #include "MantidAPI/WorkspaceProperty.h" - using namespace Mantid::Kernel; using namespace Mantid::DataObjects; using namespace Mantid::API; diff --git a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp index 8a2c0d99007..f0ada5744ed 100644 --- a/Framework/CurveFitting/src/CostFuncLeastSquares.cpp +++ b/Framework/CurveFitting/src/CostFuncLeastSquares.cpp @@ -10,7 +10,6 @@ #include "MantidKernel/Logger.h" #include "MantidKernel/MultiThreaded.h" - namespace Mantid { namespace CurveFitting { namespace { diff --git a/Framework/DataHandling/src/SaveRKH.cpp b/Framework/DataHandling/src/SaveRKH.cpp index 915a33bf21f..0caf9bc73b0 100644 --- a/Framework/DataHandling/src/SaveRKH.cpp +++ b/Framework/DataHandling/src/SaveRKH.cpp @@ -7,7 +7,6 @@ #include <Poco/LocalDateTime.h> #include <Poco/DateTimeFormatter.h> - namespace Mantid { namespace DataHandling { diff --git a/Framework/DataHandling/test/RawFileInfoTest.h b/Framework/DataHandling/test/RawFileInfoTest.h index b79e4a66897..ad68b2485b0 100644 --- a/Framework/DataHandling/test/RawFileInfoTest.h +++ b/Framework/DataHandling/test/RawFileInfoTest.h @@ -5,7 +5,6 @@ #include "MantidDataHandling/RawFileInfo.h" #include "MantidAPI/ITableWorkspace.h" - using namespace Mantid::DataHandling; class RawFileInfoTest : public CxxTest::TestSuite { diff --git a/Framework/DataHandling/test/XMLInstrumentParameterTest.h b/Framework/DataHandling/test/XMLInstrumentParameterTest.h index f9f2225fc1f..4e022520d27 100644 --- a/Framework/DataHandling/test/XMLInstrumentParameterTest.h +++ b/Framework/DataHandling/test/XMLInstrumentParameterTest.h @@ -11,7 +11,6 @@ #include "MantidKernel/ConfigService.h" #include "MantidKernel/TimeSeriesProperty.h" - using namespace Mantid::API; using namespace Mantid::Kernel; using namespace Mantid::DataHandling; diff --git a/Framework/Geometry/src/Math/PolygonIntersection.cpp b/Framework/Geometry/src/Math/PolygonIntersection.cpp index 26d2558d8e4..29d1b209a9d 100644 --- a/Framework/Geometry/src/Math/PolygonIntersection.cpp +++ b/Framework/Geometry/src/Math/PolygonIntersection.cpp @@ -7,7 +7,6 @@ #include "MantidKernel/Logger.h" #include "MantidKernel/V2D.h" - using namespace Mantid::Kernel; namespace Mantid { diff --git a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h index 883617cb529..30d66ac44a7 100644 --- a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h +++ b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h @@ -107,10 +107,10 @@ // basic includes //---------------------------------------------------------------------- -#include <cstdlib> // standard lib includes -#include <cmath> // math includes -#include <iosfwd> // I/O streams -#include <cstring> // C-style strings +#include <cstdlib> // standard lib includes +#include <cmath> // math includes +#include <iosfwd> // I/O streams +#include <cstring> // C-style strings //---------------------------------------------------------------------- // Limits diff --git a/Framework/Kernel/test/BoseEinsteinDistributionTest.h b/Framework/Kernel/test/BoseEinsteinDistributionTest.h index 99ead0791a9..38809270e46 100644 --- a/Framework/Kernel/test/BoseEinsteinDistributionTest.h +++ b/Framework/Kernel/test/BoseEinsteinDistributionTest.h @@ -6,7 +6,6 @@ #include <cxxtest/TestSuite.h> - class BoseEinsteinDistributionTest : public CxxTest::TestSuite { public: void test_Standard_Distribution_Gives_Correct_Value_Away_From_Edge() { diff --git a/Framework/Kernel/test/FunctionTaskTest.h b/Framework/Kernel/test/FunctionTaskTest.h index 48c4c3dcd27..ff7054fa190 100644 --- a/Framework/Kernel/test/FunctionTaskTest.h +++ b/Framework/Kernel/test/FunctionTaskTest.h @@ -7,7 +7,6 @@ #include "MantidKernel/Task.h" #include "MantidKernel/FunctionTask.h" - using namespace Mantid::Kernel; /** Functions for use by the tasks */ diff --git a/Framework/Kernel/test/MagneticFormFactorTableTest.h b/Framework/Kernel/test/MagneticFormFactorTableTest.h index fe0cc907d33..1d660d419e6 100644 --- a/Framework/Kernel/test/MagneticFormFactorTableTest.h +++ b/Framework/Kernel/test/MagneticFormFactorTableTest.h @@ -6,7 +6,6 @@ #include <boost/scoped_ptr.hpp> - using Mantid::PhysicalConstants::MagneticFormFactorTable; class MagneticFormFactorTableTest : public CxxTest::TestSuite { diff --git a/Framework/Kernel/test/TaskTest.h b/Framework/Kernel/test/TaskTest.h index 8c21073991a..975a27f179e 100644 --- a/Framework/Kernel/test/TaskTest.h +++ b/Framework/Kernel/test/TaskTest.h @@ -6,7 +6,6 @@ #include <MantidKernel/Timer.h> #include "MantidKernel/Task.h" - using namespace Mantid::Kernel; namespace TaskTestNamespace { diff --git a/Framework/Kernel/test/UnitConversionTest.h b/Framework/Kernel/test/UnitConversionTest.h index 495bbcb52f4..369caac852a 100644 --- a/Framework/Kernel/test/UnitConversionTest.h +++ b/Framework/Kernel/test/UnitConversionTest.h @@ -6,7 +6,6 @@ #include "MantidKernel/Exception.h" #include "MantidKernel/PhysicalConstants.h" - using Mantid::Kernel::UnitConversion; class UnitConversionTest : public CxxTest::TestSuite { diff --git a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h index 9f33ccbad80..762ffd5f2d1 100644 --- a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h +++ b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h @@ -9,7 +9,6 @@ #include <cxxtest/TestSuite.h> - using namespace Mantid::API; using namespace Mantid::DataObjects; using namespace Mantid::Geometry; -- GitLab