diff --git a/Framework/API/src/Axis.cpp b/Framework/API/src/Axis.cpp index e8db95989d581e2ea3ebc8e6f147ab24c69d8c5d..6f8abc8a5af84d90791a8898728fc123952ebe21 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 0d8f987a1e4a82e4952dbf7612db3da88ba1462e..9797475d1d8a0b7a1e60d753a47c4bf2d02dc708 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 9a218cf3604903b67cab49cf7c025e80d1c61030..b3997f78f68c2899f31e85d3f23a45da697091dc 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 2ac82cc418841b7162b52a919203ded4193b1d4a..fd329c37d4f9aa5b7bda8685ced9616a9f72bbfd 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 8a2c0d990079cc55112cebb6553f0e9ef21eeebe..f0ada5744ed566b685c54fcba4fd7d3decfcb637 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 915a33bf21f740927492bd2d111af20fe079752c..0caf9bc73b08d734b1e07e9cdeb799c9b1501e43 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 b79e4a66897d0c46ec87903e74b82bb692d0543a..ad68b2485b0afdf7c8f313e03a2b738e300f6929 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 f9f2225fc1f77e994a649206265f459f8ace42da..4e022520d27dc7d60a663338d0723b6255371a84 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 26d2558d8e4333f7f5d63e70e7acc7fd7333ece1..29d1b209a9db0d6ad6b97927a9d4deb757cd4ada 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 883617cb529bc4c8395bedc3891cae33c8f6b026..30d66ac44a7fda27459bfd92bfa513a01d9fc04a 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 99ead0791a90884562996e99fe56f92fd76455ff..38809270e4610ce1cae724b1dc473f50c20d184b 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 48c4c3dcd27c2312d59f5af81c2ecc9618e45bcb..ff7054fa190719905c45b676defe03a3973630c8 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 fe0cc907d33c462d89667fff044a19e152c96470..1d660d419e635a62a49b871ce6bb465f5fd44ce9 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 8c21073991a9ec5074aeefe228f89a830a1e1c8c..975a27f179e93dcfe4576d66fcbccbe2f8d1f80f 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 495bbcb52f40476370b531504a9bd890a5b64698..369caac852ad64d24fd85e11192719c38fc3b8c3 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 9f33ccbad80018fdb61916fa79cabad01f8bf82d..762ffd5f2d12c660586fb3b8f01095fac3a46d4d 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;