diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
index b528bdb6e70991309ac60945f5ba0f501c8e0fc9..9e5b8ba6b7fb3c1f8df577bbbade8544db662c6b 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
@@ -610,7 +610,7 @@ public:
 
 /// shared pointer to the function base class
 typedef boost::shared_ptr<ScriptRepository> ScriptRepository_sptr;
-};
-};
+}
+}
 
 #endif // MANTID_API_SCRIPTREPOSITORY_H_
diff --git a/Code/Mantid/Framework/API/src/LinearScale.cpp b/Code/Mantid/Framework/API/src/LinearScale.cpp
index 14d1ff6820dbb9f2d3fe18379098e1dcc641a98c..4d11c0fb96276eec88ab36a6ab73b0f90e16cb8f 100644
--- a/Code/Mantid/Framework/API/src/LinearScale.cpp
+++ b/Code/Mantid/Framework/API/src/LinearScale.cpp
@@ -9,7 +9,7 @@
 namespace Mantid {
 namespace API {
 
-DECLARE_TRANSFORMSCALE(LinearScale);
+DECLARE_TRANSFORMSCALE(LinearScale)
 
 /* Transform the grid to adopt a linear scale
  * @param gd a grid object
diff --git a/Code/Mantid/Framework/API/src/LogManager.cpp b/Code/Mantid/Framework/API/src/LogManager.cpp
index 572043d930322980e1c9a40b1032243fabd119f5..ae405738634e112d9377f3e6505f08a16fa41ca6 100644
--- a/Code/Mantid/Framework/API/src/LogManager.cpp
+++ b/Code/Mantid/Framework/API/src/LogManager.cpp
@@ -434,13 +434,13 @@ void LogManager::clearLogs() { m_manager.clear(); }
   template MANTID_API_DLL TYPE                                                 \
       LogManager::getPropertyValueAsType(const std::string &) const;
 
-INSTANTIATE(double);
-INSTANTIATE(int);
-INSTANTIATE(long);
-INSTANTIATE(uint32_t);
-INSTANTIATE(uint64_t);
-INSTANTIATE(std::string);
-INSTANTIATE(bool);
+INSTANTIATE(double)
+INSTANTIATE(int)
+INSTANTIATE(long)
+INSTANTIATE(uint32_t)
+INSTANTIATE(uint64_t)
+INSTANTIATE(std::string)
+INSTANTIATE(bool)
 
 template MANTID_API_DLL uint16_t
     LogManager::getPropertyValueAsType(const std::string &) const;
diff --git a/Code/Mantid/Framework/API/src/LogarithmScale.cpp b/Code/Mantid/Framework/API/src/LogarithmScale.cpp
index 1ecb35a5d5333f91a48fb66518b20fb3f0d07b44..1e4abfdd83cf4cd95d0c3f74af6ea6d478c86380 100644
--- a/Code/Mantid/Framework/API/src/LogarithmScale.cpp
+++ b/Code/Mantid/Framework/API/src/LogarithmScale.cpp
@@ -16,7 +16,7 @@ namespace {
 Kernel::Logger g_log("LogarithmScale");
 }
 
-DECLARE_TRANSFORMSCALE(LogarithmScale);
+DECLARE_TRANSFORMSCALE(LogarithmScale)
 
 void LogarithmScale::setBase(double &base) {
   if (base <= 0) {
diff --git a/Code/Mantid/Framework/API/test/CostFunctionFactoryTest.h b/Code/Mantid/Framework/API/test/CostFunctionFactoryTest.h
index c0c567cc8b22d2b6db9917c31b325cad6796ece1..d54b9807c852db41267b21196b5fddf1adaee830 100644
--- a/Code/Mantid/Framework/API/test/CostFunctionFactoryTest.h
+++ b/Code/Mantid/Framework/API/test/CostFunctionFactoryTest.h
@@ -38,7 +38,7 @@ public:
 
 };
 
-DECLARE_COSTFUNCTION(CostFunctionFactoryTest_A, nedtur);
+DECLARE_COSTFUNCTION(CostFunctionFactoryTest_A, nedtur)
 
 
 class CostFunctionFactoryTest : public CxxTest::TestSuite
diff --git a/Code/Mantid/Framework/API/test/FuncMinimizerFactoryTest.h b/Code/Mantid/Framework/API/test/FuncMinimizerFactoryTest.h
index 640b7345c483c0aa039beea8f5973f4884c813ca..2cef42deca31ca5c2d84cfb1fe03ef4e210bf9bb 100644
--- a/Code/Mantid/Framework/API/test/FuncMinimizerFactoryTest.h
+++ b/Code/Mantid/Framework/API/test/FuncMinimizerFactoryTest.h
@@ -33,7 +33,7 @@ public:
   }
 };
 
-DECLARE_FUNCMINIMIZER(FuncMinimizerFactoryTest_A, nedtur);
+DECLARE_FUNCMINIMIZER(FuncMinimizerFactoryTest_A, nedtur)
 
 
 class FuncMinimizerFactoryTest : public CxxTest::TestSuite
diff --git a/Code/Mantid/Framework/API/test/FunctionFactoryTest.h b/Code/Mantid/Framework/API/test/FunctionFactoryTest.h
index 0654f99aca5c3d4e669d0d013428cfc220b60fc0..131988e174f30366b6ae99bcbacf66fe60087bf6 100644
--- a/Code/Mantid/Framework/API/test/FunctionFactoryTest.h
+++ b/Code/Mantid/Framework/API/test/FunctionFactoryTest.h
@@ -134,10 +134,10 @@ public:
 
 };
 
-DECLARE_FUNCTION(FunctionFactoryTest_FunctA);
-DECLARE_FUNCTION(FunctionFactoryTest_FunctB);
-DECLARE_FUNCTION(FunctionFactoryTest_CompFunctA);
-DECLARE_FUNCTION(FunctionFactoryTest_CompFunctB);
+DECLARE_FUNCTION(FunctionFactoryTest_FunctA)
+DECLARE_FUNCTION(FunctionFactoryTest_FunctB)
+DECLARE_FUNCTION(FunctionFactoryTest_CompFunctA)
+DECLARE_FUNCTION(FunctionFactoryTest_CompFunctB)
 
 class FunctionFactoryTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h b/Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h
index 4cea527b1a51457ec25804df2501749dc6335f6a..3a02a1c81385cb493923453830f12664bc4e4553 100644
--- a/Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h
+++ b/Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h
@@ -44,7 +44,7 @@ public:
   }
 };
 
-DECLARE_FUNCTION(TestableFunctionParameterDecorator);
+DECLARE_FUNCTION(TestableFunctionParameterDecorator)
 
 class FunctionWithParameters : public ParamFunction {
 public:
@@ -64,7 +64,7 @@ public:
     // Does nothing, not required for this test.
   }
 };
-DECLARE_FUNCTION(FunctionWithParameters);
+DECLARE_FUNCTION(FunctionWithParameters)
 
 class FunctionWithAttributes : public ParamFunction {
 public:
@@ -88,7 +88,7 @@ public:
   }
 };
 
-DECLARE_FUNCTION(FunctionWithAttributes);
+DECLARE_FUNCTION(FunctionWithAttributes)
 
 class FunctionParameterDecoratorTest : public CxxTest::TestSuite {
 public:
diff --git a/Code/Mantid/Framework/API/test/FunctionPropertyTest.h b/Code/Mantid/Framework/API/test/FunctionPropertyTest.h
index ee488c5a7cdb49d2201bf1d1ffc28f30ae066339..4618e0e2c89c2edb7dea898f3b31d2f4ec5b6404 100644
--- a/Code/Mantid/Framework/API/test/FunctionPropertyTest.h
+++ b/Code/Mantid/Framework/API/test/FunctionPropertyTest.h
@@ -23,7 +23,7 @@ public:
   virtual void function(const FunctionDomain&,FunctionValues&)const {}
 };
 
-DECLARE_FUNCTION(FunctionPropertyTest_Function);
+DECLARE_FUNCTION(FunctionPropertyTest_Function)
 
 class FunctionPropertyTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/API/test/ImmutableCompositeFunctionTest.h b/Code/Mantid/Framework/API/test/ImmutableCompositeFunctionTest.h
index cf4287e72d71d6ace7541240d6b9a4bd23e5cae6..b3299c9b3567cddb277fca5f8f428c6a1f5fcceb 100644
--- a/Code/Mantid/Framework/API/test/ImmutableCompositeFunctionTest.h
+++ b/Code/Mantid/Framework/API/test/ImmutableCompositeFunctionTest.h
@@ -67,7 +67,7 @@ public:
   std::string name()const {return "ImmutableCompositeFunctionTest_Function";}
 };
 
-DECLARE_FUNCTION(ImmutableCompositeFunctionTest_Function);
+DECLARE_FUNCTION(ImmutableCompositeFunctionTest_Function)
 
 //---------------------------------------------------------------------------------
 class ImmutableCompositeFunctionTest_FunctionWithTies: public ImmutableCompositeFunction
@@ -95,7 +95,7 @@ public:
   std::string name()const {return "ImmutableCompositeFunctionTest_FunctionWithTies";}
 };
 
-DECLARE_FUNCTION(ImmutableCompositeFunctionTest_FunctionWithTies);
+DECLARE_FUNCTION(ImmutableCompositeFunctionTest_FunctionWithTies)
 
 //---------------------------------------------------------------------------------
 class ImmutableCompositeFunctionTest_FunctionThrow: public ImmutableCompositeFunction
diff --git a/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h b/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h
index 38aedd753411f8461f5de26f1ee3dc0159945c98..d3dbf13890143f1021df863049cd37bb33da38e0 100644
--- a/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h
+++ b/Code/Mantid/Framework/API/test/MatrixWorkspaceTest.h
@@ -26,7 +26,7 @@ using namespace testing;
 
 
 // Declare into the factory.
-DECLARE_WORKSPACE(WorkspaceTester);
+DECLARE_WORKSPACE(WorkspaceTester)
 
 /** Create a workspace with numSpectra, with
  * each spectrum having one detector, at id = workspace index.
diff --git a/Code/Mantid/Framework/API/test/MultiDomainFunctionTest.h b/Code/Mantid/Framework/API/test/MultiDomainFunctionTest.h
index adf7b610d24711a7b9f21881677d43d44b156570..4e7b1870ec6e8936f7e4e5b365a5332626e8a8f1 100644
--- a/Code/Mantid/Framework/API/test/MultiDomainFunctionTest.h
+++ b/Code/Mantid/Framework/API/test/MultiDomainFunctionTest.h
@@ -49,7 +49,7 @@ protected:
   }
 };
 
-DECLARE_FUNCTION(MultiDomainFunctionTest_Function);
+DECLARE_FUNCTION(MultiDomainFunctionTest_Function)
 
 namespace {
 
diff --git a/Code/Mantid/Framework/Algorithms/src/AppendSpectra.cpp b/Code/Mantid/Framework/Algorithms/src/AppendSpectra.cpp
index 6567ccf080c3a8d5506d6f5ef140c1930385a1d2..7c37d7c6e2cb40b7cba7b9cf5a7e3cdd90bcd845 100644
--- a/Code/Mantid/Framework/Algorithms/src/AppendSpectra.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/AppendSpectra.cpp
@@ -23,10 +23,10 @@ AppendSpectra::AppendSpectra() : WorkspaceJoiners() {}
 AppendSpectra::~AppendSpectra() {}
 
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string AppendSpectra::name() const { return "AppendSpectra"; };
+const std::string AppendSpectra::name() const { return "AppendSpectra"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int AppendSpectra::version() const { return 1; };
+int AppendSpectra::version() const { return 1; }
 
 /** Initialize the algorithm's properties.
  */
diff --git a/Code/Mantid/Framework/Algorithms/src/AverageLogData.cpp b/Code/Mantid/Framework/Algorithms/src/AverageLogData.cpp
index 40fa96ee2e9fe32c5a6ce8907e461b0eac7ffe5d..7430a5f108bc389ce1fdb161546632a23342ae76 100644
--- a/Code/Mantid/Framework/Algorithms/src/AverageLogData.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/AverageLogData.cpp
@@ -20,10 +20,10 @@ AverageLogData::~AverageLogData() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string AverageLogData::name() const { return "AverageLogData"; };
+const std::string AverageLogData::name() const { return "AverageLogData"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int AverageLogData::version() const { return 1; };
+int AverageLogData::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string AverageLogData::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/CalculateDIFC.cpp b/Code/Mantid/Framework/Algorithms/src/CalculateDIFC.cpp
index a77fb56a196855d006605f368ce155e3e076e277..8b7b1fcbf156220bf9cd4154b2f5d59d376b7358 100644
--- a/Code/Mantid/Framework/Algorithms/src/CalculateDIFC.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CalculateDIFC.cpp
@@ -35,7 +35,7 @@ const std::string CalculateDIFC::name() const { return "CalculateDIFC"; }
 /// Algorithm's version for identification. @see Algorithm::version
 int CalculateDIFC::version() const {
   return 1;
-};
+}
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CalculateDIFC::category() const {
@@ -45,7 +45,7 @@ const std::string CalculateDIFC::category() const {
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string CalculateDIFC::summary() const {
   return "Calculate the DIFC for every pixel";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Algorithms/src/CalculateResolution.cpp b/Code/Mantid/Framework/Algorithms/src/CalculateResolution.cpp
index 51eac3c536bc4914f89856e77a8a1c0c8c8dbc08..a0a8980966416a5a744c5026214cf3c2935a9db1 100644
--- a/Code/Mantid/Framework/Algorithms/src/CalculateResolution.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CalculateResolution.cpp
@@ -34,10 +34,10 @@ CalculateResolution::~CalculateResolution() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CalculateResolution::name() const {
   return "CalculateResolution";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CalculateResolution::version() const { return 1; };
+int CalculateResolution::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CalculateResolution::category() const {
@@ -48,7 +48,7 @@ const std::string CalculateResolution::category() const {
 const std::string CalculateResolution::summary() const {
   return "Calculates the reflectometry resolution (dQ/Q) for a given "
          "workspace.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Algorithms/src/CalculateSlits.cpp b/Code/Mantid/Framework/Algorithms/src/CalculateSlits.cpp
index 7808595add88994465b14b5c569b5b525a5703fb..b3e4872292cddebc315d3387aebc3d1d6398c8ec 100644
--- a/Code/Mantid/Framework/Algorithms/src/CalculateSlits.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CalculateSlits.cpp
@@ -28,10 +28,10 @@ CalculateSlits::~CalculateSlits() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CalculateSlits::name() const {
   return "CalculateSlits";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CalculateSlits::version() const { return 1; };
+int CalculateSlits::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CalculateSlits::category() const {
@@ -41,7 +41,7 @@ const std::string CalculateSlits::category() const {
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string CalculateSlits::summary() const {
   return "Calculates appropriate slit widths for reflectometry instruments.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Algorithms/src/ChangeLogTime.cpp b/Code/Mantid/Framework/Algorithms/src/ChangeLogTime.cpp
index 8663e0a329e62384d965adaabd104a56db599aae..a42d58d76769cb5da8fd40d4cbaad43b3d1549cd 100644
--- a/Code/Mantid/Framework/Algorithms/src/ChangeLogTime.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ChangeLogTime.cpp
@@ -7,7 +7,7 @@ namespace Mantid {
 namespace Algorithms {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(ChangeLogTime);
+DECLARE_ALGORITHM(ChangeLogTime)
 
 using std::string;
 using std::stringstream;
diff --git a/Code/Mantid/Framework/Algorithms/src/ClearInstrumentParameters.cpp b/Code/Mantid/Framework/Algorithms/src/ClearInstrumentParameters.cpp
index 74fc77c9e1d3aface1ff2fbedf61fa3e38e8e003..04c3f06953c48b941a9bc5f62214ff9483e010b1 100644
--- a/Code/Mantid/Framework/Algorithms/src/ClearInstrumentParameters.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ClearInstrumentParameters.cpp
@@ -29,7 +29,7 @@ ClearInstrumentParameters::~ClearInstrumentParameters() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ClearInstrumentParameters::name() const {
   return "ClearInstrumentParameters";
-};
+}
 
 /// Summary of the algorithm's purpose. @see Algorithm::summary
 const std::string ClearInstrumentParameters::summary() const {
@@ -37,7 +37,7 @@ const std::string ClearInstrumentParameters::summary() const {
 }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ClearInstrumentParameters::version() const { return 1; };
+int ClearInstrumentParameters::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ClearInstrumentParameters::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/ClearMaskFlag.cpp b/Code/Mantid/Framework/Algorithms/src/ClearMaskFlag.cpp
index 71b53a9b1d99c61234c6a27cbfe26addbb64e31f..ba16cd12b7f8044256c751457a1aa14eeb3b6a06 100644
--- a/Code/Mantid/Framework/Algorithms/src/ClearMaskFlag.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ClearMaskFlag.cpp
@@ -21,10 +21,10 @@ ClearMaskFlag::~ClearMaskFlag() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string ClearMaskFlag::name() const { return "ClearMaskFlag"; };
+const std::string ClearMaskFlag::name() const { return "ClearMaskFlag"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ClearMaskFlag::version() const { return 1; };
+int ClearMaskFlag::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ClearMaskFlag::category() const { return "Utility"; }
diff --git a/Code/Mantid/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp b/Code/Mantid/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp
index 6ef693883bb56513353d84f4ed220d3722750a13..0305cd928470fd7a5dcf0d54204b66d680741784 100644
--- a/Code/Mantid/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp
@@ -35,7 +35,7 @@ const std::string ConvertAxesToRealSpace::name() const {
 }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ConvertAxesToRealSpace::version() const { return 1; };
+int ConvertAxesToRealSpace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ConvertAxesToRealSpace::category() const {
@@ -46,7 +46,7 @@ const std::string ConvertAxesToRealSpace::category() const {
 const std::string ConvertAxesToRealSpace::summary() const {
   return "Converts the spectrum and TOF axes to real space values, integrating "
          "the data in the process";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Algorithms/src/ConvertEmptyToTof.cpp b/Code/Mantid/Framework/Algorithms/src/ConvertEmptyToTof.cpp
index 28bbd9076ecbcf22d92efdc8e57f623dd3f505f1..144171a08a4da4024893ff6003757e3e2ecbf8ee 100644
--- a/Code/Mantid/Framework/Algorithms/src/ConvertEmptyToTof.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ConvertEmptyToTof.cpp
@@ -39,10 +39,10 @@ ConvertEmptyToTof::~ConvertEmptyToTof() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ConvertEmptyToTof::name() const {
   return "ConvertEmptyToTof";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ConvertEmptyToTof::version() const { return 1; };
+int ConvertEmptyToTof::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ConvertEmptyToTof::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/ConvertToHistogram.cpp b/Code/Mantid/Framework/Algorithms/src/ConvertToHistogram.cpp
index 3b87dc49dbe5d080dbe0b425abbc117cdb715232..37acbb1439ea3462532815b25831d0052ef30db2 100644
--- a/Code/Mantid/Framework/Algorithms/src/ConvertToHistogram.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ConvertToHistogram.cpp
@@ -7,7 +7,7 @@
 namespace Mantid {
 namespace Algorithms {
 
-DECLARE_ALGORITHM(ConvertToHistogram);
+DECLARE_ALGORITHM(ConvertToHistogram)
 
 using API::MatrixWorkspace_sptr;
 using Mantid::MantidVec;
diff --git a/Code/Mantid/Framework/Algorithms/src/ConvertToPointData.cpp b/Code/Mantid/Framework/Algorithms/src/ConvertToPointData.cpp
index ccc2e8ac79b5c8ff788a56868d9e4b32bb49008d..739ca37a9109c93cadafb7bdf95aa4d6e12d1800 100644
--- a/Code/Mantid/Framework/Algorithms/src/ConvertToPointData.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ConvertToPointData.cpp
@@ -7,7 +7,7 @@
 namespace Mantid {
 namespace Algorithms {
 
-DECLARE_ALGORITHM(ConvertToPointData);
+DECLARE_ALGORITHM(ConvertToPointData)
 
 using API::MatrixWorkspace_sptr;
 using Mantid::MantidVec;
diff --git a/Code/Mantid/Framework/Algorithms/src/CopyLogs.cpp b/Code/Mantid/Framework/Algorithms/src/CopyLogs.cpp
index f7aadd28a094c9c05d02f86fd93e9a54df1b33a0..c250b7077847c64fa0d37e3716190dcec0afffdf 100644
--- a/Code/Mantid/Framework/Algorithms/src/CopyLogs.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CopyLogs.cpp
@@ -23,10 +23,10 @@ CopyLogs::~CopyLogs() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string CopyLogs::name() const { return "CopyLogs"; };
+const std::string CopyLogs::name() const { return "CopyLogs"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CopyLogs::version() const { return 1; };
+int CopyLogs::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CopyLogs::category() const { return "Utility\\Workspaces"; }
diff --git a/Code/Mantid/Framework/Algorithms/src/CreateFlatEventWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/CreateFlatEventWorkspace.cpp
index f2dc26c177f68fc2ff56e71c025bdf75b46d2e31..525c556bfca688aa7dd33a8c7ee7ecf386cbb0e0 100644
--- a/Code/Mantid/Framework/Algorithms/src/CreateFlatEventWorkspace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CreateFlatEventWorkspace.cpp
@@ -25,10 +25,10 @@ CreateFlatEventWorkspace::~CreateFlatEventWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateFlatEventWorkspace::name() const {
   return "CreateFlatEventWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateFlatEventWorkspace::version() const { return 1; };
+int CreateFlatEventWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateFlatEventWorkspace::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/CreateSampleWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/CreateSampleWorkspace.cpp
index 0b665c471eb4a41cf1bce71853622bb3fa61d1f1..0c08dda844cbe54c945b2b9df5569fb1ff425797 100644
--- a/Code/Mantid/Framework/Algorithms/src/CreateSampleWorkspace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CreateSampleWorkspace.cpp
@@ -47,10 +47,10 @@ CreateSampleWorkspace::~CreateSampleWorkspace() { delete m_randGen; }
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateSampleWorkspace::name() const {
   return "CreateSampleWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateSampleWorkspace::version() const { return 1; };
+int CreateSampleWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateSampleWorkspace::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/CreateTransmissionWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/CreateTransmissionWorkspace.cpp
index ac913604c97f872015616edfd73bf1bb67a5371b..2b7b6da122750c306b499535f4028362fcaf0a29 100644
--- a/Code/Mantid/Framework/Algorithms/src/CreateTransmissionWorkspace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CreateTransmissionWorkspace.cpp
@@ -32,10 +32,10 @@ CreateTransmissionWorkspace::~CreateTransmissionWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateTransmissionWorkspace::name() const {
   return "CreateTransmissionWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateTransmissionWorkspace::version() const { return 1; };
+int CreateTransmissionWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateTransmissionWorkspace::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/DeleteWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/DeleteWorkspace.cpp
index 329b737da1923c24e6b4b8c493b03253961dcc37..7cb53d9b5af47c1ef13374b3de1e1101bd04fea7 100644
--- a/Code/Mantid/Framework/Algorithms/src/DeleteWorkspace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/DeleteWorkspace.cpp
@@ -8,7 +8,7 @@ namespace Mantid {
 namespace Algorithms {
 
 // Register the algorithm
-DECLARE_ALGORITHM(DeleteWorkspace);
+DECLARE_ALGORITHM(DeleteWorkspace)
 
 //--------------------------------------------------------------------------
 // Private member functions
diff --git a/Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp b/Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp
index 2b6ab8e2618e18c0dcd1df852bc7105428b10d3c..35dafe442d1123b564500d52c744a7b9fa1489de 100644
--- a/Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp
@@ -737,6 +737,6 @@ double DetectorDiagnostic::advanceProgress(double toAdd) {
 void DetectorDiagnostic::failProgress(RunTime aborted) {
   advanceProgress(-aborted);
   m_TotalTime -= aborted;
-};
+}
 }
 }
diff --git a/Code/Mantid/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp b/Code/Mantid/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp
index 4c92103f327c915a79fa3e498c7280ce2783f63c..559a747688bc1e561cf4550995d40415d180174a 100644
--- a/Code/Mantid/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp
@@ -29,10 +29,10 @@ DetectorEfficiencyCorUser::~DetectorEfficiencyCorUser() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string DetectorEfficiencyCorUser::name() const {
   return "DetectorEfficiencyCorUser";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DetectorEfficiencyCorUser::version() const { return 1; };
+int DetectorEfficiencyCorUser::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DetectorEfficiencyCorUser::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/FilterByXValue.cpp b/Code/Mantid/Framework/Algorithms/src/FilterByXValue.cpp
index a73f536d6edfcd52d45523298f83865f50d31172..29a8be14083c59ce77e8d373ef3335834a0a5ea7 100644
--- a/Code/Mantid/Framework/Algorithms/src/FilterByXValue.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/FilterByXValue.cpp
@@ -17,9 +17,9 @@ FilterByXValue::FilterByXValue() {}
 FilterByXValue::~FilterByXValue() {}
 
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string FilterByXValue::name() const { return "FilterByXValue"; };
+const std::string FilterByXValue::name() const { return "FilterByXValue"; }
 /// Algorithm's version for identification. @see Algorithm::version
-int FilterByXValue::version() const { return 1; };
+int FilterByXValue::version() const { return 1; }
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string FilterByXValue::category() const {
   return "Events\\EventFiltering";
diff --git a/Code/Mantid/Framework/Algorithms/src/GroupWorkspaces.cpp b/Code/Mantid/Framework/Algorithms/src/GroupWorkspaces.cpp
index fd55a82efa033b870456698cb54bcdb7ea395ecb..110b07a9e15adb4491cc1a95cbe344cf3f23d8f8 100644
--- a/Code/Mantid/Framework/Algorithms/src/GroupWorkspaces.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/GroupWorkspaces.cpp
@@ -7,7 +7,7 @@
 namespace Mantid {
 namespace Algorithms {
 
-DECLARE_ALGORITHM(GroupWorkspaces);
+DECLARE_ALGORITHM(GroupWorkspaces)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/Algorithms/src/IntegrateByComponent.cpp b/Code/Mantid/Framework/Algorithms/src/IntegrateByComponent.cpp
index f5e1a98e61b37a35ff1fa027cfb445a165ff1ed3..3736939ef44d5308342132576d077262bd22c1a5 100644
--- a/Code/Mantid/Framework/Algorithms/src/IntegrateByComponent.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/IntegrateByComponent.cpp
@@ -25,10 +25,10 @@ IntegrateByComponent::~IntegrateByComponent() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string IntegrateByComponent::name() const {
   return "IntegrateByComponent";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int IntegrateByComponent::version() const { return 1; };
+int IntegrateByComponent::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string IntegrateByComponent::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/LorentzCorrection.cpp b/Code/Mantid/Framework/Algorithms/src/LorentzCorrection.cpp
index 0100a0000efc59c6f46b67a98744db4476520d9a..2d42cd4b7ccfccc6e28dfd1c2dbd4103ab9fb745 100644
--- a/Code/Mantid/Framework/Algorithms/src/LorentzCorrection.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/LorentzCorrection.cpp
@@ -31,7 +31,7 @@ LorentzCorrection::~LorentzCorrection() {}
 //----------------------------------------------------------------------------------------------
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LorentzCorrection::version() const { return 1; };
+int LorentzCorrection::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LorentzCorrection::category() const { return "Crystal"; }
@@ -39,7 +39,7 @@ const std::string LorentzCorrection::category() const { return "Crystal"; }
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string LorentzCorrection::summary() const {
   return "Performs a white beam Lorentz Correction";
-};
+}
 
 const std::string LorentzCorrection::name() const {
   return "LorentzCorrection";
diff --git a/Code/Mantid/Framework/Algorithms/src/MedianDetectorTest.cpp b/Code/Mantid/Framework/Algorithms/src/MedianDetectorTest.cpp
index db2e7c678a22d16a0b612aaebd87c890ab344e01..a6798977247cb4b40b811f4c0e7df63406af6847 100644
--- a/Code/Mantid/Framework/Algorithms/src/MedianDetectorTest.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/MedianDetectorTest.cpp
@@ -19,7 +19,7 @@ using namespace Geometry;
 MedianDetectorTest::MedianDetectorTest()
     : DetectorDiagnostic(), m_inputWS(), m_loFrac(0.1), m_hiFrac(1.5),
       m_minSpec(0), m_maxSpec(EMPTY_INT()), m_rangeLower(0.0),
-      m_rangeUpper(0.0){};
+      m_rangeUpper(0.0){}
 
 const std::string MedianDetectorTest::category() const { return "Diagnostics"; }
 
diff --git a/Code/Mantid/Framework/Algorithms/src/ModeratorTzero.cpp b/Code/Mantid/Framework/Algorithms/src/ModeratorTzero.cpp
index 36224d81a0e9b70fbd1effe9d12edc1b6a5b3b5d..c7a22c2a163256a76b46dd8a990492c1abc5a1f1 100644
--- a/Code/Mantid/Framework/Algorithms/src/ModeratorTzero.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ModeratorTzero.cpp
@@ -14,7 +14,7 @@ namespace Mantid {
 namespace Algorithms {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(ModeratorTzero);
+DECLARE_ALGORITHM(ModeratorTzero)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/Algorithms/src/MuonGroupDetectors.cpp b/Code/Mantid/Framework/Algorithms/src/MuonGroupDetectors.cpp
index b1d711f7e208823eac0dd0552ba481c13838ff39..105188cee04e4f7794ab05415807019397dac28f 100644
--- a/Code/Mantid/Framework/Algorithms/src/MuonGroupDetectors.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/MuonGroupDetectors.cpp
@@ -26,10 +26,10 @@ MuonGroupDetectors::~MuonGroupDetectors() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string MuonGroupDetectors::name() const {
   return "MuonGroupDetectors";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MuonGroupDetectors::version() const { return 1; };
+int MuonGroupDetectors::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string MuonGroupDetectors::category() const { return "Muon"; }
diff --git a/Code/Mantid/Framework/Algorithms/src/NormaliseByDetector.cpp b/Code/Mantid/Framework/Algorithms/src/NormaliseByDetector.cpp
index 3c4cfc0867cd45227d302ff1bc2c726b0007d5e3..97e2ee6a72ee2c4ce3bddd1cb8b9f1af6f8a61b9 100644
--- a/Code/Mantid/Framework/Algorithms/src/NormaliseByDetector.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/NormaliseByDetector.cpp
@@ -39,10 +39,10 @@ NormaliseByDetector::~NormaliseByDetector() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string NormaliseByDetector::name() const {
   return "NormaliseByDetector";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int NormaliseByDetector::version() const { return 1; };
+int NormaliseByDetector::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string NormaliseByDetector::category() const {
@@ -199,7 +199,7 @@ NormaliseByDetector::processHistograms(MatrixWorkspace_sptr inWS) {
   }
 
   return denominatorWS;
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Execute the algorithm.
diff --git a/Code/Mantid/Framework/Algorithms/src/Pause.cpp b/Code/Mantid/Framework/Algorithms/src/Pause.cpp
index 007f5e10f8dd170a935eca1e53988155e13c11f4..170559caff20115e7cbdc320bd1661fff5aa418d 100644
--- a/Code/Mantid/Framework/Algorithms/src/Pause.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/Pause.cpp
@@ -24,10 +24,10 @@ Pause::~Pause() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string Pause::name() const { return "Pause"; };
+const std::string Pause::name() const { return "Pause"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int Pause::version() const { return 1; };
+int Pause::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string Pause::category() const { return "Utility\\Development"; }
diff --git a/Code/Mantid/Framework/Algorithms/src/PerformIndexOperations.cpp b/Code/Mantid/Framework/Algorithms/src/PerformIndexOperations.cpp
index 3a8fb0f7dd754c470699eed9ebe88c7854eb74ff..a3d760f3e67e301a0fef2bc41a1c0346fec13bc5 100644
--- a/Code/Mantid/Framework/Algorithms/src/PerformIndexOperations.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/PerformIndexOperations.cpp
@@ -268,10 +268,10 @@ PerformIndexOperations::~PerformIndexOperations() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string PerformIndexOperations::name() const {
   return "PerformIndexOperations";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PerformIndexOperations::version() const { return 1; };
+int PerformIndexOperations::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string PerformIndexOperations::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/PolarizationCorrection.cpp b/Code/Mantid/Framework/Algorithms/src/PolarizationCorrection.cpp
index b2a1760dd6fc0996ab6d2d473123f7d9bb536224..4a9ef9b303a1f28ba5b1f2cac7ad778853fffc73 100644
--- a/Code/Mantid/Framework/Algorithms/src/PolarizationCorrection.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/PolarizationCorrection.cpp
@@ -119,10 +119,10 @@ PolarizationCorrection::~PolarizationCorrection() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string PolarizationCorrection::name() const {
   return "PolarizationCorrection";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PolarizationCorrection::version() const { return 1; };
+int PolarizationCorrection::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string PolarizationCorrection::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/RebinByPulseTimes.cpp b/Code/Mantid/Framework/Algorithms/src/RebinByPulseTimes.cpp
index 2bbe560658f4b97186cfeb60b1a08292dd0940e9..fce9355eb4d9257196073111df03d062ad9d68d7 100644
--- a/Code/Mantid/Framework/Algorithms/src/RebinByPulseTimes.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/RebinByPulseTimes.cpp
@@ -29,10 +29,10 @@ RebinByPulseTimes::~RebinByPulseTimes() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string RebinByPulseTimes::name() const {
   return "RebinByPulseTimes";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int RebinByPulseTimes::version() const { return 1; };
+int RebinByPulseTimes::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string RebinByPulseTimes::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/RebinByTimeAtSample.cpp b/Code/Mantid/Framework/Algorithms/src/RebinByTimeAtSample.cpp
index c7d3f0491c987b7a93139e6347725ab34d14e17c..ff2234d2fec9fa9a206c1d2ecf0220f1f2512215 100644
--- a/Code/Mantid/Framework/Algorithms/src/RebinByTimeAtSample.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/RebinByTimeAtSample.cpp
@@ -28,7 +28,7 @@ RebinByTimeAtSample::~RebinByTimeAtSample() {}
 //----------------------------------------------------------------------------------------------
 
 /// Algorithm's version for identification. @see Algorithm::version
-int RebinByTimeAtSample::version() const { return 1; };
+int RebinByTimeAtSample::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string RebinByTimeAtSample::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOne.cpp b/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOne.cpp
index ab6ebf78f1ac94f41706b0da58a3857a243705bc..dfb1a2932196bc442fc5ce1046f0f5e833edd8ba 100644
--- a/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOne.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOne.cpp
@@ -95,10 +95,10 @@ ReflectometryReductionOne::~ReflectometryReductionOne() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ReflectometryReductionOne::name() const {
   return "ReflectometryReductionOne";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ReflectometryReductionOne::version() const { return 1; };
+int ReflectometryReductionOne::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ReflectometryReductionOne::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOneAuto.cpp b/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOneAuto.cpp
index f29229096e23610e97eb7e73efc03b43904d4027..884848559d96a6bdeddd81e471ca0d54f71c3b69 100644
--- a/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOneAuto.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ReflectometryReductionOneAuto.cpp
@@ -31,10 +31,10 @@ ReflectometryReductionOneAuto::~ReflectometryReductionOneAuto() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ReflectometryReductionOneAuto::name() const {
   return "ReflectometryReductionOneAuto";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ReflectometryReductionOneAuto::version() const { return 1; };
+int ReflectometryReductionOneAuto::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ReflectometryReductionOneAuto::category() const {
@@ -45,7 +45,7 @@ const std::string ReflectometryReductionOneAuto::category() const {
 const std::string ReflectometryReductionOneAuto::summary() const {
   return "Reduces a single TOF/Lambda reflectometry run into a mod Q vs I/I0 "
          "workspace. Performs transmission corrections.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Algorithms/src/RemoveBackground.cpp b/Code/Mantid/Framework/Algorithms/src/RemoveBackground.cpp
index 706570edca1093be8f5d0ff5f10a119e0434ca31..8601d1e2c38ec13f727d1200424e329797326ea0 100644
--- a/Code/Mantid/Framework/Algorithms/src/RemoveBackground.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/RemoveBackground.cpp
@@ -150,7 +150,7 @@ void RemoveBackground::exec() {
 BackgroundHelper::BackgroundHelper()
     : m_WSUnit(), m_bgWs(), m_wkWS(), m_pgLog(NULL), m_inPlace(true),
       m_singleValueBackground(false), m_NBg(0), m_dtBg(1), // m_ErrSq(0),
-      m_Emode(0), m_L1(0), m_Efix(0), m_Sample(){};
+      m_Emode(0), m_L1(0), m_Efix(0), m_Sample(){}
 /// Destructor
 BackgroundHelper::~BackgroundHelper() { this->deleteUnitsConverters(); }
 
diff --git a/Code/Mantid/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp b/Code/Mantid/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp
index 8d30c4fa14d1734998002801366360dbcddc76a4..4d6ecc74b7c086e20ae676fb58379e41b5325b97 100644
--- a/Code/Mantid/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp
@@ -24,10 +24,10 @@ RemoveWorkspaceHistory::~RemoveWorkspaceHistory() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string RemoveWorkspaceHistory::name() const {
   return "RemoveWorkspaceHistory";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int RemoveWorkspaceHistory::version() const { return 1; };
+int RemoveWorkspaceHistory::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string RemoveWorkspaceHistory::category() const { return "Utility"; }
@@ -35,7 +35,7 @@ const std::string RemoveWorkspaceHistory::category() const { return "Utility"; }
 /// Algorithm's summary for identification. @see Algorithm::summary
 const std::string RemoveWorkspaceHistory::summary() const {
   return "Removes all algorithm history records from a given workspace.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Algorithms/src/ResizeRectangularDetector.cpp b/Code/Mantid/Framework/Algorithms/src/ResizeRectangularDetector.cpp
index bb719da642518b5ff56a3da0302eac25d3f2aab6..d5c40de7a071562011e9a415651980c7a7db93b7 100644
--- a/Code/Mantid/Framework/Algorithms/src/ResizeRectangularDetector.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ResizeRectangularDetector.cpp
@@ -30,10 +30,10 @@ ResizeRectangularDetector::~ResizeRectangularDetector() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ResizeRectangularDetector::name() const {
   return "ResizeRectangularDetector";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ResizeRectangularDetector::version() const { return 1; };
+int ResizeRectangularDetector::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ResizeRectangularDetector::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/RingProfile.cpp b/Code/Mantid/Framework/Algorithms/src/RingProfile.cpp
index b558c1a8584d161ed8d94c5021e3521891d38a4d..21be96faae17a952d49631c3fe09579a7dfd9de7 100644
--- a/Code/Mantid/Framework/Algorithms/src/RingProfile.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/RingProfile.cpp
@@ -582,7 +582,7 @@ void RingProfile::getBinForPixel(const API::MatrixWorkspace_sptr ws,
     // call fromAngleToBin (radians)
     bins_pos[i] = fromAngleToBin(angle, false);
   }
-};
+}
 
 /* Return the bin position for a given angle.
  *
@@ -618,7 +618,7 @@ int RingProfile::fromAngleToBin(double angle, bool degree) {
 
   angle /= bin_size;
   return (int)angle;
-};
+}
 
 } // namespace Algorithms
 } // namespace Mantid
diff --git a/Code/Mantid/Framework/Algorithms/src/SassenaFFT.cpp b/Code/Mantid/Framework/Algorithms/src/SassenaFFT.cpp
index c51071190ef9622f8ec8b788cef21823f9254449..bd0e048fd71389869f0d3dd824806f8bb0eb901a 100644
--- a/Code/Mantid/Framework/Algorithms/src/SassenaFFT.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SassenaFFT.cpp
@@ -13,7 +13,7 @@ namespace Mantid {
 namespace Algorithms {
 
 // Register the class into the algorithm factory
-DECLARE_ALGORITHM(SassenaFFT);
+DECLARE_ALGORITHM(SassenaFFT)
 
 /// Override Algorithm::checkGroups
 bool SassenaFFT::checkGroups() { return false; }
diff --git a/Code/Mantid/Framework/Algorithms/src/SetInstrumentParameter.cpp b/Code/Mantid/Framework/Algorithms/src/SetInstrumentParameter.cpp
index 487d95665918268f99bc46e476c81055492c54f1..e06d9b1f72eb441cf90572f88ff4e4551f7db4a2 100644
--- a/Code/Mantid/Framework/Algorithms/src/SetInstrumentParameter.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SetInstrumentParameter.cpp
@@ -30,10 +30,10 @@ SetInstrumentParameter::~SetInstrumentParameter() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string SetInstrumentParameter::name() const {
   return "SetInstrumentParameter";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SetInstrumentParameter::version() const { return 1; };
+int SetInstrumentParameter::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SetInstrumentParameter::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/SignalOverError.cpp b/Code/Mantid/Framework/Algorithms/src/SignalOverError.cpp
index 2354d0369c331ebc12301081d613c8edebafe971..9d36340512c7e2d896b13d5280fa570ff412d6ed 100644
--- a/Code/Mantid/Framework/Algorithms/src/SignalOverError.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SignalOverError.cpp
@@ -25,10 +25,10 @@ SignalOverError::~SignalOverError() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string SignalOverError::name() const { return "SignalOverError"; };
+const std::string SignalOverError::name() const { return "SignalOverError"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SignalOverError::version() const { return 1; };
+int SignalOverError::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SignalOverError::category() const { return "Arithmetic"; }
diff --git a/Code/Mantid/Framework/Algorithms/src/SpecularReflectionCalculateTheta.cpp b/Code/Mantid/Framework/Algorithms/src/SpecularReflectionCalculateTheta.cpp
index 917f3aa741e17ea02c5cbf86e0361f10468ac507..ac7c575361fcc7908661d91c07170dd0c3ddfb63 100644
--- a/Code/Mantid/Framework/Algorithms/src/SpecularReflectionCalculateTheta.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SpecularReflectionCalculateTheta.cpp
@@ -35,10 +35,10 @@ SpecularReflectionCalculateTheta::~SpecularReflectionCalculateTheta() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string SpecularReflectionCalculateTheta::name() const {
   return "SpecularReflectionCalculateTheta";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SpecularReflectionCalculateTheta::version() const { return 1; };
+int SpecularReflectionCalculateTheta::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SpecularReflectionCalculateTheta::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp b/Code/Mantid/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp
index b69a6128a5e1a1ed2db63c9a09233408bc16f782..3497a23d437b317b942c9f2da90897a1a40f95f5 100644
--- a/Code/Mantid/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp
@@ -70,10 +70,10 @@ SpecularReflectionPositionCorrect::~SpecularReflectionPositionCorrect() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string SpecularReflectionPositionCorrect::name() const {
   return "SpecularReflectionPositionCorrect";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SpecularReflectionPositionCorrect::version() const { return 1; };
+int SpecularReflectionPositionCorrect::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SpecularReflectionPositionCorrect::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/SumEventsByLogValue.cpp b/Code/Mantid/Framework/Algorithms/src/SumEventsByLogValue.cpp
index 7829bd0452a0062659720df8f9e6a9b34a1b4c62..48f47cff4a6f2b0af50d291e0cf097fc4f95d5ae 100644
--- a/Code/Mantid/Framework/Algorithms/src/SumEventsByLogValue.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SumEventsByLogValue.cpp
@@ -10,7 +10,7 @@
 namespace Mantid {
 namespace Algorithms {
 // Register the class into the algorithm factory
-DECLARE_ALGORITHM(SumEventsByLogValue);
+DECLARE_ALGORITHM(SumEventsByLogValue)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/Algorithms/src/UpdateScriptRepository.cpp b/Code/Mantid/Framework/Algorithms/src/UpdateScriptRepository.cpp
index b56a1c0be37fa8991388e2e5a10a3596f115e142..45e620542ce14a6f0d2a28b3e1af3f2bdea1df28 100644
--- a/Code/Mantid/Framework/Algorithms/src/UpdateScriptRepository.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/UpdateScriptRepository.cpp
@@ -22,10 +22,10 @@ UpdateScriptRepository::~UpdateScriptRepository() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string UpdateScriptRepository::name() const {
   return "UpdateScriptRepository";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int UpdateScriptRepository::version() const { return 1; };
+int UpdateScriptRepository::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string UpdateScriptRepository::category() const { return "Utility"; }
diff --git a/Code/Mantid/Framework/Algorithms/src/WeightedMeanOfWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/WeightedMeanOfWorkspace.cpp
index baf8f5094140f906c9a723410d0d4feb6c73c7ad..4703eb91d2f8810ff1dca33cc95c7f8986bf8c3f 100644
--- a/Code/Mantid/Framework/Algorithms/src/WeightedMeanOfWorkspace.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/WeightedMeanOfWorkspace.cpp
@@ -28,10 +28,10 @@ WeightedMeanOfWorkspace::~WeightedMeanOfWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string WeightedMeanOfWorkspace::name() const {
   return "WeightedMeanOfWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int WeightedMeanOfWorkspace::version() const { return 1; };
+int WeightedMeanOfWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string WeightedMeanOfWorkspace::category() const {
diff --git a/Code/Mantid/Framework/Algorithms/src/WeightingStrategy.cpp b/Code/Mantid/Framework/Algorithms/src/WeightingStrategy.cpp
index f09fd1e6658301afb71350742d40198d5d2cd409..17af7d37dedeb47c3456953a01de9ac1f730c51c 100644
--- a/Code/Mantid/Framework/Algorithms/src/WeightingStrategy.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/WeightingStrategy.cpp
@@ -15,10 +15,10 @@ namespace Algorithms {
 Constructor
 @param cutOff : radius cutoff
 */
-WeightingStrategy::WeightingStrategy(const double cutOff) : m_cutOff(cutOff){};
+WeightingStrategy::WeightingStrategy(const double cutOff) : m_cutOff(cutOff){}
 
 /// Constructor
-WeightingStrategy::WeightingStrategy() : m_cutOff(0){};
+WeightingStrategy::WeightingStrategy() : m_cutOff(0){}
 
 /// Destructor
 WeightingStrategy::~WeightingStrategy() {}
diff --git a/Code/Mantid/Framework/Algorithms/src/WienerSmooth.cpp b/Code/Mantid/Framework/Algorithms/src/WienerSmooth.cpp
index e4baaba6d2b072c91d6a7f4777a8fd2dfb70f7b1..f8762cd5a56678a9a521549a927a4684964050e1 100644
--- a/Code/Mantid/Framework/Algorithms/src/WienerSmooth.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/WienerSmooth.cpp
@@ -38,7 +38,7 @@ WienerSmooth::~WienerSmooth() {}
 //----------------------------------------------------------------------------------------------
 
 /// Algorithm's version for identification. @see Algorithm::version
-int WienerSmooth::version() const { return 1; };
+int WienerSmooth::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string WienerSmooth::category() const {
@@ -48,7 +48,7 @@ const std::string WienerSmooth::category() const {
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string WienerSmooth::summary() const {
   return "Smooth spectra using Wiener filter.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Crystal/src/AddPeakHKL.cpp b/Code/Mantid/Framework/Crystal/src/AddPeakHKL.cpp
index 78c563d096e9f80d630d3277b441317c5236f09b..2e770043c2b4c4322cbbe4bf855d2b08f1ab60d6 100644
--- a/Code/Mantid/Framework/Crystal/src/AddPeakHKL.cpp
+++ b/Code/Mantid/Framework/Crystal/src/AddPeakHKL.cpp
@@ -39,13 +39,13 @@ namespace Crystal
   const std::string AddPeakHKL::name() const { return "AddPeakHKL"; }
 
   /// Algorithm's version for identification. @see Algorithm::version
-  int AddPeakHKL::version() const { return 1;};
+  int AddPeakHKL::version() const { return 1;}
 
   /// Algorithm's category for identification. @see Algorithm::category
   const std::string AddPeakHKL::category() const { return "Crystal";}
 
   /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
-  const std::string AddPeakHKL::summary() const { return "Add a peak in the hkl frame";};
+  const std::string AddPeakHKL::summary() const { return "Add a peak in the hkl frame";}
 
   //----------------------------------------------------------------------------------------------
   /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/Crystal/src/CalculatePeaksHKL.cpp b/Code/Mantid/Framework/Crystal/src/CalculatePeaksHKL.cpp
index 46cac8737cdf810c0726e162dccaeca34d9b3322..10dc1653c945a9b9165be5748d7aec67bd2cc759 100644
--- a/Code/Mantid/Framework/Crystal/src/CalculatePeaksHKL.cpp
+++ b/Code/Mantid/Framework/Crystal/src/CalculatePeaksHKL.cpp
@@ -30,10 +30,10 @@ CalculatePeaksHKL::~CalculatePeaksHKL() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CalculatePeaksHKL::name() const {
   return "CalculatePeaksHKL";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CalculatePeaksHKL::version() const { return 1; };
+int CalculatePeaksHKL::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CalculatePeaksHKL::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/ClearUB.cpp b/Code/Mantid/Framework/Crystal/src/ClearUB.cpp
index fdcefa2a8939f31d66ae57874d1f3c960086a577..54f27de7e263aa9c44a2aee4fd43a3c5fd5f17ee 100644
--- a/Code/Mantid/Framework/Crystal/src/ClearUB.cpp
+++ b/Code/Mantid/Framework/Crystal/src/ClearUB.cpp
@@ -22,10 +22,10 @@ ClearUB::~ClearUB() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string ClearUB::name() const { return "ClearUB"; };
+const std::string ClearUB::name() const { return "ClearUB"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ClearUB::version() const { return 1; };
+int ClearUB::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ClearUB::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/CombinePeaksWorkspaces.cpp b/Code/Mantid/Framework/Crystal/src/CombinePeaksWorkspaces.cpp
index f59b28b0a0afec6d2bccc69d407f01d1c286392f..e4e518348f73a2af6d0618fe8d555587157fbcff 100644
--- a/Code/Mantid/Framework/Crystal/src/CombinePeaksWorkspaces.cpp
+++ b/Code/Mantid/Framework/Crystal/src/CombinePeaksWorkspaces.cpp
@@ -27,9 +27,9 @@ CombinePeaksWorkspaces::~CombinePeaksWorkspaces() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CombinePeaksWorkspaces::name() const {
   return "CombinePeaksWorkspaces";
-};
+}
 /// Algorithm's version for identification. @see Algorithm::version
-int CombinePeaksWorkspaces::version() const { return 1; };
+int CombinePeaksWorkspaces::version() const { return 1; }
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CombinePeaksWorkspaces::category() const { return "Crystal"; }
 
diff --git a/Code/Mantid/Framework/Crystal/src/DiffPeaksWorkspaces.cpp b/Code/Mantid/Framework/Crystal/src/DiffPeaksWorkspaces.cpp
index 00a3cb839e66ac218354ba7d9b2d0ac266d6ed87..34337d74f916b5f752f209cd46e81ab1639e2530 100644
--- a/Code/Mantid/Framework/Crystal/src/DiffPeaksWorkspaces.cpp
+++ b/Code/Mantid/Framework/Crystal/src/DiffPeaksWorkspaces.cpp
@@ -25,9 +25,9 @@ DiffPeaksWorkspaces::~DiffPeaksWorkspaces() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string DiffPeaksWorkspaces::name() const {
   return "DiffPeaksWorkspaces";
-};
+}
 /// Algorithm's version for identification. @see Algorithm::version
-int DiffPeaksWorkspaces::version() const { return 1; };
+int DiffPeaksWorkspaces::version() const { return 1; }
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DiffPeaksWorkspaces::category() const { return "Crystal"; }
 
diff --git a/Code/Mantid/Framework/Crystal/src/FilterPeaks.cpp b/Code/Mantid/Framework/Crystal/src/FilterPeaks.cpp
index efecf7a037a398f7f6a04f7dc48d4b189bde7b5f..86ff9a78ccc89431627d17f7fec913511e499924 100644
--- a/Code/Mantid/Framework/Crystal/src/FilterPeaks.cpp
+++ b/Code/Mantid/Framework/Crystal/src/FilterPeaks.cpp
@@ -40,9 +40,9 @@ FilterPeaks::FilterPeaks() {}
 FilterPeaks::~FilterPeaks() {}
 
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string FilterPeaks::name() const { return "FilterPeaks"; };
+const std::string FilterPeaks::name() const { return "FilterPeaks"; }
 /// Algorithm's version for identification. @see Algorithm::version
-int FilterPeaks::version() const { return 1; };
+int FilterPeaks::version() const { return 1; }
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string FilterPeaks::category() const { return "Crystal"; }
 
diff --git a/Code/Mantid/Framework/Crystal/src/FindClusterFaces.cpp b/Code/Mantid/Framework/Crystal/src/FindClusterFaces.cpp
index fe9266df134f40195b04b710e4769a0f23ba5705..2332de05184709d69f6492a0b20ea0a374c851ab 100644
--- a/Code/Mantid/Framework/Crystal/src/FindClusterFaces.cpp
+++ b/Code/Mantid/Framework/Crystal/src/FindClusterFaces.cpp
@@ -270,10 +270,10 @@ FindClusterFaces::~FindClusterFaces() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string FindClusterFaces::name() const { return "FindClusterFaces"; };
+const std::string FindClusterFaces::name() const { return "FindClusterFaces"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int FindClusterFaces::version() const { return 1; };
+int FindClusterFaces::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string FindClusterFaces::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/HasUB.cpp b/Code/Mantid/Framework/Crystal/src/HasUB.cpp
index fcc9477ff9ff3357cc5ef6182249279a1491153f..2bf028caa4c0f39b6b4b302ccda2c69a2bf0fcb0 100644
--- a/Code/Mantid/Framework/Crystal/src/HasUB.cpp
+++ b/Code/Mantid/Framework/Crystal/src/HasUB.cpp
@@ -21,10 +21,10 @@ HasUB::~HasUB() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string HasUB::name() const { return "HasUB"; };
+const std::string HasUB::name() const { return "HasUB"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int HasUB::version() const { return 1; };
+int HasUB::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string HasUB::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/IntegratePeaksHybrid.cpp b/Code/Mantid/Framework/Crystal/src/IntegratePeaksHybrid.cpp
index 83c00772d38cabaa8fb32c690d49513dbb3d5737..c7d2f6fd8ede9ea1f60c8ae3d529eca139d2900c 100644
--- a/Code/Mantid/Framework/Crystal/src/IntegratePeaksHybrid.cpp
+++ b/Code/Mantid/Framework/Crystal/src/IntegratePeaksHybrid.cpp
@@ -101,10 +101,10 @@ IntegratePeaksHybrid::~IntegratePeaksHybrid() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string IntegratePeaksHybrid::name() const {
   return "IntegratePeaksHybrid";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int IntegratePeaksHybrid::version() const { return 1; };
+int IntegratePeaksHybrid::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string IntegratePeaksHybrid::category() const {
diff --git a/Code/Mantid/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp b/Code/Mantid/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
index 84843b0b2b34c15bec5ba2044904bf0b2a2152db..5b6aeeb76773b008fd7acaa5f907d5de6b150c52 100644
--- a/Code/Mantid/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
+++ b/Code/Mantid/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
@@ -48,10 +48,10 @@ IntegratePeaksUsingClusters::~IntegratePeaksUsingClusters() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string IntegratePeaksUsingClusters::name() const {
   return "IntegratePeaksUsingClusters";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int IntegratePeaksUsingClusters::version() const { return 1; };
+int IntegratePeaksUsingClusters::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string IntegratePeaksUsingClusters::category() const {
diff --git a/Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp b/Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp
index 1e4e7a331a111c8efd0688c074c6b2c543565d5d..9612ce7b2638fb1c36be68acb38c8000fc5d96f6 100644
--- a/Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp
+++ b/Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp
@@ -28,7 +28,7 @@ using Mantid::Kernel::Units::Wavelength;
 namespace Mantid {
 namespace Crystal {
 
-DECLARE_FILELOADER_ALGORITHM(LoadIsawPeaks);
+DECLARE_FILELOADER_ALGORITHM(LoadIsawPeaks)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/Crystal/src/PeakIntensityVsRadius.cpp b/Code/Mantid/Framework/Crystal/src/PeakIntensityVsRadius.cpp
index 53ccf36f9059ddcbbe5f714b6f87e9199cfc01ab..e1381d541dabb89a468fb74552c1018693e9adac 100644
--- a/Code/Mantid/Framework/Crystal/src/PeakIntensityVsRadius.cpp
+++ b/Code/Mantid/Framework/Crystal/src/PeakIntensityVsRadius.cpp
@@ -29,10 +29,10 @@ PeakIntensityVsRadius::~PeakIntensityVsRadius() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string PeakIntensityVsRadius::name() const {
   return "PeakIntensityVsRadius";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PeakIntensityVsRadius::version() const { return 1; };
+int PeakIntensityVsRadius::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string PeakIntensityVsRadius::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/PeaksInRegion.cpp b/Code/Mantid/Framework/Crystal/src/PeaksInRegion.cpp
index b8b112cb7a46bb892bb362620f8b32ec93f8fc5f..dc590f5b4c62941b8d5fe6b2ced7bd86515ad3dd 100644
--- a/Code/Mantid/Framework/Crystal/src/PeaksInRegion.cpp
+++ b/Code/Mantid/Framework/Crystal/src/PeaksInRegion.cpp
@@ -26,10 +26,10 @@ PeaksInRegion::~PeaksInRegion() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string PeaksInRegion::name() const { return "PeaksInRegion"; };
+const std::string PeaksInRegion::name() const { return "PeaksInRegion"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PeaksInRegion::version() const { return 1; };
+int PeaksInRegion::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string PeaksInRegion::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/PeaksOnSurface.cpp b/Code/Mantid/Framework/Crystal/src/PeaksOnSurface.cpp
index f0dded52a8424d6417810af3c1126d062c266761..3bd6da8e03fd5d7b4815a3fc17d4a80730719d0c 100644
--- a/Code/Mantid/Framework/Crystal/src/PeaksOnSurface.cpp
+++ b/Code/Mantid/Framework/Crystal/src/PeaksOnSurface.cpp
@@ -25,10 +25,10 @@ PeaksOnSurface::~PeaksOnSurface() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string PeaksOnSurface::name() const { return "PeaksOnSurface"; };
+const std::string PeaksOnSurface::name() const { return "PeaksOnSurface"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PeaksOnSurface::version() const { return 1; };
+int PeaksOnSurface::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string PeaksOnSurface::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/SetSpecialCoordinates.cpp b/Code/Mantid/Framework/Crystal/src/SetSpecialCoordinates.cpp
index 784d7244d529599c40f3bebd8d40bc8b362762be..61ecc88afb96ba393511d9b0d1dc4b58c8643696 100644
--- a/Code/Mantid/Framework/Crystal/src/SetSpecialCoordinates.cpp
+++ b/Code/Mantid/Framework/Crystal/src/SetSpecialCoordinates.cpp
@@ -56,10 +56,10 @@ SetSpecialCoordinates::~SetSpecialCoordinates() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string SetSpecialCoordinates::name() const {
   return "SetSpecialCoordinates";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SetSpecialCoordinates::version() const { return 1; };
+int SetSpecialCoordinates::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SetSpecialCoordinates::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/Crystal/src/SortPeaksWorkspace.cpp b/Code/Mantid/Framework/Crystal/src/SortPeaksWorkspace.cpp
index d9422413e6c5f6fdb0100a31f3f849943ff3abf3..2045ca8d73f848bc1658162d4650c8b51cba1a4e 100644
--- a/Code/Mantid/Framework/Crystal/src/SortPeaksWorkspace.cpp
+++ b/Code/Mantid/Framework/Crystal/src/SortPeaksWorkspace.cpp
@@ -29,10 +29,10 @@ SortPeaksWorkspace::~SortPeaksWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string SortPeaksWorkspace::name() const {
   return "SortPeaksWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SortPeaksWorkspace::version() const { return 1; };
+int SortPeaksWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SortPeaksWorkspace::category() const { return "Crystal"; }
diff --git a/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp b/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp
index 6e1ab71224a5be1a6adb77ce010749bf8d57ee8d..d4dfeb2503d74d64dcf47b5655128fc95fc281c3 100644
--- a/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/CalculateGammaBackground.cpp
@@ -21,7 +21,7 @@ using namespace Kernel;
 using namespace std;
 
 // Subscription
-DECLARE_ALGORITHM(CalculateGammaBackground);
+DECLARE_ALGORITHM(CalculateGammaBackground)
 
 namespace {
 /// Number of elements in theta direction integration
diff --git a/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp b/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp
index eb03305943833c56eee0155e06e057bce4d6b1f7..7da4e1d0b8837453722a2f6952a7becc1c442e98 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp
@@ -20,7 +20,7 @@ Chebyshev::Chebyshev() : m_n(0), m_StartX(-1.), m_EndX(1.) {
   declareAttribute("n", Attribute(m_n));
   declareAttribute("StartX", Attribute(m_StartX));
   declareAttribute("EndX", Attribute(m_EndX));
-};
+}
 
 void Chebyshev::function1D(double *out, const double *xValues,
                            const size_t nData) const {
diff --git a/Code/Mantid/Framework/CurveFitting/src/ComptonPeakProfile.cpp b/Code/Mantid/Framework/CurveFitting/src/ComptonPeakProfile.cpp
index 45de68597850991a70f40e2fbf72f1234fe38862..92328afbcff11394c44d05d9cb3a90ac3948e574 100644
--- a/Code/Mantid/Framework/CurveFitting/src/ComptonPeakProfile.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/ComptonPeakProfile.cpp
@@ -8,7 +8,7 @@
 namespace Mantid {
 namespace CurveFitting {
 
-DECLARE_FUNCTION(ComptonPeakProfile);
+DECLARE_FUNCTION(ComptonPeakProfile)
 
 namespace {
 ///@cond
diff --git a/Code/Mantid/Framework/CurveFitting/src/ComptonScatteringCountRate.cpp b/Code/Mantid/Framework/CurveFitting/src/ComptonScatteringCountRate.cpp
index 7bb7dd9b2a5388347a6b074a9dcd6750e5919adf..c0862428093ef84d7da77547440ea1447c9383d8 100644
--- a/Code/Mantid/Framework/CurveFitting/src/ComptonScatteringCountRate.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/ComptonScatteringCountRate.cpp
@@ -20,7 +20,7 @@ const char *BKGD_ORDER_ATTR_NAME = "BackgroundOrderAttr";
 Logger g_log("ComptonScatteringCountRate");
 }
 
-DECLARE_FUNCTION(ComptonScatteringCountRate);
+DECLARE_FUNCTION(ComptonScatteringCountRate)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
diff --git a/Code/Mantid/Framework/CurveFitting/src/ConvertToYSpace.cpp b/Code/Mantid/Framework/CurveFitting/src/ConvertToYSpace.cpp
index 456d7355884fd03f59ebd77fdf2467a80bab194d..5cb55c3d2aa4d3de894c648b6f82a8ad171b9478 100644
--- a/Code/Mantid/Framework/CurveFitting/src/ConvertToYSpace.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/ConvertToYSpace.cpp
@@ -10,7 +10,7 @@ namespace Mantid {
 namespace CurveFitting {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(ConvertToYSpace);
+DECLARE_ALGORITHM(ConvertToYSpace)
 
 using namespace API;
 using namespace Kernel;
diff --git a/Code/Mantid/Framework/CurveFitting/src/CubicSpline.cpp b/Code/Mantid/Framework/CurveFitting/src/CubicSpline.cpp
index 893e0f59420f33cff2c973ed4df3971e7b75391f..6b0d2815989e52ae26cf5f7be2a1fe47f8df31e9 100644
--- a/Code/Mantid/Framework/CurveFitting/src/CubicSpline.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/CubicSpline.cpp
@@ -41,7 +41,7 @@ CubicSpline::CubicSpline()
   declareParameter("y0", 0);
   declareParameter("y1", 0);
   declareParameter("y2", 0);
-};
+}
 
 /** Execute the function
  *
diff --git a/Code/Mantid/Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp b/Code/Mantid/Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp
index 1c2042fbdeef39b2a7dc513ac55f977a8987c436..0ba4b041a6f1f1d33383eb3611d2a4096cb1d755 100644
--- a/Code/Mantid/Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/DiffRotDiscreteCircle.cpp
@@ -11,9 +11,9 @@
 namespace Mantid {
 namespace CurveFitting {
 
-DECLARE_FUNCTION(ElasticDiffRotDiscreteCircle);
-DECLARE_FUNCTION(InelasticDiffRotDiscreteCircle);
-DECLARE_FUNCTION(DiffRotDiscreteCircle);
+DECLARE_FUNCTION(ElasticDiffRotDiscreteCircle)
+DECLARE_FUNCTION(InelasticDiffRotDiscreteCircle)
+DECLARE_FUNCTION(DiffRotDiscreteCircle)
 
 ElasticDiffRotDiscreteCircle::ElasticDiffRotDiscreteCircle() {
   // declareParameter("Height", 1.0); //parameter "Height" already declared in
diff --git a/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp b/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp
index aafd90d88c51a38bd2ed7acb867c4e39198a0cdb..32f8f1c44ceeeb7e39d486b2cff4e5aeffb387a0 100644
--- a/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp
@@ -16,9 +16,9 @@ namespace CurveFitting {
 using namespace Kernel;
 using namespace API;
 
-DECLARE_FUNCTION(ElasticDiffSphere);
-DECLARE_FUNCTION(InelasticDiffSphere);
-DECLARE_FUNCTION(DiffSphere);
+DECLARE_FUNCTION(ElasticDiffSphere)
+DECLARE_FUNCTION(InelasticDiffSphere)
+DECLARE_FUNCTION(DiffSphere)
 
 ElasticDiffSphere::ElasticDiffSphere() {
   // declareParameter("Height", 1.0); //parameter "Height" already declared in
diff --git a/Code/Mantid/Framework/CurveFitting/src/EstimatePeakErrors.cpp b/Code/Mantid/Framework/CurveFitting/src/EstimatePeakErrors.cpp
index b2d70ca84b52ce3c13fe7dd625ac698e10df1997..a57f7e2cfd200cfcff18dfa2c7394723d8e7077d 100644
--- a/Code/Mantid/Framework/CurveFitting/src/EstimatePeakErrors.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/EstimatePeakErrors.cpp
@@ -17,7 +17,7 @@ using namespace Kernel;
 using namespace std;
 
 // Subscription
-DECLARE_ALGORITHM(EstimatePeakErrors);
+DECLARE_ALGORITHM(EstimatePeakErrors)
 
 //--------------------------------------------------------------------------------------------------------
 // Public members
diff --git a/Code/Mantid/Framework/CurveFitting/src/GaussianComptonProfile.cpp b/Code/Mantid/Framework/CurveFitting/src/GaussianComptonProfile.cpp
index f1600c26fc8a0ddcb49939f64d5fc114381b5dfe..b77daafba109cacdcaa99a37c0f10d5291b8227a 100644
--- a/Code/Mantid/Framework/CurveFitting/src/GaussianComptonProfile.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/GaussianComptonProfile.cpp
@@ -6,7 +6,7 @@
 
 namespace Mantid {
 namespace CurveFitting {
-DECLARE_FUNCTION(GaussianComptonProfile);
+DECLARE_FUNCTION(GaussianComptonProfile)
 
 const char *WIDTH_PARAM = "Width";
 const char *AMP_PARAM = "Intensity";
diff --git a/Code/Mantid/Framework/CurveFitting/src/GramCharlierComptonProfile.cpp b/Code/Mantid/Framework/CurveFitting/src/GramCharlierComptonProfile.cpp
index c6a64b0fbb44308a177a2ad9d56b795ed331a548..fe20a841b14106e5149e0f1609f16423d7ede2ea 100644
--- a/Code/Mantid/Framework/CurveFitting/src/GramCharlierComptonProfile.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/GramCharlierComptonProfile.cpp
@@ -14,7 +14,7 @@
 namespace Mantid {
 namespace CurveFitting {
 // Register into factory
-DECLARE_FUNCTION(GramCharlierComptonProfile);
+DECLARE_FUNCTION(GramCharlierComptonProfile)
 
 namespace {
 ///@cond
diff --git a/Code/Mantid/Framework/CurveFitting/src/IkedaCarpenterPV.cpp b/Code/Mantid/Framework/CurveFitting/src/IkedaCarpenterPV.cpp
index e9d8a908511a5e0e01bf15bfe306c4955440bcc2..527a9c39698081e58d8acc3d322ee20b35585697 100644
--- a/Code/Mantid/Framework/CurveFitting/src/IkedaCarpenterPV.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/IkedaCarpenterPV.cpp
@@ -49,7 +49,7 @@ void IkedaCarpenterPV::setHeight(const double h) {
 
   // The intensity is then estimated to be h/h0
   setParameter("I", h / h0);
-};
+}
 
 double IkedaCarpenterPV::height() const {
   // return the function value at centre()
@@ -59,7 +59,7 @@ double IkedaCarpenterPV::height() const {
   toCentre[0] = centre();
   constFunction(h0, toCentre, 1);
   return h0[0];
-};
+}
 
 double IkedaCarpenterPV::fwhm() const {
   double sigmaSquared = getParameter("SigmaSquared");
@@ -83,14 +83,14 @@ double IkedaCarpenterPV::fwhm() const {
     ;
   }
   return sqrt(8.0 * M_LN2 * sigmaSquared) + gamma;
-};
+}
 
 void IkedaCarpenterPV::setFwhm(const double w) {
   setParameter("SigmaSquared", w * w / (32.0 * M_LN2)); // used 4.0 * 8.0 = 32.0
   setParameter("Gamma", w / 2.0);
-};
+}
 
-void IkedaCarpenterPV::setCentre(const double c) { setParameter("X0", c); };
+void IkedaCarpenterPV::setCentre(const double c) { setParameter("X0", c); }
 
 void IkedaCarpenterPV::init() {
   declareParameter("I", 0.0, "The integrated intensity of the peak. I.e. "
diff --git a/Code/Mantid/Framework/CurveFitting/src/Lorentzian.cpp b/Code/Mantid/Framework/CurveFitting/src/Lorentzian.cpp
index 7791d92f6eabe6156ca93ac74b904da707e68de3..8d58c9a3915b9d7bd87d8d9da9be2a6f5ae70be0 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Lorentzian.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Lorentzian.cpp
@@ -11,7 +11,7 @@ namespace CurveFitting {
 using namespace Kernel;
 using namespace API;
 
-DECLARE_FUNCTION(Lorentzian);
+DECLARE_FUNCTION(Lorentzian)
 
 void Lorentzian::init() {
   declareParameter("Amplitude", 1.0, "Intensity scaling");
diff --git a/Code/Mantid/Framework/CurveFitting/src/PseudoVoigt.cpp b/Code/Mantid/Framework/CurveFitting/src/PseudoVoigt.cpp
index 585d1d6eb8b025c6c5abd349ecbc3da5d1f0b1d4..a492df6add6514a4888fc8eb88b80719fd5c99dd 100644
--- a/Code/Mantid/Framework/CurveFitting/src/PseudoVoigt.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/PseudoVoigt.cpp
@@ -9,7 +9,7 @@ namespace CurveFitting {
 
 using namespace API;
 
-DECLARE_FUNCTION(PseudoVoigt);
+DECLARE_FUNCTION(PseudoVoigt)
 
 void PseudoVoigt::functionLocal(double *out, const double *xValues,
                                 const size_t nData) const {
diff --git a/Code/Mantid/Framework/CurveFitting/src/SplineInterpolation.cpp b/Code/Mantid/Framework/CurveFitting/src/SplineInterpolation.cpp
index 266f44f7e91977c707b34efbc70cf5778c78fae1..d476c8013e8ae2d95eb1e43a4416990512d68a4f 100644
--- a/Code/Mantid/Framework/CurveFitting/src/SplineInterpolation.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/SplineInterpolation.cpp
@@ -7,7 +7,7 @@ namespace Mantid {
 namespace CurveFitting {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(SplineInterpolation);
+DECLARE_ALGORITHM(SplineInterpolation)
 
 using namespace API;
 using namespace Kernel;
diff --git a/Code/Mantid/Framework/CurveFitting/src/SplineSmoothing.cpp b/Code/Mantid/Framework/CurveFitting/src/SplineSmoothing.cpp
index 0d1f3d560a032830bfe1134b30b152e629e8a2b0..cd8f927f1b604c449bffd99f6cc62acc2d04dc88 100644
--- a/Code/Mantid/Framework/CurveFitting/src/SplineSmoothing.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/SplineSmoothing.cpp
@@ -12,7 +12,7 @@ namespace Mantid {
 namespace CurveFitting {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(SplineSmoothing);
+DECLARE_ALGORITHM(SplineSmoothing)
 
 using namespace API;
 using namespace Kernel;
@@ -32,10 +32,10 @@ SplineSmoothing::~SplineSmoothing() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string SplineSmoothing::name() const { return "SplineSmoothing"; };
+const std::string SplineSmoothing::name() const { return "SplineSmoothing"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SplineSmoothing::version() const { return 1; };
+int SplineSmoothing::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SplineSmoothing::category() const {
diff --git a/Code/Mantid/Framework/CurveFitting/src/VesuvioResolution.cpp b/Code/Mantid/Framework/CurveFitting/src/VesuvioResolution.cpp
index d13a8297536cd0b4c8b449ed244b9839b2f9f03c..fac486c744a48fe86404b42778814178c39cf36a 100644
--- a/Code/Mantid/Framework/CurveFitting/src/VesuvioResolution.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/VesuvioResolution.cpp
@@ -17,7 +17,7 @@ const double STDDEV_TO_HWHM = std::sqrt(std::log(4.0));
 }
 
 // Register into factory
-DECLARE_FUNCTION(VesuvioResolution);
+DECLARE_FUNCTION(VesuvioResolution)
 
 //---------------------------------------------------------------------------
 // Static functions
diff --git a/Code/Mantid/Framework/CurveFitting/src/Voigt.cpp b/Code/Mantid/Framework/CurveFitting/src/Voigt.cpp
index fd520534558927fcaa9c7774dec5890c1856bc39..9e006da4d314d97a44efe6c8f7f5bcc3b4b0a90a 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Voigt.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Voigt.cpp
@@ -9,7 +9,7 @@
 
 namespace Mantid {
 namespace CurveFitting {
-DECLARE_FUNCTION(Voigt);
+DECLARE_FUNCTION(Voigt)
 
 namespace {
 /// @cond
diff --git a/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h b/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h
index ec353f5b2a615980b91c14d425e3f1d7be850107..678334f2bd1977656e19c70810d8de5744224125 100644
--- a/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -135,8 +135,8 @@ public:
 
 };
 
-DECLARE_FUNCTION(CurveFittingLinear);
-DECLARE_FUNCTION(CurveFittingGauss);
+DECLARE_FUNCTION(CurveFittingLinear)
+DECLARE_FUNCTION(CurveFittingGauss)
 
 class CompositeFunctionTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h b/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h
index afc285cfb1c4a223664573745554a39e2126ca52..c548fc16127312fb5a819bb7bfb6661fd06c9bba 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h
@@ -191,9 +191,9 @@ public:
 
 };
 
-DECLARE_FUNCTION(ConvolutionTest_Gauss);
-DECLARE_FUNCTION(ConvolutionTest_Lorentz);
-DECLARE_FUNCTION(ConvolutionTest_Linear);
+DECLARE_FUNCTION(ConvolutionTest_Gauss)
+DECLARE_FUNCTION(ConvolutionTest_Lorentz)
+DECLARE_FUNCTION(ConvolutionTest_Linear)
 
 class ConvolutionTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryConstraintTest.h b/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryConstraintTest.h
index af5617975a9bbd3ab4f3da03571695fb070a6238..16b1c76cc47fcfeb36f6979a198dac6100d566f7 100644
--- a/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryConstraintTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryConstraintTest.h
@@ -134,10 +134,10 @@ public:
 
 };
 
-DECLARE_FUNCTION(FunctionFactoryConstraintTest_FunctA);
-DECLARE_FUNCTION(FunctionFactoryConstraintTest_FunctB);
-DECLARE_FUNCTION(FunctionFactoryConstraintTest_CompFunctA);
-DECLARE_FUNCTION(FunctionFactoryConstraintTest_CompFunctB);
+DECLARE_FUNCTION(FunctionFactoryConstraintTest_FunctA)
+DECLARE_FUNCTION(FunctionFactoryConstraintTest_FunctB)
+DECLARE_FUNCTION(FunctionFactoryConstraintTest_CompFunctA)
+DECLARE_FUNCTION(FunctionFactoryConstraintTest_CompFunctB)
 
 class FunctionFactoryConstraintTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h b/Code/Mantid/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h
index 47cc259f355829cfec33c8e519944e3dd82abbe9..592a90b7305f9750e589643424ec4c61582cdb30 100644
--- a/Code/Mantid/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h
@@ -46,7 +46,7 @@ public:
   }
 };
 
-DECLARE_FUNCTION(SimpleFunctionParameterDecorator);
+DECLARE_FUNCTION(SimpleFunctionParameterDecorator)
 
 class FunctionParameterDecoratorFitTest : public CxxTest::TestSuite {
 public:
diff --git a/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h b/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h
index 40a9a43251b517d4b975720cd8f004cde88ac909..dcbddf65af1e2cb10d52d4691d55bf1ec149ebbb 100644
--- a/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h
@@ -51,7 +51,7 @@ protected:
   }
 };
 
-DECLARE_FUNCTION(SimplexGaussian);
+DECLARE_FUNCTION(SimplexGaussian)
 
 class GaussianTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/CurveFitting/test/ProductFunctionTest.h b/Code/Mantid/Framework/CurveFitting/test/ProductFunctionTest.h
index 3232dc248cbc82932e3ed07c8c3c5065a61dcd1d..22833a6a4bf158d9044885bdd06438cca8207db2 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ProductFunctionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ProductFunctionTest.h
@@ -121,8 +121,8 @@ public:
 
 };
 
-DECLARE_FUNCTION(ProductFunctionMWTest_Gauss);
-DECLARE_FUNCTION(ProductFunctionMWTest_Linear);
+DECLARE_FUNCTION(ProductFunctionMWTest_Gauss)
+DECLARE_FUNCTION(ProductFunctionMWTest_Linear)
 
 class ProductFunctionTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h b/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h
index ea03a3aa012327a415cd0723ccea367063ee515e..e4df7ce1a5caaa6594be10b9c6575a082f272bc3 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h
@@ -99,7 +99,7 @@ public:
     }
 };
 
-DECLARE_FUNCTION(ResolutionTest_Gauss);
+DECLARE_FUNCTION(ResolutionTest_Gauss)
 
 class ResolutionTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/DataHandling/src/CreateChopperModel.cpp b/Code/Mantid/Framework/DataHandling/src/CreateChopperModel.cpp
index b3284c6ee7f134f89d6691611dd3bf7b2f5efca4..48274f1aa5f6cb83df567e3ac082d132a2b9a08d 100644
--- a/Code/Mantid/Framework/DataHandling/src/CreateChopperModel.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/CreateChopperModel.cpp
@@ -7,7 +7,7 @@
 namespace Mantid {
 namespace DataHandling {
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(CreateChopperModel);
+DECLARE_ALGORITHM(CreateChopperModel)
 
 using Kernel::Direction;
 using API::WorkspaceProperty;
@@ -21,10 +21,10 @@ using Kernel::MandatoryValidator;
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateChopperModel::name() const {
   return "CreateChopperModel";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateChopperModel::version() const { return 1; };
+int CreateChopperModel::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateChopperModel::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp b/Code/Mantid/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
index d19f7f04c25ae52a1352913368899e0b478a630d..49ef716f071d41ff1d2f6e2e7f59f2814cfb4634 100644
--- a/Code/Mantid/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
@@ -57,10 +57,10 @@ CreateChunkingFromInstrument::~CreateChunkingFromInstrument() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const string CreateChunkingFromInstrument::name() const {
   return "CreateChunkingFromInstrument";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateChunkingFromInstrument::version() const { return 1; };
+int CreateChunkingFromInstrument::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const string CreateChunkingFromInstrument::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/CreateModeratorModel.cpp b/Code/Mantid/Framework/DataHandling/src/CreateModeratorModel.cpp
index a1f51bbddd71bdddd769112276e59dbb49c68262..d2008b1d47e5b5ed07d14a9153538feb51e8325b 100644
--- a/Code/Mantid/Framework/DataHandling/src/CreateModeratorModel.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/CreateModeratorModel.cpp
@@ -19,10 +19,10 @@ DECLARE_ALGORITHM(CreateModeratorModel)
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateModeratorModel::name() const {
   return "CreateModeratorModel";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateModeratorModel::version() const { return 1; };
+int CreateModeratorModel::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateModeratorModel::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/CreateSimulationWorkspace.cpp b/Code/Mantid/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
index 3652a1d48ce00a2b86da4395e051fed90283be22..512b02efd72c4da9ddaca485502f26319f65a346 100644
--- a/Code/Mantid/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
@@ -19,7 +19,7 @@ namespace Mantid {
 namespace DataHandling {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(CreateSimulationWorkspace);
+DECLARE_ALGORITHM(CreateSimulationWorkspace)
 
 using namespace API;
 
@@ -27,10 +27,10 @@ using namespace API;
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateSimulationWorkspace::name() const {
   return "CreateSimulationWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateSimulationWorkspace::version() const { return 1; };
+int CreateSimulationWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateSimulationWorkspace::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/DeleteTableRows.cpp b/Code/Mantid/Framework/DataHandling/src/DeleteTableRows.cpp
index 84502532b0a1296f735499703d7f0b58b3f6e514..3a9b1c3bbb4c034c2bb6dff9d20d186847f51303 100644
--- a/Code/Mantid/Framework/DataHandling/src/DeleteTableRows.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/DeleteTableRows.cpp
@@ -13,7 +13,7 @@
 namespace Mantid {
 namespace DataHandling {
 // Register the algorithm into the algorithm factory
-DECLARE_ALGORITHM(DeleteTableRows);
+DECLARE_ALGORITHM(DeleteTableRows)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/ExtractMonitorWorkspace.cpp b/Code/Mantid/Framework/DataHandling/src/ExtractMonitorWorkspace.cpp
index ca9a49e80fee57370f31605bc292f4b96dfece88..3461ebea7d901c66b8f82f1bcf787994741e3235 100644
--- a/Code/Mantid/Framework/DataHandling/src/ExtractMonitorWorkspace.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/ExtractMonitorWorkspace.cpp
@@ -15,10 +15,10 @@ ExtractMonitorWorkspace::~ExtractMonitorWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ExtractMonitorWorkspace::name() const {
   return "ExtractMonitorWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ExtractMonitorWorkspace::version() const { return 1; };
+int ExtractMonitorWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ExtractMonitorWorkspace::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/FindDetectorsPar.cpp b/Code/Mantid/Framework/DataHandling/src/FindDetectorsPar.cpp
index a0babedbc04b5f05580597ad4943add6a36f7a30..0a01cab4a09f1f9fdf716f31e76586986ea91fe4 100644
--- a/Code/Mantid/Framework/DataHandling/src/FindDetectorsPar.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/FindDetectorsPar.cpp
@@ -23,8 +23,8 @@ DECLARE_ALGORITHM(FindDetectorsPar)
 using namespace Kernel;
 using namespace API;
 // nothing here according to mantid
-FindDetectorsPar::FindDetectorsPar() : m_SizesAreLinear(false){};
-FindDetectorsPar::~FindDetectorsPar(){};
+FindDetectorsPar::FindDetectorsPar() : m_SizesAreLinear(false){}
+FindDetectorsPar::~FindDetectorsPar(){}
 
 void FindDetectorsPar::init() {
   auto wsValidator = boost::make_shared<CompositeValidator>();
diff --git a/Code/Mantid/Framework/DataHandling/src/ISISDataArchive.cpp b/Code/Mantid/Framework/DataHandling/src/ISISDataArchive.cpp
index df3faa501c68e359b2b64c085669c828c9bf5ea4..4e5f2d69d3f2470067cf3f65ccb48de9d4f37a9a 100644
--- a/Code/Mantid/Framework/DataHandling/src/ISISDataArchive.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/ISISDataArchive.cpp
@@ -21,7 +21,7 @@ namespace {
 Kernel::Logger g_log("ISISDataArchive");
 }
 
-DECLARE_ARCHIVESEARCH(ISISDataArchive, ISISDataSearch);
+DECLARE_ARCHIVESEARCH(ISISDataArchive, ISISDataSearch)
 
 namespace {
 #ifdef _WIN32
diff --git a/Code/Mantid/Framework/DataHandling/src/Load.cpp b/Code/Mantid/Framework/DataHandling/src/Load.cpp
index 9ca1b7ac270d7571d3e15a73e6e64352a4a0b345..cc23bd0ae14bec92e59e082e6d165985802265c9 100644
--- a/Code/Mantid/Framework/DataHandling/src/Load.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/Load.cpp
@@ -85,7 +85,7 @@ flattenVecOfVec(std::vector<std::vector<std::string>> vecOfVec) {
 namespace Mantid {
 namespace DataHandling {
 // Register the algorithm into the algorithm factory
-DECLARE_ALGORITHM(Load);
+DECLARE_ALGORITHM(Load)
 
 // The mutex
 Poco::Mutex Load::m_mutex;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadAscii.cpp b/Code/Mantid/Framework/DataHandling/src/LoadAscii.cpp
index 6beb06f3fbfbdb0a81e14e93ef91e3235d1dc322..747bd5422b98555db8ceb6e6bff37a5245f66abe 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadAscii.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadAscii.cpp
@@ -18,7 +18,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_FILELOADER_ALGORITHM(LoadAscii);
+DECLARE_FILELOADER_ALGORITHM(LoadAscii)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp
index 37dc4a4e6436c5c696a87e04a93244f4c93cdfc9..3d603570fc4db2416cdf474ce3925954efeac76f 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadAscii2.cpp
@@ -19,7 +19,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_FILELOADER_ALGORITHM(LoadAscii2);
+DECLARE_FILELOADER_ALGORITHM(LoadAscii2)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadBBY.cpp b/Code/Mantid/Framework/DataHandling/src/LoadBBY.cpp
index 6794b27e1190685a1b6840878c5a60703c3da7c9..daddef4a35dc07e9151e09bdd0a0f243f0064e5d 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadBBY.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadBBY.cpp
@@ -14,7 +14,7 @@
 namespace Mantid {
 namespace DataHandling {
 // register the algorithm into the AlgorithmFactory
-DECLARE_FILELOADER_ALGORITHM(LoadBBY);
+DECLARE_FILELOADER_ALGORITHM(LoadBBY)
 
 // consts
 static const size_t HISTO_BINS_X = 240;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
index 1d07a5bb7525094b53b2215b695abc560cc4a5b5..b30663623408975b408f1ecd0b98185a1efe5872 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
@@ -35,7 +35,7 @@ using namespace Mantid::DataObjects;
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_FILELOADER_ALGORITHM(LoadCanSAS1D);
+DECLARE_FILELOADER_ALGORITHM(LoadCanSAS1D)
 
 /// constructor
 LoadCanSAS1D::LoadCanSAS1D() : m_groupNumber(0) {}
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp
index 7dff9888a52e2ca1eb62666d6b7ef981ed1b8b72..378569dbbbb06142d61ab97386d7ff39eb5f1535 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D2.cpp
@@ -33,7 +33,7 @@ using namespace Mantid::DataObjects;
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_FILELOADER_ALGORITHM(LoadCanSAS1D2);
+DECLARE_FILELOADER_ALGORITHM(LoadCanSAS1D2)
 
 /// constructor
 LoadCanSAS1D2::LoadCanSAS1D2() : LoadCanSAS1D() {}
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadDaveGrp.cpp b/Code/Mantid/Framework/DataHandling/src/LoadDaveGrp.cpp
index 8ceabc67d96453729b3d49fbe7d28f351879c6d2..45ddef1b6dcfb71749e2649ed8207bacd7b6f61b 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadDaveGrp.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadDaveGrp.cpp
@@ -12,7 +12,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_FILELOADER_ALGORITHM(LoadDaveGrp);
+DECLARE_FILELOADER_ALGORITHM(LoadDaveGrp)
 
 LoadDaveGrp::LoadDaveGrp() : ifile(), line(), nGroups(0), xLength(0) {}
 
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp
index d8d0ab699c667f3896bb82767d5941d303cc1df8..6fa76790f67189be3c17020ca1887e08b5a8f060 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp
@@ -36,7 +36,7 @@
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_FILELOADER_ALGORITHM(LoadEventPreNexus);
+DECLARE_FILELOADER_ALGORITHM(LoadEventPreNexus)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp b/Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp
index 5d21f759abc30c40a8b8401cef8ff1b21774b5c5..86df82bf489cd2146239c8de976e4e2a4c9d3377 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp
@@ -38,7 +38,7 @@ bool IsNotFits(std::string s) {
 namespace Mantid {
 namespace DataHandling {
 // Register the algorithm into the AlgorithmFactory
-DECLARE_FILELOADER_ALGORITHM(LoadFITS);
+DECLARE_FILELOADER_ALGORITHM(LoadFITS)
 
 /**
  * Constructor. Just initialize everything to prevent issues.
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp
index 783927212fdd755e45003d4f900e5f9c6476570e..0f84c252a6f86a32fa9d6b811cc2a0ead98442ae 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp
@@ -25,7 +25,7 @@ using namespace Kernel;
 using namespace API;
 using namespace NeXus;
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILL);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILL)
 
 //---------------------------------------------------
 // Private member functions
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILLIndirect.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILLIndirect.cpp
index 8309a686e68a6f556286e52688cb3cb71d9aa791..37e810ffae287c8bf3b17a2708fc86ed08c746de 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadILLIndirect.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadILLIndirect.cpp
@@ -18,7 +18,7 @@ using namespace API;
 using namespace NeXus;
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILLIndirect);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILLIndirect)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
@@ -37,10 +37,10 @@ LoadILLIndirect::~LoadILLIndirect() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LoadILLIndirect::name() const { return "LoadILLIndirect"; };
+const std::string LoadILLIndirect::name() const { return "LoadILLIndirect"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadILLIndirect::version() const { return 1; };
+int LoadILLIndirect::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadILLIndirect::category() const { return "DataHandling"; }
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILLReflectometry.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILLReflectometry.cpp
index 331795f61c3fe79a675b1563f68ea4b32ffb8160..739c5f9a6f6c5c4be0a09d7c26fbdb8fd658d810 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadILLReflectometry.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadILLReflectometry.cpp
@@ -23,7 +23,7 @@ using namespace API;
 using namespace NeXus;
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILLReflectometry);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILLReflectometry)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
@@ -47,10 +47,10 @@ LoadILLReflectometry::~LoadILLReflectometry() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string LoadILLReflectometry::name() const {
   return "LoadILLReflectometry";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadILLReflectometry::version() const { return 1; };
+int LoadILLReflectometry::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadILLReflectometry::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILLSANS.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILLSANS.cpp
index 6c3b96b5807bb7166dcf8636eb81754336c117f9..b29c361ef19f901b4182ec410740afc2bd51270a 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadILLSANS.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadILLSANS.cpp
@@ -30,10 +30,10 @@ LoadILLSANS::~LoadILLSANS() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LoadILLSANS::name() const { return "LoadILLSANS"; };
+const std::string LoadILLSANS::name() const { return "LoadILLSANS"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadILLSANS::version() const { return 1; };
+int LoadILLSANS::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadILLSANS::category() const { return "DataHandling"; }
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp
index ca7d7a0dcf2b03cb260e4d541dec65f37bb800d2..61cb6b4339f1373595a279ecbc5c6e943380306f 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp
@@ -38,7 +38,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadISISNexus2);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadISISNexus2)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadLLB.cpp b/Code/Mantid/Framework/DataHandling/src/LoadLLB.cpp
index b6fa8df3d966a372fa19105b3ac5be23ab3fc22f..ab280168840e54b2927a14a617903fb082e70f6b 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadLLB.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadLLB.cpp
@@ -18,7 +18,7 @@ using namespace Kernel;
 using namespace API;
 using namespace NeXus;
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadLLB);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadLLB)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
@@ -36,10 +36,10 @@ LoadLLB::~LoadLLB() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LoadLLB::name() const { return "LoadLLB"; };
+const std::string LoadLLB::name() const { return "LoadLLB"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadLLB::version() const { return 1; };
+int LoadLLB::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadLLB::category() const { return "DataHandling"; }
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadMcStas.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMcStas.cpp
index 027c60f08be6c6407a67e6500e53ee7846a15fe8..26c18005d8804a3aaa9ca2e9827f32ed5f407d01 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadMcStas.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadMcStas.cpp
@@ -24,7 +24,7 @@ using namespace API;
 using namespace DataObjects;
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMcStas);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMcStas)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
@@ -38,10 +38,10 @@ LoadMcStas::~LoadMcStas() {}
 
 //----------------------------------------------------------------------------------------------
 // Algorithm's name for identification. @see Algorithm::name
-const std::string LoadMcStas::name() const { return "LoadMcStas"; };
+const std::string LoadMcStas::name() const { return "LoadMcStas"; }
 
 // Algorithm's version for identification. @see Algorithm::version
-int LoadMcStas::version() const { return 1; };
+int LoadMcStas::version() const { return 1; }
 
 // Algorithm's category for identification. @see Algorithm::category
 const std::string LoadMcStas::category() const { return "DataHandling"; }
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadMcStasNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMcStasNexus.cpp
index ca5c88515d928b1c537a884f6a825e2336bab7f5..b9d6986d76df11859f2e33e73ec4d7494efd176e 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadMcStasNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadMcStasNexus.cpp
@@ -15,7 +15,7 @@ namespace DataHandling {
 using namespace Kernel;
 using namespace API;
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMcStasNexus);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMcStasNexus)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
@@ -29,10 +29,10 @@ LoadMcStasNexus::~LoadMcStasNexus() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LoadMcStasNexus::name() const { return "LoadMcStasNexus"; };
+const std::string LoadMcStasNexus::name() const { return "LoadMcStasNexus"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadMcStasNexus::version() const { return 1; };
+int LoadMcStasNexus::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadMcStasNexus::category() const { return "DataHandling"; }
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus1.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus1.cpp
index 7a71f4f24f5df76c8a8dfbd31f1d5eadc5ad1ffb..6f59be7278a4eb1fd693a87b332f46917f7f4928 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus1.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus1.cpp
@@ -30,7 +30,7 @@ namespace DataHandling {
 using namespace DataObjects;
 
 // Register the algorithm into the algorithm factory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMuonNexus1);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMuonNexus1)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
index d3876404a28394f0a79fc3a964d3ee0197813194..a885a97ada66770bf67dbc0881379dc97c852705 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
@@ -27,7 +27,7 @@
 namespace Mantid {
 namespace DataHandling {
 // Register the algorithm into the algorithm factory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMuonNexus2);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMuonNexus2)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
index 5c5b4dc64163caa882dcd0a28b5588ce04f826f5..e9da8a302a8cd51cff2db16d893e394deaa811ab 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
@@ -22,7 +22,7 @@
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadNXSPE);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadNXSPE)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
index ffbfaac2167ddb04529f38f1f3adc817d96fd47e..21f97ef9eb2d0d4bc86556be5dc5fac2a3854825 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -43,7 +43,7 @@ namespace Mantid {
 namespace DataHandling {
 
 // Register the algorithm into the algorithm factory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadNexusProcessed);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadNexusProcessed)
 
 using namespace Mantid::NeXus;
 using namespace DataObjects;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadPDFgetNFile.cpp b/Code/Mantid/Framework/DataHandling/src/LoadPDFgetNFile.cpp
index a0f89f59619488f5f3e3186367ac5c82da474eb8..108723a73f579972fed3aeb289ce79a5753dd7d4 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadPDFgetNFile.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadPDFgetNFile.cpp
@@ -25,7 +25,7 @@ using namespace boost;
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_FILELOADER_ALGORITHM(LoadPDFgetNFile);
+DECLARE_FILELOADER_ALGORITHM(LoadPDFgetNFile)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadPreNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadPreNexus.cpp
index 55090665c0930d3ac885075a750738830b38dfa2..4d076651853278122196019d7cbb5de86ae9240f 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadPreNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadPreNexus.cpp
@@ -31,7 +31,7 @@ using std::vector;
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_FILELOADER_ALGORITHM(LoadPreNexus);
+DECLARE_FILELOADER_ALGORITHM(LoadPreNexus)
 
 static const string RUNINFO_PARAM("Filename");
 static const string MAP_PARAM("MappingFilename");
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadQKK.cpp b/Code/Mantid/Framework/DataHandling/src/LoadQKK.cpp
index cee4c47b1cd1dea67a6f5fd9594f977a03f9612c..859b592c087dcf441b7443d5963c1562b2e607eb 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadQKK.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadQKK.cpp
@@ -26,7 +26,7 @@ namespace Mantid {
 namespace DataHandling {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadQKK);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadQKK)
 
 /**
  * Return the confidence with with this algorithm can load the file
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRKH.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRKH.cpp
index 453b4745c08fc3adfb78aff3e999ce7f0dc4b953..6ee8786c72d63f3509a54a30fa83296af7899a76 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRKH.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRKH.cpp
@@ -24,7 +24,7 @@ namespace DataHandling {
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
 
-DECLARE_FILELOADER_ALGORITHM(LoadRKH);
+DECLARE_FILELOADER_ALGORITHM(LoadRKH)
 
 /**
  * Return the confidence with with this algorithm can load the file
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp
index 421add0dc04143d32b98b07b8237e4a230b200cc..9d95242111e22c35c71091919e346fafd473602f 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp
@@ -24,7 +24,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_FILELOADER_ALGORITHM(LoadRaw3);
+DECLARE_FILELOADER_ALGORITHM(LoadRaw3)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadReflTBL.cpp b/Code/Mantid/Framework/DataHandling/src/LoadReflTBL.cpp
index bdbd87357b8329efe248b47f720674b8234587ed..31c713233a6be537bc695a59af78761ed44075fe 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadReflTBL.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadReflTBL.cpp
@@ -15,7 +15,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_FILELOADER_ALGORITHM(LoadReflTBL);
+DECLARE_FILELOADER_ALGORITHM(LoadReflTBL)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSINQFocus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSINQFocus.cpp
index 482729016aae5107ef241005e219e519c729358f..c06cdf04b68cb7a759f28ce0a0b1715c163c50a7 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSINQFocus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSINQFocus.cpp
@@ -18,7 +18,7 @@ using namespace Kernel;
 using namespace API;
 using namespace NeXus;
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadSINQFocus);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadSINQFocus)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
@@ -38,10 +38,10 @@ LoadSINQFocus::~LoadSINQFocus() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LoadSINQFocus::name() const { return "LoadSINQFocus"; };
+const std::string LoadSINQFocus::name() const { return "LoadSINQFocus"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadSINQFocus::version() const { return 1; };
+int LoadSINQFocus::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadSINQFocus::category() const { return "DataHandling"; }
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSNSspec.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSNSspec.cpp
index a1c3ffd90e60f0da5cecb6d24462fcff7c2773e8..bbef0ccaf558350d2b7719dfe85b8670f73defa5 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSNSspec.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSNSspec.cpp
@@ -13,7 +13,7 @@
 
 namespace Mantid {
 namespace DataHandling {
-DECLARE_FILELOADER_ALGORITHM(LoadSNSspec);
+DECLARE_FILELOADER_ALGORITHM(LoadSNSspec)
 
 /**
  * Return the confidence with with this algorithm can load the file
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSPE.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSPE.cpp
index 25e3b4c72b7904abe9aa591beaebaa8af88ac3df..004b48b0a2b14b393b2d511b3f405a4d221ebf2f 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSPE.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSPE.cpp
@@ -18,7 +18,7 @@ namespace DataHandling {
 using namespace Kernel;
 using namespace API;
 
-DECLARE_FILELOADER_ALGORITHM(LoadSPE);
+DECLARE_FILELOADER_ALGORITHM(LoadSPE)
 
 /**
  * Return the confidence with with this algorithm can load the file
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
index e1f23f9bd4b95665aaf40e0e5793babd69ffbebe..2f749d8a0784a85acbf2d1bd419044ba6cf13a20 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
@@ -15,7 +15,7 @@
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadSassena);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadSassena)
 
 /**
  * Return the confidence with with this algorithm can load the file
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSavuTomoConfig.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSavuTomoConfig.cpp
index 172ca4b47c5b4a373244e945e0630b1477410e2e..50184d1d4eabd559a6f52a27ec9367de916e7ce9 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSavuTomoConfig.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSavuTomoConfig.cpp
@@ -12,7 +12,7 @@ namespace Mantid {
 namespace DataHandling {
 
 // Register the algorithm into the algorithm factory
-DECLARE_ALGORITHM(LoadSavuTomoConfig);
+DECLARE_ALGORITHM(LoadSavuTomoConfig)
 
 using namespace Mantid::API;
 
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp
index 1d8a877675e97446cd538081a4e6c5590e0980ce..49b271ef922119cdc8cc72c0aa813f1c0de1d7e0 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp
@@ -36,7 +36,7 @@ using Poco::XML::Text;
 namespace Mantid {
 namespace DataHandling {
 // Register the algorithm into the AlgorithmFactory
-DECLARE_FILELOADER_ALGORITHM(LoadSpice2D);
+DECLARE_FILELOADER_ALGORITHM(LoadSpice2D)
 
 // Parse string and convert to numeric type
 template <class T>
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
index 549ddc74278a518606f4cb0ebbc658b4458b78f8..d477812c6246b63b64ccbc44663244ff6fc77008 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
@@ -13,7 +13,7 @@
 namespace Mantid {
 namespace DataHandling {
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadTOFRawNexus);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadTOFRawNexus)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/DataHandling/src/NexusTester.cpp b/Code/Mantid/Framework/DataHandling/src/NexusTester.cpp
index 19657640086df1581cee9546912b6ff62935b102..2f1ed8f0471bad14b3da57c3519f3b60f07b7ef1 100644
--- a/Code/Mantid/Framework/DataHandling/src/NexusTester.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/NexusTester.cpp
@@ -30,10 +30,10 @@ NexusTester::~NexusTester() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string NexusTester::name() const { return "NexusTester"; };
+const std::string NexusTester::name() const { return "NexusTester"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int NexusTester::version() const { return 1; };
+int NexusTester::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string NexusTester::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp b/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp
index 8e73ca0e825ca6bbaee6c6189b2d0e39c78def58..34b98ec08a15d88aba364ceb50b426f5ee4d9796 100644
--- a/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp
@@ -36,10 +36,10 @@ PDLoadCharacterizations::~PDLoadCharacterizations() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string PDLoadCharacterizations::name() const {
   return "PDLoadCharacterizations";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PDLoadCharacterizations::version() const { return 1; };
+int PDLoadCharacterizations::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string PDLoadCharacterizations::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp b/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
index 2ecc8bd1680a20f885d9b5069ae09a00ce6ea10e..ca088cab0faf7f1a46a733d9e0cc0f011b7f01b5 100644
--- a/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
@@ -32,7 +32,7 @@ const std::string
     BASE_URL("http://icat.sns.gov:2080/icat-rest-ws/datafile/filename/");
 }
 
-DECLARE_ARCHIVESEARCH(SNSDataArchive, SNSDataSearch);
+DECLARE_ARCHIVESEARCH(SNSDataArchive, SNSDataSearch)
 
 /**
  * @param filenames : List of files to search
diff --git a/Code/Mantid/Framework/DataHandling/src/SavePAR.cpp b/Code/Mantid/Framework/DataHandling/src/SavePAR.cpp
index 8d2ff9739bf65717d79b92706161be8b4b2ac64d..d318f94f549b5072121b412dc0b0a41673fd668e 100644
--- a/Code/Mantid/Framework/DataHandling/src/SavePAR.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SavePAR.cpp
@@ -14,7 +14,7 @@ namespace Mantid {
 namespace DataHandling {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(SavePAR);
+DECLARE_ALGORITHM(SavePAR)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/DataHandling/src/SavePHX.cpp b/Code/Mantid/Framework/DataHandling/src/SavePHX.cpp
index ecb428de9af8c914a3d67370f576a163e171cc45..7c221896f8be4c88e1ae055a6dfd1bfad7bb027c 100644
--- a/Code/Mantid/Framework/DataHandling/src/SavePHX.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SavePHX.cpp
@@ -14,7 +14,7 @@ namespace Mantid {
 namespace DataHandling {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(SavePHX);
+DECLARE_ALGORITHM(SavePHX)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveParameterFile.cpp b/Code/Mantid/Framework/DataHandling/src/SaveParameterFile.cpp
index 9bee776e07f29f407e307f90680778acd8ca74fa..931538cbb9488116d9dcb0211b5061077e7df773 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveParameterFile.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveParameterFile.cpp
@@ -36,10 +36,10 @@ SaveParameterFile::~SaveParameterFile() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string SaveParameterFile::name() const {
   return "SaveParameterFile";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SaveParameterFile::version() const { return 1; };
+int SaveParameterFile::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SaveParameterFile::category() const {
diff --git a/Code/Mantid/Framework/DataHandling/src/SortTableWorkspace.cpp b/Code/Mantid/Framework/DataHandling/src/SortTableWorkspace.cpp
index 98b38f0fe8e429fd254b84090fbf81e155d44fab..6909250252c266fa1beccde46125ffdb2ff58c81 100644
--- a/Code/Mantid/Framework/DataHandling/src/SortTableWorkspace.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SortTableWorkspace.cpp
@@ -24,7 +24,7 @@ SortTableWorkspace::~SortTableWorkspace() {}
 //----------------------------------------------------------------------------------------------
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SortTableWorkspace::version() const { return 1; };
+int SortTableWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SortTableWorkspace::category() const { return "Utility"; }
@@ -32,7 +32,7 @@ const std::string SortTableWorkspace::category() const { return "Utility"; }
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string SortTableWorkspace::summary() const {
   return "Sort a TableWorkspace.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h b/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
index 72c1e5031354f69b0d4b8a92d91acdff1f3e77b9..54952d823c76a4f5510ed1f61dd3237367f07970 100644
--- a/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
+++ b/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
@@ -171,7 +171,7 @@ private:
 #define DECLARE_VECTORCOLUMN(Type, TypeName)                                   \
   template <> std::string VectorColumn<Type>::typeName() {                     \
     return #TypeName;                                                          \
-  };                                                                           \
+  }                                                                            \
   Kernel::RegistrationHelper register_column_##TypeName((                      \
       API::ColumnFactory::Instance().subscribe<VectorColumn<Type>>(#TypeName), \
       0));
diff --git a/Code/Mantid/Framework/DataObjects/src/PeakColumn.cpp b/Code/Mantid/Framework/DataObjects/src/PeakColumn.cpp
index b844cf39687756221a4f123a5f437883d64714d5..b3d7e129cc927636043721605c3517a80c4892a8 100644
--- a/Code/Mantid/Framework/DataObjects/src/PeakColumn.cpp
+++ b/Code/Mantid/Framework/DataObjects/src/PeakColumn.cpp
@@ -67,7 +67,7 @@ const std::string typeFromName(const std::string &name) {
         "\""
         "Peak column names/types must be explicitly marked in PeakColumn.cpp");
   }
-};
+}
 }
 
 //----------------------------------------------------------------------------------------------
diff --git a/Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp b/Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp
index 4259cce7f869d452a9504fa74e32f7b87a851561..890e3e1e447ee7a078764edb120aceaedfc763d0 100644
--- a/Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -36,7 +36,7 @@ using namespace Mantid::Geometry;
 namespace Mantid {
 namespace DataObjects {
 /// Register the workspace as a type
-DECLARE_WORKSPACE(PeaksWorkspace);
+DECLARE_WORKSPACE(PeaksWorkspace)
 
 //---------------------------------------------------------------------------------------------
 /** Constructor. Create a table with all the required columns.
diff --git a/Code/Mantid/Framework/DataObjects/src/TableWorkspace.cpp b/Code/Mantid/Framework/DataObjects/src/TableWorkspace.cpp
index 138856ae152e5e5b9214c7c67379e19cbe1033d3..d2eac12677952e2456f05e6a57f03a5735562a3d 100644
--- a/Code/Mantid/Framework/DataObjects/src/TableWorkspace.cpp
+++ b/Code/Mantid/Framework/DataObjects/src/TableWorkspace.cpp
@@ -204,7 +204,7 @@ TableWorkspace *TableWorkspace::clone() const {
   // copy logs/properties.
   copy->m_LogManager = boost::make_shared<API::LogManager>(*this->m_LogManager);
   return copy;
-};
+}
 
 /**
  * Sort.
diff --git a/Code/Mantid/Framework/Geometry/src/Crystal/SymmetryElementFactory.cpp b/Code/Mantid/Framework/Geometry/src/Crystal/SymmetryElementFactory.cpp
index 40b6ba8c633af7940f6bea9f6aa494915b45385e..cdf42076ca548f067a1222773ab16a2499d99b68 100644
--- a/Code/Mantid/Framework/Geometry/src/Crystal/SymmetryElementFactory.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Crystal/SymmetryElementFactory.cpp
@@ -425,11 +425,11 @@ void SymmetryElementFactoryImpl::insertPrototype(
   m_prototypes.insert(std::make_pair(identifier, prototype));
 }
 
-DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementIdentityGenerator);
-DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementTranslationGenerator);
-DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementInversionGenerator);
-DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementRotationGenerator);
-DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementMirrorGenerator);
+DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementIdentityGenerator)
+DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementTranslationGenerator)
+DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementInversionGenerator)
+DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementRotationGenerator)
+DECLARE_SYMMETRY_ELEMENT_GENERATOR(SymmetryElementMirrorGenerator)
 
 } // namespace Geometry
 } // namespace Mantid
diff --git a/Code/Mantid/Framework/ISISLiveData/src/FakeISISEventDAE.cpp b/Code/Mantid/Framework/ISISLiveData/src/FakeISISEventDAE.cpp
index 6d5a6fa75c92e107e1d93ce31776ece6adf035b2..c699dfb941193e5c54e70e3187967bd923ac0a01 100644
--- a/Code/Mantid/Framework/ISISLiveData/src/FakeISISEventDAE.cpp
+++ b/Code/Mantid/Framework/ISISLiveData/src/FakeISISEventDAE.cpp
@@ -19,7 +19,7 @@
 namespace Mantid {
 namespace ISISLiveData {
 // Register the algorithm into the algorithm factory
-DECLARE_ALGORITHM(FakeISISEventDAE);
+DECLARE_ALGORITHM(FakeISISEventDAE)
 
 using namespace Kernel;
 using namespace API;
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ChecksumHelper.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ChecksumHelper.h
index 5a4f70794fe35eca19023c28a7ba59c495173de0..54a6b5fcf22e78c4d73b20cfa446924512861f84 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/ChecksumHelper.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/ChecksumHelper.h
@@ -40,7 +40,7 @@ MANTID_KERNEL_DLL std::string sha1FromString(const std::string &input);
 MANTID_KERNEL_DLL std::string sha1FromFile(const std::string &filepath);
 /// create a git checksum from a file (these match the git hash-object command)
 MANTID_KERNEL_DLL std::string gitSha1FromFile(const std::string &filepath);
-};
+}
 
 } // namespace Kernel
 } // namespace Mantid
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
index 85f67ac066da8f40144ae9bc5470bf9bd423c71e..bd55cf9b501cfb9a25f7b2a5365b562425a675fa 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
@@ -198,10 +198,10 @@ void toValue(const std::string &strvalue, std::vector<std::vector<T>> &value,
     }                                                                          \
   }
 
-PROPERTYWITHVALUE_TOVALUE(int);
-PROPERTYWITHVALUE_TOVALUE(long);
-PROPERTYWITHVALUE_TOVALUE(uint32_t);
-PROPERTYWITHVALUE_TOVALUE(uint64_t);
+PROPERTYWITHVALUE_TOVALUE(int)
+PROPERTYWITHVALUE_TOVALUE(long)
+PROPERTYWITHVALUE_TOVALUE(uint32_t)
+PROPERTYWITHVALUE_TOVALUE(uint64_t)
 #if defined(__APPLE__)
 PROPERTYWITHVALUE_TOVALUE(unsigned long);
 #endif
diff --git a/Code/Mantid/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp
index 07d01c24be0b4cf1b5bdaaac8e22b2c1032160e4..52a8e817ddbf20788717bb5f012aedc036f702a0 100644
--- a/Code/Mantid/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/Kernel/src/FilteredTimeSeriesProperty.cpp
@@ -53,16 +53,16 @@ FilteredTimeSeriesProperty<HeldType>::unfiltered() const {
 
 // -------------------------- Concrete instantiation
 // -----------------------------------------------
-INSTANTIATE(int);
-INSTANTIATE(long);
-INSTANTIATE(long long);
-INSTANTIATE(unsigned int);
-INSTANTIATE(unsigned long);
-INSTANTIATE(unsigned long long);
-INSTANTIATE(float);
-INSTANTIATE(double);
-INSTANTIATE(std::string);
-INSTANTIATE(bool);
+INSTANTIATE(int)
+INSTANTIATE(long)
+INSTANTIATE(long long)
+INSTANTIATE(unsigned int)
+INSTANTIATE(unsigned long)
+INSTANTIATE(unsigned long long)
+INSTANTIATE(float)
+INSTANTIATE(double)
+INSTANTIATE(std::string)
+INSTANTIATE(bool)
 
 ///@endcond
 
diff --git a/Code/Mantid/Framework/Kernel/src/IPropertyManager.cpp b/Code/Mantid/Framework/Kernel/src/IPropertyManager.cpp
index 0d1730b581d78219392fb0204e49437f5bcdcfe4..36961d43915405e62d2d90412392bc68b81b579b 100644
--- a/Code/Mantid/Framework/Kernel/src/IPropertyManager.cpp
+++ b/Code/Mantid/Framework/Kernel/src/IPropertyManager.cpp
@@ -7,23 +7,23 @@
 #include <algorithm>
 
 ///@cond
-DEFINE_IPROPERTYMANAGER_GETVALUE(int16_t);
-DEFINE_IPROPERTYMANAGER_GETVALUE(uint16_t);
-DEFINE_IPROPERTYMANAGER_GETVALUE(int32_t);
-DEFINE_IPROPERTYMANAGER_GETVALUE(uint32_t);
-DEFINE_IPROPERTYMANAGER_GETVALUE(int64_t);
-DEFINE_IPROPERTYMANAGER_GETVALUE(uint64_t);
-DEFINE_IPROPERTYMANAGER_GETVALUE(bool);
-DEFINE_IPROPERTYMANAGER_GETVALUE(double);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<int16_t>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<uint16_t>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<int32_t>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<uint32_t>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<int64_t>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<uint64_t>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<double>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<std::string>);
-DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<std::vector<std::string>>);
+DEFINE_IPROPERTYMANAGER_GETVALUE(int16_t)
+DEFINE_IPROPERTYMANAGER_GETVALUE(uint16_t)
+DEFINE_IPROPERTYMANAGER_GETVALUE(int32_t)
+DEFINE_IPROPERTYMANAGER_GETVALUE(uint32_t)
+DEFINE_IPROPERTYMANAGER_GETVALUE(int64_t)
+DEFINE_IPROPERTYMANAGER_GETVALUE(uint64_t)
+DEFINE_IPROPERTYMANAGER_GETVALUE(bool)
+DEFINE_IPROPERTYMANAGER_GETVALUE(double)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<int16_t>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<uint16_t>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<int32_t>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<uint32_t>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<int64_t>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<uint64_t>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<double>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<std::string>)
+DEFINE_IPROPERTYMANAGER_GETVALUE(std::vector<std::vector<std::string>>)
 
 namespace Mantid {
 namespace Kernel {
diff --git a/Code/Mantid/Framework/Kernel/src/MatrixProperty.cpp b/Code/Mantid/Framework/Kernel/src/MatrixProperty.cpp
index 3ff63a07bf748f1a15397d4b1add81652b56a9c2..ddd680bdac9ea217da6fab7c7c783134e2d069ef 100644
--- a/Code/Mantid/Framework/Kernel/src/MatrixProperty.cpp
+++ b/Code/Mantid/Framework/Kernel/src/MatrixProperty.cpp
@@ -43,7 +43,7 @@ template class MANTID_KERNEL_DLL MatrixProperty<float>;
 /**
  * IPropertyManager::getValue definitions
  */
-DEFINE_IPROPERTYMANAGER_GETVALUE(Mantid::Kernel::DblMatrix);
-DEFINE_IPROPERTYMANAGER_GETVALUE(Mantid::Kernel::IntMatrix);
-DEFINE_IPROPERTYMANAGER_GETVALUE(Mantid::Kernel::Matrix<float>);
+DEFINE_IPROPERTYMANAGER_GETVALUE(Mantid::Kernel::DblMatrix)
+DEFINE_IPROPERTYMANAGER_GETVALUE(Mantid::Kernel::IntMatrix)
+DEFINE_IPROPERTYMANAGER_GETVALUE(Mantid::Kernel::Matrix<float>)
 ///@endcond
diff --git a/Code/Mantid/Framework/Kernel/src/PropertyWithValue.cpp b/Code/Mantid/Framework/Kernel/src/PropertyWithValue.cpp
index e087f25a23fc04c8bfb66fd04dbf795c27b0b703..038a26cc359abd12083be4e8546b336ab48bf427 100644
--- a/Code/Mantid/Framework/Kernel/src/PropertyWithValue.cpp
+++ b/Code/Mantid/Framework/Kernel/src/PropertyWithValue.cpp
@@ -10,16 +10,16 @@ namespace Kernel {
   template DLLExport class PropertyWithValue<std::vector<Type>>;
 
 // Explicit instantiations
-INSTANTIATE(int);
-INSTANTIATE(long);
-INSTANTIATE(long long);
-INSTANTIATE(unsigned short int);
-INSTANTIATE(unsigned int);
-INSTANTIATE(unsigned long);
-INSTANTIATE(unsigned long long);
-INSTANTIATE(bool);
-INSTANTIATE(double);
-INSTANTIATE(std::string);
+INSTANTIATE(int)
+INSTANTIATE(long)
+INSTANTIATE(long long)
+INSTANTIATE(unsigned short int)
+INSTANTIATE(unsigned int)
+INSTANTIATE(unsigned long)
+INSTANTIATE(unsigned long long)
+INSTANTIATE(bool)
+INSTANTIATE(double)
+INSTANTIATE(std::string)
 /// @endcond
 
 } // namespace Kernel
diff --git a/Code/Mantid/Framework/Kernel/src/Statistics.cpp b/Code/Mantid/Framework/Kernel/src/Statistics.cpp
index 9af3f0335c5d2e0436d1ee3694dd5fbe7a2e412a..6a021e757806d99a549b69131b44c37009466422 100644
--- a/Code/Mantid/Framework/Kernel/src/Statistics.cpp
+++ b/Code/Mantid/Framework/Kernel/src/Statistics.cpp
@@ -405,14 +405,14 @@ std::vector<double> getMomentsAboutMean(const std::vector<TYPE> &x,
 
 // --------------------------- Concrete instantiations
 // ---------------------------------------------
-INSTANTIATE(float);
-INSTANTIATE(double);
-INSTANTIATE(int);
-INSTANTIATE(long);
-INSTANTIATE(long long);
-INSTANTIATE(unsigned int);
-INSTANTIATE(unsigned long);
-INSTANTIATE(unsigned long long);
+INSTANTIATE(float)
+INSTANTIATE(double)
+INSTANTIATE(int)
+INSTANTIATE(long)
+INSTANTIATE(long long)
+INSTANTIATE(unsigned int)
+INSTANTIATE(unsigned long)
+INSTANTIATE(unsigned long long)
 
 } // namespace Kernel
 } // namespace Mantid
diff --git a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
index e129b7010c2853e88c459f3db86c216a68bb4519..c6057895d5fdfca2f4ac6aaac52b913364003493 100644
--- a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -2026,16 +2026,16 @@ TimeSeriesProperty<TYPE>::setValueFromProperty(const Property &right) {
 
 // -------------------------- Concrete instantiation
 // -----------------------------------------------
-INSTANTIATE(int);
-INSTANTIATE(long);
-INSTANTIATE(long long);
-INSTANTIATE(unsigned int);
-INSTANTIATE(unsigned long);
-INSTANTIATE(unsigned long long);
-INSTANTIATE(float);
-INSTANTIATE(double);
-INSTANTIATE(std::string);
-INSTANTIATE(bool);
+INSTANTIATE(int)
+INSTANTIATE(long)
+INSTANTIATE(long long)
+INSTANTIATE(unsigned int)
+INSTANTIATE(unsigned long)
+INSTANTIATE(unsigned long long)
+INSTANTIATE(float)
+INSTANTIATE(double)
+INSTANTIATE(std::string)
+INSTANTIATE(bool)
 
 /// @endcond
 
diff --git a/Code/Mantid/Framework/Kernel/src/Unit.cpp b/Code/Mantid/Framework/Kernel/src/Unit.cpp
index 82e3541bc80de599ae9ec455ff2105f9c17faf2f..8495405f2101f53e4c70c3ac2b7bc88348d3c81a 100644
--- a/Code/Mantid/Framework/Kernel/src/Unit.cpp
+++ b/Code/Mantid/Framework/Kernel/src/Unit.cpp
@@ -1108,10 +1108,10 @@ double Time::singleFromTOF(const double tof) const {
 
 double Time::conversionTOFMax() const {
   return std::numeric_limits<double>::quiet_NaN();
-};
+}
 double Time::conversionTOFMin() const {
   return std::numeric_limits<double>::quiet_NaN();
-};
+}
 
 Unit *Time::clone() const { return new Time(*this); }
 
diff --git a/Code/Mantid/Framework/Kernel/test/TypedValidatorTest.h b/Code/Mantid/Framework/Kernel/test/TypedValidatorTest.h
index 79693e0335b907b382276d7af79fe0d79df1b35e..124c4655af43968e5e8870184ca6d14dc11447ef 100644
--- a/Code/Mantid/Framework/Kernel/test/TypedValidatorTest.h
+++ b/Code/Mantid/Framework/Kernel/test/TypedValidatorTest.h
@@ -24,8 +24,8 @@ namespace
   /// Dummy object to hold in a shared_ptr for test
   struct Holder
   {};
-  DECLARE_TEST_VALIDATOR(SharedPtrTypedValidator, boost::shared_ptr<Holder>);
-  DECLARE_TEST_VALIDATOR(PODTypedValidator, double);
+  DECLARE_TEST_VALIDATOR(SharedPtrTypedValidator, boost::shared_ptr<Holder>)
+  DECLARE_TEST_VALIDATOR(PODTypedValidator, double)
   class FakeDataItem : public Mantid::Kernel::DataItem
   {
   public:
@@ -34,7 +34,7 @@ namespace
     virtual bool threadSafe() const { return true; }
     virtual const std::string toString() const { return "FakeDataItem{}"; }
   };
-  DECLARE_TEST_VALIDATOR(DataItemSptrTypedValidator, boost::shared_ptr<FakeDataItem>);
+  DECLARE_TEST_VALIDATOR(DataItemSptrTypedValidator, boost::shared_ptr<FakeDataItem>)
 }
 
 class TypedValidatorTest : public CxxTest::TestSuite
diff --git a/Code/Mantid/Framework/LiveData/src/MonitorLiveData.cpp b/Code/Mantid/Framework/LiveData/src/MonitorLiveData.cpp
index 8262af09878fcd413bb35dd9f0e4ab68a3f1991c..8491c3d349bd8ed0a88cac9f96dca443b0751c40 100644
--- a/Code/Mantid/Framework/LiveData/src/MonitorLiveData.cpp
+++ b/Code/Mantid/Framework/LiveData/src/MonitorLiveData.cpp
@@ -27,7 +27,7 @@ MonitorLiveData::~MonitorLiveData() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string MonitorLiveData::name() const { return "MonitorLiveData"; };
+const std::string MonitorLiveData::name() const { return "MonitorLiveData"; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string MonitorLiveData::category() const {
@@ -35,7 +35,7 @@ const std::string MonitorLiveData::category() const {
 }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MonitorLiveData::version() const { return 1; };
+int MonitorLiveData::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp b/Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp
index 50b2621e222a875ff79329ac62cbbd9eea9042fa..b70faa984ea971d86863d6abf400c57b43878652 100644
--- a/Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp
+++ b/Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp
@@ -54,7 +54,7 @@ Mantid::Kernel::DateAndTime timeFromPacket(const ADARA::PacketHeader &hdr) {
 
 namespace Mantid {
 namespace LiveData {
-DECLARE_LISTENER(SNSLiveEventDataListener);
+DECLARE_LISTENER(SNSLiveEventDataListener)
 // The DECLARE_LISTENER macro seems to confuse some editors' syntax checking.
 // The semi-colon limits the complaints to one line.  It has no actual effect
 // on the code.
diff --git a/Code/Mantid/Framework/LiveData/src/StartLiveData.cpp b/Code/Mantid/Framework/LiveData/src/StartLiveData.cpp
index c890cac2ab60164159a93dfc879f7b6d09ae08b1..49338ad3a41d5354587d1086600e12dd764cbca0 100644
--- a/Code/Mantid/Framework/LiveData/src/StartLiveData.cpp
+++ b/Code/Mantid/Framework/LiveData/src/StartLiveData.cpp
@@ -37,10 +37,10 @@ StartLiveData::~StartLiveData() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string StartLiveData::name() const { return "StartLiveData"; };
+const std::string StartLiveData::name() const { return "StartLiveData"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int StartLiveData::version() const { return 1; };
+int StartLiveData::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/AndMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/AndMD.cpp
index 613414e8bec281fa4562a12d1c5c991d7187961e..4f18cf8d18502c6e8cd7166b66c9c6917d47a298 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/AndMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/AndMD.cpp
@@ -22,10 +22,10 @@ AndMD::~AndMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string AndMD::name() const { return "AndMD"; };
+const std::string AndMD::name() const { return "AndMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int AndMD::version() const { return 1; };
+int AndMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /// Run the algorithm with a MDHisotWorkspace as output and operand
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/BinaryOperationMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/BinaryOperationMD.cpp
index 5868cf52579e792ea01e6e7908f722d11f05f985..c618b3692d4518e8986f7d6e6e7f32e06f5ed94f 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/BinaryOperationMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/BinaryOperationMD.cpp
@@ -32,10 +32,10 @@ BinaryOperationMD::~BinaryOperationMD() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string BinaryOperationMD::name() const {
   return "BinaryOperationMD";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int BinaryOperationMD::version() const { return 1; };
+int BinaryOperationMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string BinaryOperationMD::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp
index 3c000629af7223e921f52970aaac0952b4c18899..26d6ce085794916100f135b842e07bb25c8ae737 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/BooleanBinaryOperationMD.cpp
@@ -22,10 +22,10 @@ BooleanBinaryOperationMD::~BooleanBinaryOperationMD() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string BooleanBinaryOperationMD::name() const {
   return "BooleanBinaryOperationMD";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int BooleanBinaryOperationMD::version() const { return 1; };
+int BooleanBinaryOperationMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 ///
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
index 82b7e4dabb17cc5a7d7f778719c124e989235cad..9a435bf5db1b499e9be40c1bc8fe4f5d422009d4 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
@@ -52,7 +52,7 @@ const std::string CalculateCoverageDGS::name() const {
 }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CalculateCoverageDGS::version() const { return 1; };
+int CalculateCoverageDGS::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CalculateCoverageDGS::category() const {
@@ -63,7 +63,7 @@ const std::string CalculateCoverageDGS::category() const {
 const std::string CalculateCoverageDGS::summary() const {
   return "Calculate the reciprocal space coverage for direct geometry "
          "spectrometers";
-};
+}
 
 /**
 *Stores the X values from each H,K,L dimension as member variables
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
index e7959d9c9fbbe0affa5b4e65283e15915fc92ee2..28178f447fa3f61fec2290e4a5c8209cda0dbd1c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
@@ -43,10 +43,10 @@ CompareMDWorkspaces::~CompareMDWorkspaces() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CompareMDWorkspaces::name() const {
   return "CompareMDWorkspaces";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CompareMDWorkspaces::version() const { return 1; };
+int CompareMDWorkspaces::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CompareMDWorkspaces::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp
index 414eb440975ed79dfd397aada8397225551c2170..a2adcd804e4626c7ce472b00e6f9cc571af23bf8 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDetectorFaceMD.cpp
@@ -37,10 +37,10 @@ ConvertToDetectorFaceMD::~ConvertToDetectorFaceMD() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ConvertToDetectorFaceMD::name() const {
   return "ConvertToDetectorFaceMD";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ConvertToDetectorFaceMD::version() const { return 1; };
+int ConvertToDetectorFaceMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ConvertToDetectorFaceMD::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDMinMaxGlobal.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDMinMaxGlobal.cpp
index b4ccc704bb3a78e8db69589e7160ef37d1770a3e..a20bd7ded854596286142d337585f59ef3578238 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDMinMaxGlobal.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDMinMaxGlobal.cpp
@@ -34,10 +34,10 @@ ConvertToMDMinMaxGlobal::~ConvertToMDMinMaxGlobal() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ConvertToMDMinMaxGlobal::name() const {
   return "ConvertToMDMinMaxGlobal";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ConvertToMDMinMaxGlobal::version() const { return 1; };
+int ConvertToMDMinMaxGlobal::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ConvertToMDMinMaxGlobal::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
index 6684e1cac420e5738452c859a6beeb1f27b0fe61..71f53a68117703c65d067e3de08745376fc66300 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
@@ -32,10 +32,10 @@ CreateMDHistoWorkspace::~CreateMDHistoWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string CreateMDHistoWorkspace::name() const {
   return "CreateMDHistoWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int CreateMDHistoWorkspace::version() const { return 1; };
+int CreateMDHistoWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string CreateMDHistoWorkspace::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/DivideMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/DivideMD.cpp
index a471bc0c91f1af08b16e3878773813c9405bef36..d5a31cf34ce80ced56d5a8c411926a51b92fd15f 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/DivideMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/DivideMD.cpp
@@ -27,10 +27,10 @@ DivideMD::~DivideMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string DivideMD::name() const { return "DivideMD"; };
+const std::string DivideMD::name() const { return "DivideMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DivideMD::version() const { return 1; };
+int DivideMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/EqualToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/EqualToMD.cpp
index f53d3f33f7f2200ad6fda5c1ec886682080c8571..32216e09f5f1fa7379c9a731add7ceb8c8481f99 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/EqualToMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/EqualToMD.cpp
@@ -22,10 +22,10 @@ EqualToMD::~EqualToMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string EqualToMD::name() const { return "EqualToMD"; };
+const std::string EqualToMD::name() const { return "EqualToMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int EqualToMD::version() const { return 1; };
+int EqualToMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /// Extra properties
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/EvaluateMDFunction.cpp b/Code/Mantid/Framework/MDAlgorithms/src/EvaluateMDFunction.cpp
index d395663cb7ba0c9a4e7ba66da6f99c2c623059ea..10f64648dac48e419b604e4d4ccf328f30a3c3ad 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/EvaluateMDFunction.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/EvaluateMDFunction.cpp
@@ -28,7 +28,7 @@ EvaluateMDFunction::~EvaluateMDFunction() {}
 //----------------------------------------------------------------------------------------------
 
 /// Algorithm's version for identification. @see Algorithm::version
-int EvaluateMDFunction::version() const { return 1; };
+int EvaluateMDFunction::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string EvaluateMDFunction::category() const {
@@ -38,7 +38,7 @@ const std::string EvaluateMDFunction::category() const {
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string EvaluateMDFunction::summary() const {
   return "Evaluates an MD function on a MD histo workspace.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ExponentialMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ExponentialMD.cpp
index 50ffffa72ead89f8887883e520bb0b424d6a7b00..7da6298e57aa2d4887cd664a3dbd502def1431d3 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ExponentialMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ExponentialMD.cpp
@@ -22,10 +22,10 @@ ExponentialMD::~ExponentialMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string ExponentialMD::name() const { return "ExponentialMD"; };
+const std::string ExponentialMD::name() const { return "ExponentialMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ExponentialMD::version() const { return 1; };
+int ExponentialMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/GreaterThanMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/GreaterThanMD.cpp
index 8818bc87c81e3ed4f93ea6839d06f609ae69e5f6..f98766cfff7d30ea0f189f1b70032d7f23c67c6c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/GreaterThanMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/GreaterThanMD.cpp
@@ -22,10 +22,10 @@ GreaterThanMD::~GreaterThanMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string GreaterThanMD::name() const { return "GreaterThanMD"; };
+const std::string GreaterThanMD::name() const { return "GreaterThanMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int GreaterThanMD::version() const { return 1; };
+int GreaterThanMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /// Run the algorithm with a MDHisotWorkspace as output and operand
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp b/Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp
index 95092d1e84b71a6861640f5a7c625af08da2b0a3..1bb592d391f31166d9f19264859e0dc2902c551d 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/IntegrateFlux.cpp
@@ -32,7 +32,7 @@ public:
 const std::string IntegrateFlux::name() const { return "IntegrateFlux"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int IntegrateFlux::version() const { return 1; };
+int IntegrateFlux::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string IntegrateFlux::category() const { return "MDAlgorithms"; }
@@ -40,7 +40,7 @@ const std::string IntegrateFlux::category() const { return "MDAlgorithms"; }
 /// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
 const std::string IntegrateFlux::summary() const {
   return "Interates spectra in a matrix workspace at a set of points.";
-};
+}
 
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/LessThanMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/LessThanMD.cpp
index da8b7db1879f85f2b385b2df8060ebb77ec3e065..ba6e3f654cb3654cb41a5a88ad124210b466af40 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/LessThanMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/LessThanMD.cpp
@@ -22,10 +22,10 @@ LessThanMD::~LessThanMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LessThanMD::name() const { return "LessThanMD"; };
+const std::string LessThanMD::name() const { return "LessThanMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LessThanMD::version() const { return 1; };
+int LessThanMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /// Run the algorithm with a MDHisotWorkspace as output and operand
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/LoadILLAscii.cpp b/Code/Mantid/Framework/MDAlgorithms/src/LoadILLAscii.cpp
index ffe7780809d447eac556bd7830af26c2ac0a0d3b..aff2b3ba119c599cda4710ed49aacd27e7034811 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/LoadILLAscii.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/LoadILLAscii.cpp
@@ -82,10 +82,10 @@ int LoadILLAscii::confidence(Kernel::FileDescriptor &descriptor) const {
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LoadILLAscii::name() const { return "LoadILLAscii"; };
+const std::string LoadILLAscii::name() const { return "LoadILLAscii"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LoadILLAscii::version() const { return 1; };
+int LoadILLAscii::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string LoadILLAscii::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/LoadMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/LoadMD.cpp
index d50f3f3a368673995c33f2feb95a62e23cb61ab1..7b7d5eafaad185193718a2bc207b66940c027fed 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/LoadMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/LoadMD.cpp
@@ -34,7 +34,7 @@ using namespace Mantid::MDEvents;
 namespace Mantid {
 namespace MDAlgorithms {
 
-DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMD);
+DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadMD)
 
 //----------------------------------------------------------------------------------------------
 /** Constructor
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/LoadSQW.cpp b/Code/Mantid/Framework/MDAlgorithms/src/LoadSQW.cpp
index 30682a7f2d1742064f7462e80eb47b52422abb78..5f2e8770c49ce0499d2a89ddc557b1bf360f7091 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/LoadSQW.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/LoadSQW.cpp
@@ -43,7 +43,7 @@ template <typename T> T interpretAs(std::vector<char> &Buf, size_t ind = 0) {
 }
 }
 
-DECLARE_FILELOADER_ALGORITHM(LoadSQW);
+DECLARE_FILELOADER_ALGORITHM(LoadSQW)
 
 /// Constructor
 LoadSQW::LoadSQW() : m_fileName(""), m_fileStream(),
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/LogarithmMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/LogarithmMD.cpp
index e60b1f162cefe904bf9567fc4be9fb449e3c0f8e..2111d83e333a8a0d67fbf1ad9d1245d0d220b372 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/LogarithmMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/LogarithmMD.cpp
@@ -22,10 +22,10 @@ LogarithmMD::~LogarithmMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string LogarithmMD::name() const { return "LogarithmMD"; };
+const std::string LogarithmMD::name() const { return "LogarithmMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int LogarithmMD::version() const { return 1; };
+int LogarithmMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MaskMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MaskMD.cpp
index 8a9110bf3397109ae2311f5b0fa2517a6c6a93db..a9f49837d990bb5e67c5bd98502457ec7fea1ae9 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/MaskMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/MaskMD.cpp
@@ -41,10 +41,10 @@ MaskMD::~MaskMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string MaskMD::name() const { return "MaskMD"; };
+const std::string MaskMD::name() const { return "MaskMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MaskMD::version() const { return 1; };
+int MaskMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string MaskMD::category() const { return "MDAlgorithms"; }
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MergeMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MergeMD.cpp
index c21455165f3175de748eb696049fd3f13a900839..2ab9e50751114cd76478d7ab9febde0d09b43c85 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/MergeMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/MergeMD.cpp
@@ -31,10 +31,10 @@ MergeMD::~MergeMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string MergeMD::name() const { return "MergeMD"; };
+const std::string MergeMD::name() const { return "MergeMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MergeMD::version() const { return 1; };
+int MergeMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string MergeMD::category() const { return "MDAlgorithms"; }
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MinusMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MinusMD.cpp
index 5b16eb8e592da2f9dc5c940b183a6ad96198c72f..7985cc9b0eb03ff1491202cd5c745b816ac0eea4 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/MinusMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/MinusMD.cpp
@@ -27,10 +27,10 @@ MinusMD::~MinusMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string MinusMD::name() const { return "MinusMD"; };
+const std::string MinusMD::name() const { return "MinusMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MinusMD::version() const { return 1; };
+int MinusMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MultiplyMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MultiplyMD.cpp
index 38dd9296568b02e1653a3e08c2dd7311eec1af89..5ba0de5c4512165f66e194b9091242368c2f4bbb 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/MultiplyMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/MultiplyMD.cpp
@@ -27,10 +27,10 @@ MultiplyMD::~MultiplyMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string MultiplyMD::name() const { return "MultiplyMD"; };
+const std::string MultiplyMD::name() const { return "MultiplyMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MultiplyMD::version() const { return 1; };
+int MultiplyMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/NotMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/NotMD.cpp
index fbe2573df7e96cf6f2f3553318d1e46c0d22d9e0..00757fb06ef3831758354d779186022def752783 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/NotMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/NotMD.cpp
@@ -22,10 +22,10 @@ NotMD::~NotMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string NotMD::name() const { return "NotMD"; };
+const std::string NotMD::name() const { return "NotMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int NotMD::version() const { return 1; };
+int NotMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/OrMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/OrMD.cpp
index 2dc5f30133e4a1bfc6a0ea27182d0e9a0c014705..1ff0932783ea02630112cd9b865cf9d11269a00c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/OrMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/OrMD.cpp
@@ -22,10 +22,10 @@ OrMD::~OrMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string OrMD::name() const { return "OrMD"; };
+const std::string OrMD::name() const { return "OrMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int OrMD::version() const { return 1; };
+int OrMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /// Run the algorithm with a MDHisotWorkspace as output and operand
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/PowerMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/PowerMD.cpp
index 90cdcc44f543909d4921b51a2e1368f9e42eeb79..d4e03afa6bcd7f32cd4eeb39bef23e19b86ba83f 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/PowerMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/PowerMD.cpp
@@ -22,10 +22,10 @@ PowerMD::~PowerMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string PowerMD::name() const { return "PowerMD"; };
+const std::string PowerMD::name() const { return "PowerMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int PowerMD::version() const { return 1; };
+int PowerMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/PreprocessDetectorsToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/PreprocessDetectorsToMD.cpp
index d8cec796d70f6358583a04ad56044434e4e51212..f705eaaab279825cb67247d988d8df4a708ac9db 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/PreprocessDetectorsToMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/PreprocessDetectorsToMD.cpp
@@ -12,7 +12,7 @@ namespace MDAlgorithms {
 // Register the algorithm into the AlgorithmFactory
 DECLARE_ALGORITHM(PreprocessDetectorsToMD)
 
-PreprocessDetectorsToMD::PreprocessDetectorsToMD(){};
+PreprocessDetectorsToMD::PreprocessDetectorsToMD(){}
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties. */
 void PreprocessDetectorsToMD::init() {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/FitResolutionConvolvedModel.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/FitResolutionConvolvedModel.cpp
index dbe2509851495c269337407deaca81965e595799..da845673529edfc948570c4d80e9b8f069538fed 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/FitResolutionConvolvedModel.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/FitResolutionConvolvedModel.cpp
@@ -11,7 +11,7 @@ namespace Mantid {
 namespace MDAlgorithms {
 
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(FitResolutionConvolvedModel);
+DECLARE_ALGORITHM(FitResolutionConvolvedModel)
 
 using Kernel::Direction;
 using Kernel::ListValidator;
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp
index 2afe41cc2bd27c2f0190d6068de0c77809364626..708ae56914c03ee9ad4938bfa320723d869616d1 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp
@@ -8,7 +8,7 @@
 
 namespace Mantid {
 namespace MDAlgorithms {
-DECLARE_FOREGROUNDMODEL(MullerAnsatz);
+DECLARE_FOREGROUNDMODEL(MullerAnsatz)
 
 using Kernel::Math::BoseEinsteinDistribution;
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/QCoordinate.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/QCoordinate.cpp
index cb3d62350f1796c2e6d54664319eb92c87cdd392..ca3ed919e0adfc35925fd19e0ef7784a792f660a 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/QCoordinate.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/QCoordinate.cpp
@@ -4,7 +4,7 @@
 
 namespace Mantid {
 namespace MDAlgorithms {
-DECLARE_FOREGROUNDMODEL(QCoordinate);
+DECLARE_FOREGROUNDMODEL(QCoordinate)
 
 namespace // anonymous
     {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp
index de1d838c4652b2918a56445d6fb1559d54132a8a..d613b2059c84197dbca84c2f6c78568f2de031cc 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp
@@ -5,7 +5,7 @@
 
 namespace Mantid {
 namespace MDAlgorithms {
-DECLARE_FOREGROUNDMODEL(Strontium122);
+DECLARE_FOREGROUNDMODEL(Strontium122)
 
 using Kernel::Math::BoseEinsteinDistribution;
 
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitResolutionModel.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitResolutionModel.cpp
index cabafe77cd995646c07444bad775ff4c91620df6..3ac60433469ce308e37a7b12a96c77ba0420501e 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitResolutionModel.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitResolutionModel.cpp
@@ -23,7 +23,7 @@ using API::Run;
 using API::IFunction;
 
 DECLARE_MDRESOLUTIONCONVOLUTION(TobyFitResolutionModel,
-                                "TobyFitResolutionModel");
+                                "TobyFitResolutionModel")
 
 namespace // anonymous
     {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp
index 031e84db52c50d27a4998c6187b7994d97599408..ba9dd517a09566889f4be563555cea5982229c8e 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp
@@ -50,7 +50,7 @@
 
 namespace Mantid {
 namespace MDAlgorithms {
-DECLARE_FUNCTION(ResolutionConvolvedCrossSection);
+DECLARE_FUNCTION(ResolutionConvolvedCrossSection)
 
 namespace {
 // Attribute names
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp
index e7582e636b6d0023894a13a6cafa9d3ea8cd32ec..e9cb4227084c3c752c0442c58bc1c398f0b4ff49 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp
@@ -18,7 +18,7 @@
 namespace Mantid {
 namespace MDAlgorithms {
 // Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(SimulateResolutionConvolvedModel);
+DECLARE_ALGORITHM(SimulateResolutionConvolvedModel)
 
 using namespace API;
 using namespace Kernel;
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/SaveZODS.cpp b/Code/Mantid/Framework/MDAlgorithms/src/SaveZODS.cpp
index 1b7ad75e9a5b78e29ea2d4157a14c8dd61c0b6ea..df0b220d579988d682516f03cf06ccbb30d84e50 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/SaveZODS.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/SaveZODS.cpp
@@ -28,10 +28,10 @@ SaveZODS::~SaveZODS() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string SaveZODS::name() const { return "SaveZODS"; };
+const std::string SaveZODS::name() const { return "SaveZODS"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SaveZODS::version() const { return 1; };
+int SaveZODS::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SaveZODS::category() const { return "MDAlgorithms"; }
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/SetMDUsingMask.cpp b/Code/Mantid/Framework/MDAlgorithms/src/SetMDUsingMask.cpp
index bb35f8b10486b00baf42129771c09b3071b0548a..2363f5970a63e89252ae26d1926b909fbc05c725 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/SetMDUsingMask.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/SetMDUsingMask.cpp
@@ -27,10 +27,10 @@ SetMDUsingMask::~SetMDUsingMask() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string SetMDUsingMask::name() const { return "SetMDUsingMask"; };
+const std::string SetMDUsingMask::name() const { return "SetMDUsingMask"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int SetMDUsingMask::version() const { return 1; };
+int SetMDUsingMask::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string SetMDUsingMask::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ThresholdMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ThresholdMD.cpp
index 217943daffb07a428824cc8a33adcfe79c364755..bb03a8dfb78694e3d6e088580cd4f4c0c975bd5a 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ThresholdMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ThresholdMD.cpp
@@ -34,10 +34,10 @@ ThresholdMD::~ThresholdMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string ThresholdMD::name() const { return "ThresholdMD"; };
+const std::string ThresholdMD::name() const { return "ThresholdMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ThresholdMD::version() const { return 1; };
+int ThresholdMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ThresholdMD::category() const { return "MDAlgorithms"; }
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/TransformMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/TransformMD.cpp
index 20cd8862083742074123189c063c3402baf3c63b..896c29c74d763ab9941a7c6961f02e0d2921b9fe 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/TransformMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/TransformMD.cpp
@@ -29,10 +29,10 @@ TransformMD::~TransformMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string TransformMD::name() const { return "TransformMD"; };
+const std::string TransformMD::name() const { return "TransformMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int TransformMD::version() const { return 1; };
+int TransformMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string TransformMD::category() const { return "MDAlgorithms"; }
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/UnaryOperationMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/UnaryOperationMD.cpp
index 3d6d07f994e7cfe48786956580c2b6967661b350..38862d9c2143761c691a9c815fd1333a13aa805c 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/UnaryOperationMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/UnaryOperationMD.cpp
@@ -25,10 +25,10 @@ UnaryOperationMD::~UnaryOperationMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string UnaryOperationMD::name() const { return "UnaryOperationMD"; };
+const std::string UnaryOperationMD::name() const { return "UnaryOperationMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int UnaryOperationMD::version() const { return 1; };
+int UnaryOperationMD::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string UnaryOperationMD::category() const {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/XorMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/XorMD.cpp
index 2a388274f38b50c3580d3912b7aca9b0902714f1..c960c27df589b49e574333d8b4f7707bf4c19f30 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/XorMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/XorMD.cpp
@@ -22,10 +22,10 @@ XorMD::~XorMD() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string XorMD::name() const { return "XorMD"; };
+const std::string XorMD::name() const { return "XorMD"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int XorMD::version() const { return 1; };
+int XorMD::version() const { return 1; }
 
 //----------------------------------------------------------------------------------------------
 /// Run the algorithm with a MDHisotWorkspace as output and operand
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformAligned.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformAligned.h
index cc57d1f8ca3ee761c69e3d030482fe1356f730ee..5dd40ca97fbfbc1cd362577b33e4f8e0535edbaf 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformAligned.h
+++ b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformAligned.h
@@ -9,13 +9,13 @@ namespace Mantid {
 namespace MDEvents {
 
 /// Unique type declaration for which dimensions are used in the input workspace
-DECLARE_VECTOR_PARAMETER(DimensionsToBinFromParam, size_t);
+DECLARE_VECTOR_PARAMETER(DimensionsToBinFromParam, size_t)
 
 /// Unique type declaration for the offset of coordinates
-DECLARE_VECTOR_PARAMETER(OriginOffsetParam, coord_t);
+DECLARE_VECTOR_PARAMETER(OriginOffsetParam, coord_t)
 
 /// Unique type declaration for the step size in transformation
-DECLARE_VECTOR_PARAMETER(ScalingParam, coord_t);
+DECLARE_VECTOR_PARAMETER(ScalingParam, coord_t)
 
 /** A restricted version of CoordTransform which transforms
   from one set of dimensions to another, allowing:
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformDistance.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformDistance.h
index 2c332767cc177c85f8aafe5cdc9b96bb02fda16a..4da70fdac7e0f109657aff9ca68104bce711e27f 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformDistance.h
+++ b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CoordTransformDistance.h
@@ -12,11 +12,11 @@ namespace Mantid {
 namespace MDEvents {
 /// Unique CoordCenterVectorParam type declaration for ndimensional coordinate
 /// centers
-DECLARE_VECTOR_PARAMETER(CoordCenterVectorParam, coord_t);
+DECLARE_VECTOR_PARAMETER(CoordCenterVectorParam, coord_t)
 
 /// Unique DimensionsUsedVectorParam type declaration for boolean masks over
 /// dimensions
-DECLARE_VECTOR_PARAMETER(DimensionsUsedVectorParam, bool);
+DECLARE_VECTOR_PARAMETER(DimensionsUsedVectorParam, bool)
 
 /** A non-linear coordinate transform that takes
  * a point from nd dimensions and converts it to a
diff --git a/Code/Mantid/Framework/MDEvents/src/ConvToMDBase.cpp b/Code/Mantid/Framework/MDEvents/src/ConvToMDBase.cpp
index 2bb6898f1a077c30956fe253fa3bbd217c275522..34beee6fd332e6437181aeded445836a1df17d7a 100644
--- a/Code/Mantid/Framework/MDEvents/src/ConvToMDBase.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/ConvToMDBase.cpp
@@ -94,7 +94,7 @@ size_t ConvToMDBase::initialize(
   m_coordinateSystem = WSD.getCoordinateSystem();
 
   return n_spectra;
-};
+}
 
 /** empty default constructor */
 ConvToMDBase::ConvToMDBase()
diff --git a/Code/Mantid/Framework/MDEvents/src/ConvertToReflectometryQ.cpp b/Code/Mantid/Framework/MDEvents/src/ConvertToReflectometryQ.cpp
index c8785b26cb211005945eb69367cf4491304ea785..1c5df9e388a81edc7a3cd313dc0245fc6f804bc7 100644
--- a/Code/Mantid/Framework/MDEvents/src/ConvertToReflectometryQ.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/ConvertToReflectometryQ.cpp
@@ -136,10 +136,10 @@ ConvertToReflectometryQ::~ConvertToReflectometryQ() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ConvertToReflectometryQ::name() const {
   return "ConvertToReflectometryQ";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ConvertToReflectometryQ::version() const { return 1; };
+int ConvertToReflectometryQ::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ConvertToReflectometryQ::category() const {
diff --git a/Code/Mantid/Framework/MDEvents/src/FitMD.cpp b/Code/Mantid/Framework/MDEvents/src/FitMD.cpp
index dbb17e2e1f4f7fafb929f36525899a2a4fc49959..64d2ce71eb3e0d25065e015c49173539874838bb 100644
--- a/Code/Mantid/Framework/MDEvents/src/FitMD.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/FitMD.cpp
@@ -23,7 +23,7 @@
 
 namespace Mantid {
 namespace MDEvents {
-DECLARE_DOMAINCREATOR(FitMD);
+DECLARE_DOMAINCREATOR(FitMD)
 
 using namespace API;
 using namespace Kernel;
diff --git a/Code/Mantid/Framework/MDEvents/src/ImportMDEventWorkspace.cpp b/Code/Mantid/Framework/MDEvents/src/ImportMDEventWorkspace.cpp
index 778dae5954c68138cb19041cbd7eda45903ded49..25613ad38949bb3f7b0e8fabcaa5ba495c02e5a3 100644
--- a/Code/Mantid/Framework/MDEvents/src/ImportMDEventWorkspace.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/ImportMDEventWorkspace.cpp
@@ -81,10 +81,10 @@ ImportMDEventWorkspace::~ImportMDEventWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ImportMDEventWorkspace::name() const {
   return "ImportMDEventWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ImportMDEventWorkspace::version() const { return 1; };
+int ImportMDEventWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ImportMDEventWorkspace::category() const {
diff --git a/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp
index 3773fc1802319885c626268f72c325d790e325e9..134a84b5007e1173d14c4820891e8a06dc6e420a 100644
--- a/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp
@@ -31,10 +31,10 @@ ImportMDHistoWorkspace::~ImportMDHistoWorkspace() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string ImportMDHistoWorkspace::name() const {
   return "ImportMDHistoWorkspace";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int ImportMDHistoWorkspace::version() const { return 1; };
+int ImportMDHistoWorkspace::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string ImportMDHistoWorkspace::category() const {
diff --git a/Code/Mantid/Framework/MDEvents/src/MDBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
index 510d96f65f5f5ac6450c61572c71962945b8615d..6f4964c01fddff83be93bdfb5332fe1b16df1538 100644
--- a/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
@@ -296,7 +296,7 @@ TMDE(void MDBox)::getEventsData(std::vector<coord_t> &coordTable,
 #ifdef MDBOX_TRACK_CENTROID
   this->calculateCentroid(this->m_centroid);
 #endif
-};
+}
 /** The method to convert the table of data into vector of events
  *   Used to load events from plain binary file
  *   @param coordTable -- vector of events parameters, which will be converted
@@ -305,7 +305,7 @@ TMDE(void MDBox)::getEventsData(std::vector<coord_t> &coordTable,
  */
 TMDE(void MDBox)::setEventsData(const std::vector<coord_t> &coordTable) {
   MDE::dataToEvents(coordTable, this->data);
-};
+}
 
 //-----------------------------------------------------------------------------------------------
 /** Allocate and return a vector with a copy of all events contained
diff --git a/Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp b/Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp
index c5066f6a2b219290a9def174747e56aa57285399..64150e9fa8a1bed3a780afa511aac02462d61703 100644
--- a/Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp
@@ -4,7 +4,7 @@
 namespace Mantid {
 namespace MDEvents {
 // register the class, whith conversion factory under ModQ name
-DECLARE_MD_TRANSFID(MDTransfModQ, |Q|);
+DECLARE_MD_TRANSFID(MDTransfModQ, |Q|)
 
 /**method calculates the units, the transformation expects the input ws to be
 in. If the input ws is in different units,
diff --git a/Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp b/Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp
index ea013bd3239563a815534d0918c55ad4de7a6ddb..f8022527affa48d6e33e2cb3e96bcc7596ceb411 100644
--- a/Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/MDTransfNoQ.cpp
@@ -4,7 +4,7 @@ namespace Mantid {
 namespace MDEvents {
 
 // register the class, whith conversion factory under NoQ name
-DECLARE_MD_TRANSFID(MDTransfNoQ, CopyToMD);
+DECLARE_MD_TRANSFID(MDTransfNoQ, CopyToMD)
 
 /** Method fills-in all additional properties requested by user and not defined
 *by matrix workspace itselt.
@@ -177,7 +177,7 @@ MDTransfNoQ::inputUnitID(Kernel::DeltaEMode::Type mode,
   return pXAxis->unit()->unitID();
 }
 
-MDTransfNoQ::MDTransfNoQ() : m_NMatrixDim(0), m_YAxis(NULL), m_Det(NULL){};
+MDTransfNoQ::MDTransfNoQ() : m_NMatrixDim(0), m_YAxis(NULL), m_Det(NULL){}
 
 } // End MDAlgorighms namespace
 } // End Mantid namespace
diff --git a/Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp b/Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp
index aacc63c1c0932f63dde313c888bc3ffb82785c2b..4b28ee722568cff8fa139fedfe0e91bd1451ea66 100644
--- a/Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/MDTransfQ3D.cpp
@@ -4,7 +4,7 @@
 namespace Mantid {
 namespace MDEvents {
 // register the class, whith conversion factory under Q3D name
-DECLARE_MD_TRANSFID(MDTransfQ3D, Q3D);
+DECLARE_MD_TRANSFID(MDTransfQ3D, Q3D)
 
 /** method returns number of matrix dimensions calculated by this class
 * as function of energy analysis mode   */
diff --git a/Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp b/Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp
index 10b30e0d7135a7ad80b24e48ca81cc478fb4f00f..e0ec2978af544dce8cfffd6056856876da4d62f8 100644
--- a/Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/MDWSDescription.cpp
@@ -128,7 +128,7 @@ Kernel::Matrix<double> MDWSDescription::getGoniometerMatr() const {
     return m_InWS->run().getGoniometer().getR();
   else
     return Kernel::Matrix<double>(3, 3, true);
-};
+}
 
 /** the function builds MD event WS description from existing workspace.
 * Primary used to obtain existing ws parameters
diff --git a/Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp b/Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp
index 9ef8f0b06ef0029023e017348f6debbffd599f9a..8ae927468775706771aa13666b793b4bebb2188c 100644
--- a/Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp
@@ -366,7 +366,7 @@ UnitsConversionHelper::UnitsConversionHelper()
     : m_UnitCnvrsn(CnvrtToMD::ConvertNo), m_Factor(1), m_Power(1),
       m_Emode(-1), // undefined
       m_L1(1), m_Efix(1), m_TwoTheta(0), m_L2(1), m_pTwoThetas(NULL),
-      m_pL2s(NULL), m_pEfixedArray(NULL){};
+      m_pL2s(NULL), m_pEfixedArray(NULL){}
 
 } // endNamespace MDEvents
 } // endNamespace Mantid
diff --git a/Code/Mantid/Framework/MDEvents/src/UserFunctionMD.cpp b/Code/Mantid/Framework/MDEvents/src/UserFunctionMD.cpp
index 7b2eb2d1dd07343da6518336da55312d59d2ebbf..bb44a51918550e0c3b2755115afc41bbfa7da265 100644
--- a/Code/Mantid/Framework/MDEvents/src/UserFunctionMD.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/UserFunctionMD.cpp
@@ -11,7 +11,7 @@ namespace Mantid {
 namespace MDEvents {
 
 // Subscribe the function into the factory.
-DECLARE_FUNCTION(UserFunctionMD);
+DECLARE_FUNCTION(UserFunctionMD)
 
 /// Default constructor
 UserFunctionMD::UserFunctionMD() {
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 71dd4571e3213c1a41e66e795a667e290ec0f9af..99e7e215f5d7f55b1d030bf42a7d644114cda969 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -33,9 +33,9 @@ namespace
   typedef void(*declarePropertyType4)(boost::python::object & self, const std::string &, const boost::python::object &, const int);
 
   // Overload types
-  BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload, PythonAlgorithm::declarePyAlgProperty, 2, 3);
-  BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload, PythonAlgorithm::declarePyAlgProperty, 3, 6);
-  BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload, PythonAlgorithm::declarePyAlgProperty, 4, 5);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload, PythonAlgorithm::declarePyAlgProperty, 2, 3)
+  BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload, PythonAlgorithm::declarePyAlgProperty, 3, 6)
+  BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload, PythonAlgorithm::declarePyAlgProperty, 4, 5)
 }
 
 void export_leaf_classes()
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index 12bfc84afbc68a1900b0a1214a4e3ef48a9e81fd..4719f8e959126fdb9aa392704adc0518d41a8b3d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -97,7 +97,7 @@ GCC_DIAG_OFF(cast-qual)
     FileLoaderRegistry::Instance().unsubscribe(descr.first, descr.second);
   }
 
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(existsOverloader, exists, 1, 2);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(existsOverloader, exists, 1, 2)
 
   ///@endcond
 }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index d44c0a1f606327a92cf20adb9a64e7392fff9922..4296086b4f68f950c5e8326dd0de2d9bf6a57914 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -59,8 +59,8 @@ namespace
   ///@cond
   //------------------------------------------------------------------------------------------------------
   /// Define overload generators
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(create_overloads,AlgorithmManagerImpl::create, 1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createUnmanaged_overloads,AlgorithmManagerImpl::createUnmanaged, 1,2);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(create_overloads,AlgorithmManagerImpl::create, 1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createUnmanaged_overloads,AlgorithmManagerImpl::createUnmanaged, 1,2)
   ///@endcond
 }
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 0a1e917bd120a1ad8aabd2b97e582f008116c595..4151bcbebf843e22591789803a3f9136041fc14e 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -27,7 +27,7 @@ namespace
 
   //------------------------------- Overload macros ---------------------------
   // Overloads for operator() function which has 1 optional argument
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Axis_getValue, Axis::getValue, 1, 2);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Axis_getValue, Axis::getValue, 1, 2)
 
   /**
    * Extract the axis values as a sequence. A numpy array is used if the
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
index 4f784af07eae140aff25064204561875e5cb6ba2..b02c444f40f44c630a6a4e48363a50a87983f78d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
@@ -11,7 +11,7 @@ using Mantid::PythonInterface::Policies::RemoveConstSharedPtr;
 using namespace boost::python;
 
 /// Overload generator for getInstrumentFilename
-BOOST_PYTHON_FUNCTION_OVERLOADS(getInstrumentFilename_Overload, ExperimentInfo::getInstrumentFilename, 1, 2);
+BOOST_PYTHON_FUNCTION_OVERLOADS(getInstrumentFilename_Overload, ExperimentInfo::getInstrumentFilename, 1, 2)
 
 void export_ExperimentInfo()
 {
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index caa28aea2a08327eefdfff4d5014de8cea77b281..d43ac0538b798e6bf3bf5978e8e9af36a0e3d391 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -35,10 +35,10 @@ namespace
   // -- Set property overloads --
   // setProperty(index,value,explicit)
   typedef void(IFunction::*setParameterType1)(size_t,const double & value,bool);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads, setParameter, 2, 3);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads, setParameter, 2, 3)
   // setProperty(index,value,explicit)
   typedef void(IFunction::*setParameterType2)(const std::string &,const double & value,bool);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads, setParameter, 2, 3);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads, setParameter, 2, 3)
 
 
   ///@endcond
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 6ec0dcda804db20c630a039e12d8c73d1ff0e7b1..11dd4f9b8bff6891cb963f523178ba945c98c2b5 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -13,7 +13,7 @@ using namespace boost::python;
 namespace
 {
   ///@cond
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads, Workspace::isDirty, 0, 1);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Workspace_isDirtyOverloads, Workspace::isDirty, 0, 1)
   ///@endcond
 }
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index 6ff101d8dddd7456ad557193dd45a01f75080b53..e7cc6802b0fa5033923d65d5a65afe00c161053b 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -34,9 +34,9 @@ namespace
   }
 
   /// Overload generator for create
-  BOOST_PYTHON_FUNCTION_OVERLOADS(createFromParent_Overload, createFromParentPtr, 2, 5);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createTable_Overload, createTable, 0, 1);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createPeaks_Overload, createPeaks, 0, 1);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(createFromParent_Overload, createFromParentPtr, 2, 5)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createTable_Overload, createTable, 0, 1)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createPeaks_Overload, createPeaks, 0, 1)
 }
 
 void export_WorkspaceFactory()
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index 406a438bcb3df8e5e49006ceec9a7cb9e7fd840d..02856d5765b992fc759ed31b96ea8768567ed06d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -9,15 +9,15 @@ using namespace boost::python;
 namespace
 {
   // Default parameter function overloads
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterNames,Component::getParameterNames,0,1);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_hasParameter,Component::hasParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getNumberParameter,Component::getNumberParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getBoolParameter,Component::getBoolParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getPositionParameter,Component::getPositionParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getRotationParameter,Component::getRotationParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getStringParameter,Component::getStringParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getIntParameter,Component::getIntParameter,1,2);
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterType,Component::getParameterType,1,2);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterNames,Component::getParameterNames,0,1)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_hasParameter,Component::hasParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getNumberParameter,Component::getNumberParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getBoolParameter,Component::getBoolParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getPositionParameter,Component::getPositionParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getRotationParameter,Component::getRotationParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getStringParameter,Component::getStringParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getIntParameter,Component::getIntParameter,1,2)
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(Component_getParameterType,Component::getParameterType,1,2)
 
 
 }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 16bcc7cf7b1918846db178a0e7cb3cd26ad64f04..74b37cfebead2690565ab953180431d4bc3ec39c 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -14,7 +14,7 @@ namespace //<unnamed>
 {
   ///@cond
   // define overloaded functions
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getEulerAngles_overloads, Goniometer::getEulerAngles, 0, 1);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getEulerAngles_overloads, Goniometer::getEulerAngles, 0, 1)
   ///@endcond
 
   /// Set the U vector via a numpy array
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/CloneToNumpy.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/CloneToNumpy.cpp
index 6213ffb71c9efddf16c8060a5b115367bbce7565..bc85d3edd85fc7995c1bd4bfc7da52b5d838710c 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/CloneToNumpy.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/CloneToNumpy.cpp
@@ -133,18 +133,18 @@ namespace Mantid { namespace PythonInterface
         INSTANTIATE_CLONEND(ElementType)
 
       ///@cond Doxygen doesn't seem to like this...
-      INSTANTIATE_CLONE(int);
-      INSTANTIATE_CLONE(long);
-      INSTANTIATE_CLONE(long long);
-      INSTANTIATE_CLONE(unsigned int);
-      INSTANTIATE_CLONE(unsigned long);
-      INSTANTIATE_CLONE(unsigned long long);
-      INSTANTIATE_CLONE(double);
-      INSTANTIATE_CLONE(float);
+      INSTANTIATE_CLONE(int)
+      INSTANTIATE_CLONE(long)
+      INSTANTIATE_CLONE(long long)
+      INSTANTIATE_CLONE(unsigned int)
+      INSTANTIATE_CLONE(unsigned long)
+      INSTANTIATE_CLONE(unsigned long long)
+      INSTANTIATE_CLONE(double)
+      INSTANTIATE_CLONE(float)
       // Need further 1D specialisation for string
       INSTANTIATE_CLONE1D(std::string)
       // Need further ND specialisation for bool
-      INSTANTIATE_CLONEND(bool);
+      INSTANTIATE_CLONEND(bool)
       ///@endcond
     }
   }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVector.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVector.cpp
index 8151c09da2f91a52f7326c8128e540da49bf07ce..759fe6b6e038dbc3d9a3bcbc4a2ae9a2a2e56aa8 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVector.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayToVector.cpp
@@ -163,15 +163,15 @@ namespace Mantid
         template DLLExport struct NDArrayToVector<ElementType>;
 
       ///@cond Doxygen doesn't seem to like this...
-      INSTANTIATE_TOVECTOR(int);
-      INSTANTIATE_TOVECTOR(long);
-      INSTANTIATE_TOVECTOR(long long);
-      INSTANTIATE_TOVECTOR(unsigned int);
-      INSTANTIATE_TOVECTOR(unsigned long);
-      INSTANTIATE_TOVECTOR(unsigned long long);
-      INSTANTIATE_TOVECTOR(double);
-      INSTANTIATE_TOVECTOR(bool);
-      INSTANTIATE_TOVECTOR(std::string); 
+      INSTANTIATE_TOVECTOR(int)
+      INSTANTIATE_TOVECTOR(long)
+      INSTANTIATE_TOVECTOR(long long)
+      INSTANTIATE_TOVECTOR(unsigned int)
+      INSTANTIATE_TOVECTOR(unsigned long)
+      INSTANTIATE_TOVECTOR(unsigned long long)
+      INSTANTIATE_TOVECTOR(double)
+      INSTANTIATE_TOVECTOR(bool)
+      INSTANTIATE_TOVECTOR(std::string)
       ///@endcond
     }
   }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayTypeIndex.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayTypeIndex.cpp
index a1efd28e193cad6e6512bea77ae6157f510806bd..5a7981231fa947acebb8cd983bd8b73b630b7082 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayTypeIndex.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/NDArrayTypeIndex.cpp
@@ -24,15 +24,15 @@ namespace Mantid
         template DLLExport struct NDArrayTypeIndex<CType>;\
 
 
-      DEFINE_TYPE_MAPPING(int, NPY_INT);
-      DEFINE_TYPE_MAPPING(long, NPY_LONG);
-      DEFINE_TYPE_MAPPING(long long, NPY_LONGLONG);
-      DEFINE_TYPE_MAPPING(unsigned int, NPY_UINT);
-      DEFINE_TYPE_MAPPING(unsigned long, NPY_ULONG);
-      DEFINE_TYPE_MAPPING(unsigned long long, NPY_ULONGLONG);
-      DEFINE_TYPE_MAPPING(bool, NPY_BOOL);
-      DEFINE_TYPE_MAPPING(double, NPY_DOUBLE);
-      DEFINE_TYPE_MAPPING(float, NPY_FLOAT);
+      DEFINE_TYPE_MAPPING(int, NPY_INT)
+      DEFINE_TYPE_MAPPING(long, NPY_LONG)
+      DEFINE_TYPE_MAPPING(long long, NPY_LONGLONG)
+      DEFINE_TYPE_MAPPING(unsigned int, NPY_UINT)
+      DEFINE_TYPE_MAPPING(unsigned long, NPY_ULONG)
+      DEFINE_TYPE_MAPPING(unsigned long long, NPY_ULONGLONG)
+      DEFINE_TYPE_MAPPING(bool, NPY_BOOL)
+      DEFINE_TYPE_MAPPING(double, NPY_DOUBLE)
+      DEFINE_TYPE_MAPPING(float, NPY_FLOAT)
     }
   }
 }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/WrapWithNumpy.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/WrapWithNumpy.cpp
index d353890b416dd59e13b296e6144bed28f29bbbb4..8b56c8eb7a17f623ded38b8000850ba2781c6c16 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/WrapWithNumpy.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Converters/WrapWithNumpy.cpp
@@ -65,14 +65,14 @@ namespace Mantid { namespace PythonInterface
         template DLLExport PyObject *wrapWithNDArray<ElementType>(const ElementType*, const int ndims, Py_intptr_t *dims, const NumpyWrapMode);
 
       ///@cond Doxygen doesn't seem to like this...
-      INSTANTIATE_WRAPNUMPY(int);
-      INSTANTIATE_WRAPNUMPY(long);
-      INSTANTIATE_WRAPNUMPY(long long);
-      INSTANTIATE_WRAPNUMPY(unsigned int);
-      INSTANTIATE_WRAPNUMPY(unsigned long);
-      INSTANTIATE_WRAPNUMPY(unsigned long long);
-      INSTANTIATE_WRAPNUMPY(double);
-      INSTANTIATE_WRAPNUMPY(float);
+      INSTANTIATE_WRAPNUMPY(int)
+      INSTANTIATE_WRAPNUMPY(long)
+      INSTANTIATE_WRAPNUMPY(long long)
+      INSTANTIATE_WRAPNUMPY(unsigned int)
+      INSTANTIATE_WRAPNUMPY(unsigned long)
+      INSTANTIATE_WRAPNUMPY(unsigned long long)
+      INSTANTIATE_WRAPNUMPY(double)
+      INSTANTIATE_WRAPNUMPY(float)
       ///@endcond
     }
   }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
index 762f446435d56a3f2bad87ec96e4bccaf5a7481d..45a9d0f8a559794869adc667a6bd9cd94776578f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
@@ -31,9 +31,9 @@ namespace
    }
 
   /// Overload generator for getInstrument
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getInstrument_Overload, getInstrument, 0, 1);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getInstrument_Overload, getInstrument, 0, 1)
   /// Overload generator for getString
-  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload, getString, 1, 2);
+  BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload, getString, 1, 2)
 }
 
 void export_ConfigService()
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index 8fc7a039ebfccf5490771a26128961bec9504395..3bfa9244083a18adb81d5a276d1f037ac23bf52d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -94,7 +94,7 @@ namespace
     }
   }
   // Define an overload to handle the default argument
-  BOOST_PYTHON_FUNCTION_OVERLOADS(getStatisticsOverloads, getStatisticsNumpy, 1, 2);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(getStatisticsOverloads, getStatisticsNumpy, 1, 2)
 
   //============================ Z score ============================================
   // Function pointer to real implementation of Zscore functions
@@ -132,7 +132,7 @@ namespace
     return getZScoreNumpyImpl(&getZscore, data, sorted);
   }
   // Define an overload to handle the default argument
-  BOOST_PYTHON_FUNCTION_OVERLOADS(getZscoreOverloads, getZscoreNumpy, 1, 2);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(getZscoreOverloads, getZscoreNumpy, 1, 2)
 
   /**
    * Proxy for @see Mantid::Kernel::getModifiedZscore so that it can accept numpy arrays,
@@ -143,7 +143,7 @@ namespace
     return getZScoreNumpyImpl(&getModifiedZscore, data, sorted);
   }
   // Define an overload to handle the default argument
-  BOOST_PYTHON_FUNCTION_OVERLOADS(getModifiedZscoreOverloads, getModifiedZscoreNumpy, 1, 2);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(getModifiedZscoreOverloads, getModifiedZscoreNumpy, 1, 2)
 
 
   //============================ getMoments ============================================
@@ -194,7 +194,7 @@ namespace
   }
 
   // Define an overload to handle the default argument
-  BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutOriginOverloads, getMomentsAboutOriginNumpy, 2, 3);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutOriginOverloads, getMomentsAboutOriginNumpy, 2, 3)
 
   /**
    * Proxy for @see Mantid::Kernel::getMomentsAboutMean so that it can accept numpy arrays
@@ -207,7 +207,7 @@ namespace
   }
 
   // Define an overload to handle the default argument
-  BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutMeanOverloads, getMomentsAboutMeanNumpy, 2, 3);
+  BOOST_PYTHON_FUNCTION_OVERLOADS(getMomentsAboutMeanOverloads, getMomentsAboutMeanNumpy, 2, 3)
   ///@endcond
 }
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
index 0934388431327414d8b523c38c9edb853e63b872..2f9bf530009231a934726719b8dbaad4acd44bf5 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
@@ -38,7 +38,6 @@ namespace
       .def("getStatistics", &TimeSeriesProperty<TYPE>::getStatistics) \
       .def("timeAverageValue", &TimeSeriesProperty<TYPE>::timeAverageValue) \
       ;
-  ;
 }
 
 void export_TimeSeriesProperty_Double()
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/SequenceTypeHandler.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/SequenceTypeHandler.cpp
index 067aa64fc4d24d7f9fcbe749edcfad9faf257e14..627bc2d4cd003f5afc9e907616619daf8c69f931 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/SequenceTypeHandler.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Registry/SequenceTypeHandler.cpp
@@ -128,15 +128,15 @@ namespace Mantid
       #define INSTANTIATE(ElementType)\
         template DLLExport struct SequenceTypeHandler<std::vector<ElementType> >;
 
-      INSTANTIATE(int);
-      INSTANTIATE(long);
-      INSTANTIATE(long long);
-      INSTANTIATE(unsigned int);
-      INSTANTIATE(unsigned long);
-      INSTANTIATE(unsigned long long);
-      INSTANTIATE(double);
-      INSTANTIATE(std::string);
-      INSTANTIATE(bool);
+      INSTANTIATE(int)
+      INSTANTIATE(long)
+      INSTANTIATE(long long)
+      INSTANTIATE(unsigned int)
+      INSTANTIATE(unsigned long)
+      INSTANTIATE(unsigned long long)
+      INSTANTIATE(double)
+      INSTANTIATE(std::string)
+      INSTANTIATE(bool)
       ///@endcond
     }
   }
diff --git a/Code/Mantid/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp b/Code/Mantid/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
index 032de062643f6cf9582bb27f4bae6a365375a7d7..0ae46ae1427422bbed19e4acaa778ab12322118a 100644
--- a/Code/Mantid/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
+++ b/Code/Mantid/Framework/PythonInterface/test/testhelpers/WorkspaceCreationHelperModule.cpp
@@ -16,11 +16,11 @@
 using namespace WorkspaceCreationHelper;
 using namespace Mantid::MDEvents::MDEventsTestHelper;
 
-BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithFullInstrument_overloads, create2DWorkspaceWithFullInstrument, 2, 4);
+BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithFullInstrument_overloads, create2DWorkspaceWithFullInstrument, 2, 4)
 
-BOOST_PYTHON_FUNCTION_OVERLOADS(makeFakeMDHistoWorkspace_overloads, makeFakeMDHistoWorkspace, 2, 7);
+BOOST_PYTHON_FUNCTION_OVERLOADS(makeFakeMDHistoWorkspace_overloads, makeFakeMDHistoWorkspace, 2, 7)
 
-BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithRectangularInstrument_overloads, create2DWorkspaceWithRectangularInstrument, 3, 3);
+BOOST_PYTHON_FUNCTION_OVERLOADS(create2DWorkspaceWithRectangularInstrument_overloads, create2DWorkspaceWithRectangularInstrument, 3, 3)
 
 namespace
 {
diff --git a/Code/Mantid/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h b/Code/Mantid/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
index 64c0750492af73686b09a62ad8d52f4a73ec6a32..89900eeee1bc8c86bf24cc4279c7b31346707ce7 100644
--- a/Code/Mantid/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
+++ b/Code/Mantid/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
@@ -171,7 +171,7 @@ private:
   std::string getParentFolder(const std::string &entry);
 };
 
-}; // namespace API
-}; // namespace Mantid
+} // namespace API
+} // namespace Mantid
 
 #endif // _MANTIDSCRIPTREPOSITORY_SCRIPTREPOSITORYIMPL_H_
diff --git a/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp b/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
index 1f0f1ea817597f809039d4340ac5d1f7a97e68ee..a3e8d448ce089acc0659ae09e99d0ad10a274887 100644
--- a/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
+++ b/Code/Mantid/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
@@ -1200,7 +1200,7 @@ void ScriptRepositoryImpl::setIgnorePatterns(const std::string &patterns) {
     boost::replace_all(newignore, "*", ".*");
     ignoreregex = std::string("(").append(newignore).append(")");
   }
-};
+}
 /**
  @todo describe
  */
diff --git a/Code/Mantid/Framework/TestHelpers/src/ScopedFileHelper.cpp b/Code/Mantid/Framework/TestHelpers/src/ScopedFileHelper.cpp
index e8708decc761fd33dcb5f77262662b8284c64535..243f36ff1373812ac60dfe73e8370baf3ff459b3 100644
--- a/Code/Mantid/Framework/TestHelpers/src/ScopedFileHelper.cpp
+++ b/Code/Mantid/Framework/TestHelpers/src/ScopedFileHelper.cpp
@@ -41,13 +41,13 @@ ScopedFile &ScopedFile::operator=(const ScopedFile &other) {
     other.release();
   }
   return *this;
-};
+}
 
 /// Copy construction.
 ScopedFile::ScopedFile(const ScopedFile &other) {
   this->m_filename = other.m_filename;
   other.release();
-};
+}
 
 /**
 Common method used by all constructors. Creates a file containing the ASCII file
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
index f8cff1c7562e38cfb885b61f1393a8173b0b50df..7f146efc89ad7d23b531f94bc08b2657bd88657f 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
@@ -30,10 +30,10 @@ DgsAbsoluteUnitsReduction::~DgsAbsoluteUnitsReduction() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string DgsAbsoluteUnitsReduction::name() const {
   return "DgsAbsoluteUnitsReduction";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DgsAbsoluteUnitsReduction::version() const { return 1; };
+int DgsAbsoluteUnitsReduction::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DgsAbsoluteUnitsReduction::category() const {
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
index 9b5d8f18600fb99474fbdfe947680be892da075d..643c68fa0c224c341f035d3ac669c0a0104e56e9 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
@@ -42,10 +42,10 @@ DgsConvertToEnergyTransfer::~DgsConvertToEnergyTransfer() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string DgsConvertToEnergyTransfer::name() const {
   return "DgsConvertToEnergyTransfer";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DgsConvertToEnergyTransfer::version() const { return 1; };
+int DgsConvertToEnergyTransfer::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DgsConvertToEnergyTransfer::category() const {
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
index bbb21dc2cd5966b8a6b99900dc9b424707823ae7..85be54fcfc2f12d3df4d986d62c863e105129ceb 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
@@ -30,10 +30,10 @@ DgsDiagnose::~DgsDiagnose() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string DgsDiagnose::name() const { return "DgsDiagnose"; };
+const std::string DgsDiagnose::name() const { return "DgsDiagnose"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DgsDiagnose::version() const { return 1; };
+int DgsDiagnose::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DgsDiagnose::category() const {
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
index 56bce546f2d61b35d41df7314cfe0e8c558f7d26..56258b060d0b10e28f0dc52aa4f9db294585e850 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
@@ -38,10 +38,10 @@ DgsPreprocessData::~DgsPreprocessData() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string DgsPreprocessData::name() const {
   return "DgsPreprocessData";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DgsPreprocessData::version() const { return 1; };
+int DgsPreprocessData::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DgsPreprocessData::category() const {
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
index 0b8a08209705c234b81399a3c2d047b8e3ae4f0c..f5dc93a0b54af726d6f691f35301b14b0cf34805 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
@@ -39,10 +39,10 @@ DgsReduction::~DgsReduction() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string DgsReduction::name() const { return "DgsReduction"; };
+const std::string DgsReduction::name() const { return "DgsReduction"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DgsReduction::version() const { return 1; };
+int DgsReduction::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DgsReduction::category() const {
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsRemap.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsRemap.cpp
index 5a15d54b2679ffd17b6f31f199312f8becaa16d7..d4008ae2aa53c2bde7d76394a911d1c4debca0f0 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsRemap.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsRemap.cpp
@@ -24,10 +24,10 @@ DgsRemap::~DgsRemap() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string DgsRemap::name() const { return "DgsRemap"; };
+const std::string DgsRemap::name() const { return "DgsRemap"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int DgsRemap::version() const { return 1; };
+int DgsRemap::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string DgsRemap::category() const { return "Workflow\\Inelastic"; }
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonCalculateAsymmetry.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonCalculateAsymmetry.cpp
index a508a720150ca85d6747ab2f6393528ea1905dad..a70b9f91146ecf4307042244bc3955785349db15 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonCalculateAsymmetry.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonCalculateAsymmetry.cpp
@@ -28,10 +28,10 @@ MuonCalculateAsymmetry::~MuonCalculateAsymmetry() {}
 /// Algorithm's name for identification. @see Algorithm::name
 const std::string MuonCalculateAsymmetry::name() const {
   return "MuonCalculateAsymmetry";
-};
+}
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MuonCalculateAsymmetry::version() const { return 1; };
+int MuonCalculateAsymmetry::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string MuonCalculateAsymmetry::category() const {
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonLoad.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonLoad.cpp
index 9d2771c1ea439e05c26d11828a179adf837c0311..0690f08d3c2c1650edbc0d70208a5c64bc81ed28 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonLoad.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/MuonLoad.cpp
@@ -28,10 +28,10 @@ MuonLoad::~MuonLoad() {}
 
 //----------------------------------------------------------------------------------------------
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string MuonLoad::name() const { return "MuonLoad"; };
+const std::string MuonLoad::name() const { return "MuonLoad"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int MuonLoad::version() const { return 1; };
+int MuonLoad::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string MuonLoad::category() const { return "Workflow\\Muon"; }
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/StepScan.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/StepScan.cpp
index 616e1df5844f85a08a05f7f9772e6f911627486e..4541b25d6eae0ecaea86cc41b15ff4131c4a5bb3 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/StepScan.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/StepScan.cpp
@@ -19,10 +19,10 @@ StepScan::StepScan() {}
 StepScan::~StepScan() {}
 
 /// Algorithm's name for identification. @see Algorithm::name
-const std::string StepScan::name() const { return "StepScan"; };
+const std::string StepScan::name() const { return "StepScan"; }
 
 /// Algorithm's version for identification. @see Algorithm::version
-int StepScan::version() const { return 1; };
+int StepScan::version() const { return 1; }
 
 /// Algorithm's category for identification. @see Algorithm::category
 const std::string StepScan::category() const { return "Workflow\\Alignment"; }
diff --git a/Code/Mantid/MantidPlot/src/ExpDecayDialog.cpp b/Code/Mantid/MantidPlot/src/ExpDecayDialog.cpp
index 98154dc22ff8b7800e14888a1b373fa0ac4b8df8..cd334774930596a9e2ad7d8cbcd8430a8b3a7c98 100644
--- a/Code/Mantid/MantidPlot/src/ExpDecayDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/ExpDecayDialog.cpp
@@ -158,7 +158,7 @@ void ExpDecayDialog::setGraph(Graph *g)
 
 	connect (graph, SIGNAL(closedGraph()), this, SLOT(close()));
     connect (graph, SIGNAL(dataRangeChanged()), this, SLOT(changeDataRange()));
-};
+}
 
 void ExpDecayDialog::activateCurve(const QString& curveName)
 {
@@ -178,7 +178,7 @@ void ExpDecayDialog::activateCurve(const QString& curveName)
 	if (slopes < 2)
         boxAmplitude->setText(QString::number(c->maxYValue() - c->minYValue(), 'g', precision));
 
-};
+}
 
 void ExpDecayDialog::changeDataRange()
 {
diff --git a/Code/Mantid/MantidPlot/src/FFTDialog.cpp b/Code/Mantid/MantidPlot/src/FFTDialog.cpp
index f83ac4f22c94e60de847057e6f982c4a845bb9f2..e6453e17b295abed8ce016b5b28113ba64a95f78 100644
--- a/Code/Mantid/MantidPlot/src/FFTDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/FFTDialog.cpp
@@ -186,7 +186,7 @@ void FFTDialog::setGraph(Graph *g)
 	graph = g;
 	boxName->insertStringList (g->analysableCurvesList());
 	activateCurve(boxName->currentText());
-};
+}
 
 void FFTDialog::activateCurve(const QString& curveName)
 {
@@ -202,7 +202,7 @@ void FFTDialog::activateCurve(const QString& curveName)
 		double x1 = d_table->text(1, col).toDouble();
 		boxSampling->setText(QString::number(x1 - x0));
 	}
-};
+}
 
 void FFTDialog::setTable(Table *t)
 {
@@ -233,7 +233,7 @@ void FFTDialog::setTable(Table *t)
 		boxReal->setCurrentItem(t->colIndex(l[0]));
 		boxImaginary->setCurrentItem(t->colIndex(l[1]));
 	}
-};
+}
 
 void FFTDialog::setMatrix(Matrix *m)
 {
diff --git a/Code/Mantid/MantidPlot/src/FilterDialog.cpp b/Code/Mantid/MantidPlot/src/FilterDialog.cpp
index 6f02ae0d0fef6314f841ba1f1c121adde771b645..1e16d247b5955fec9a51f950f9157c9d562713b1 100644
--- a/Code/Mantid/MantidPlot/src/FilterDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/FilterDialog.cpp
@@ -190,4 +190,4 @@ void FilterDialog::setGraph(Graph *g)
 {
 graph = g;
 boxName->addItems (g->analysableCurvesList());
-};
+}
diff --git a/Code/Mantid/MantidPlot/src/FitDialog.cpp b/Code/Mantid/MantidPlot/src/FitDialog.cpp
index 27936290bc3adff94fda465ce20fcf4977fd11f5..701adfc599bcca9af0f282023c6a4f1078d60d6d 100644
--- a/Code/Mantid/MantidPlot/src/FitDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/FitDialog.cpp
@@ -559,7 +559,7 @@ void FitDialog::setGraph(Graph *g)
 
 	connect (d_graph, SIGNAL(closedGraph()), this, SLOT(close()));
 	connect (d_graph, SIGNAL(dataRangeChanged()), this, SLOT(changeDataRange()));
-};
+}
 
 void FitDialog::activateCurve(const QString& curveName)
 {
@@ -573,7 +573,7 @@ void FitDialog::activateCurve(const QString& curveName)
     boxTo->setValue(QMAX(start, end));
 	//Set the same color as the data curve chosen for fit (Feature Request #4031)
 	boxColor->setColor(c->pen().color());
-};
+}
 
 void FitDialog::saveUserFunction()
 {
diff --git a/Code/Mantid/MantidPlot/src/Graph.h b/Code/Mantid/MantidPlot/src/Graph.h
index 07cab9df6848ce3f2ac8ab91b713e15e62845f1c..7480107f3b16f2e676788b11424dc8f16e71d71b 100644
--- a/Code/Mantid/MantidPlot/src/Graph.h
+++ b/Code/Mantid/MantidPlot/src/Graph.h
@@ -881,7 +881,7 @@ private:
 
 };
 
-Q_DECLARE_METATYPE(Graph::CurveType);
+Q_DECLARE_METATYPE(Graph::CurveType)
 
 
 #endif // GRAPH_H
diff --git a/Code/Mantid/MantidPlot/src/InterpolationDialog.cpp b/Code/Mantid/MantidPlot/src/InterpolationDialog.cpp
index 4d0ceb1722ec6edd74468697136ee4eae62f9823..efc62a720287db9a0bf84597b542da0dbd6d2852 100644
--- a/Code/Mantid/MantidPlot/src/InterpolationDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/InterpolationDialog.cpp
@@ -173,7 +173,7 @@ void InterpolationDialog::setGraph(Graph *g)
 
 	connect (graph, SIGNAL(closedGraph()), this, SLOT(close()));
 	connect (graph, SIGNAL(dataRangeChanged()), this, SLOT(changeDataRange()));
-};
+}
 
 void InterpolationDialog::activateCurve(const QString& curveName)
 {
@@ -189,7 +189,7 @@ void InterpolationDialog::activateCurve(const QString& curveName)
 	graph->range(graph->curveIndex(curveName), &start, &end);
 	boxStart->setText(QString::number(QMIN(start, end), 'g', app->d_decimal_digits));
 	boxEnd->setText(QString::number(QMAX(start, end), 'g', app->d_decimal_digits));
-};
+}
 
 void InterpolationDialog::changeDataRange()
 {
diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
index 6caf14cffda807df66ff555893690b33b8148823..a2649437b34be4c7d7eff4d34b7b75be00ab5b4b 100644
--- a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
+++ b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.cpp
@@ -17,7 +17,7 @@
 InstrumentTreeWidget::InstrumentTreeWidget(QWidget *w):QTreeView(w), m_treeModel(0) 
 {
   connect(this,SIGNAL(clicked(const QModelIndex)),this,SLOT(sendComponentSelectedSignal(const QModelIndex)));
-};
+}
 
 void InstrumentTreeWidget::setInstrumentActor(InstrumentActor* instrActor)
 {
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
index 2ef4c3335a4734ba153ddf208f75626cebf9bf3f..68905abb21568b4e155abd25d1d868615d95a587 100644
--- a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
@@ -2310,7 +2310,7 @@ MultiLayer* MantidUI::mergePlots(MultiLayer* mlayer_1, MultiLayer* mlayer_2)
   mlayer_2->close();
 
   return mlayer_1;
-};
+}
 
 MantidMatrix* MantidUI::getMantidMatrix(const QString& wsName)
 {
diff --git a/Code/Mantid/MantidPlot/src/MdiSubWindow.cpp b/Code/Mantid/MantidPlot/src/MdiSubWindow.cpp
index 3e003d1b593fc70e9a2f28ad13d1e442b603f64a..f0b014fb79a82d2442d714e61ad0ded817581ada 100644
--- a/Code/Mantid/MantidPlot/src/MdiSubWindow.cpp
+++ b/Code/Mantid/MantidPlot/src/MdiSubWindow.cpp
@@ -98,7 +98,7 @@ void MdiSubWindow::updateCaption()
     wrapper->setWindowTitle(windowTitle());
   }
   emit captionChanged(objectName(), d_label);
-};
+}
 
 void MdiSubWindow::resizeEvent( QResizeEvent* e )
 {
diff --git a/Code/Mantid/MantidPlot/src/MultiLayer.h b/Code/Mantid/MantidPlot/src/MultiLayer.h
index e561a61a0fd4f9567bee65e89a9e8ab0c4d815c0..cba7586a9b750b181a036cff1dfaf046295f8308 100644
--- a/Code/Mantid/MantidPlot/src/MultiLayer.h
+++ b/Code/Mantid/MantidPlot/src/MultiLayer.h
@@ -266,7 +266,7 @@ signals:
 	void clicked(LayerButton*);
 };
 
-Q_DECLARE_METATYPE(MultiLayer*);
+Q_DECLARE_METATYPE(MultiLayer*)
 
 
 class WaterfallFillDialog : QDialog
diff --git a/Code/Mantid/MantidPlot/src/Plot3DDialog.cpp b/Code/Mantid/MantidPlot/src/Plot3DDialog.cpp
index f1cab9fe0ed10459a2f02bfe8adc2ed50db2a32f..a231acee361ea34a6fca21608b53fbc4ec1f0664 100644
--- a/Code/Mantid/MantidPlot/src/Plot3DDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/Plot3DDialog.cpp
@@ -594,7 +594,7 @@ void Plot3DDialog::setPlot(Graph3D *g)
 	connect( boxLegend, SIGNAL(toggled(bool)), d_plot, SLOT(showColorLegend(bool)));
     connect( boxResolution, SIGNAL(valueChanged(int)), d_plot, SLOT(setResolution(int)));
 	connect( boxDistance, SIGNAL(valueChanged(int)), d_plot, SLOT(setLabelsDistance(int)));
-};
+}
 
 void Plot3DDialog::worksheet()
 {
diff --git a/Code/Mantid/MantidPlot/src/PolynomFitDialog.cpp b/Code/Mantid/MantidPlot/src/PolynomFitDialog.cpp
index ae9655bcc774897cf2dd33f27db9f87431a94236..f1e19dc48096b0edbdc3adcb1ea3f9b4651a67fa 100644
--- a/Code/Mantid/MantidPlot/src/PolynomFitDialog.cpp
+++ b/Code/Mantid/MantidPlot/src/PolynomFitDialog.cpp
@@ -146,7 +146,7 @@ void PolynomFitDialog::setGraph(Graph *g)
 
 	connect (graph, SIGNAL(closedGraph()), this, SLOT(close()));
 	connect (graph, SIGNAL(dataRangeChanged()), this, SLOT(changeDataRange()));
-};
+}
 
 void PolynomFitDialog::activateCurve(const QString& curveName)
 {
@@ -156,7 +156,7 @@ void PolynomFitDialog::activateCurve(const QString& curveName)
 	boxStart->setText(QString::number(start, 'g', 15));
 	boxEnd->setText(QString::number(end, 'g', 15));
 	boxPoints->setValue(QMAX(n_points, 100));
-};
+}
 
 void PolynomFitDialog::changeDataRange()
 {
diff --git a/Code/Mantid/MantidQt/API/inc/MantidQtAPI/Message.h b/Code/Mantid/MantidQt/API/inc/MantidQtAPI/Message.h
index 0f5c32d37b4c8cec55d5faa814b035faeb5da83a..c14f3a1fd7adab22e8c8ca8bcb1d494179fc9b99 100644
--- a/Code/Mantid/MantidQt/API/inc/MantidQtAPI/Message.h
+++ b/Code/Mantid/MantidQt/API/inc/MantidQtAPI/Message.h
@@ -58,6 +58,6 @@ namespace MantidQt
 }
 
 /// Required to operate in signals/slots
-Q_DECLARE_METATYPE(MantidQt::API::Message);
+Q_DECLARE_METATYPE(MantidQt::API::Message)
 
 #endif //MESSAGE_H_
diff --git a/Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h b/Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h
index cd4cd846ea52ee17584223b608dae647b4425cd5..f630804187fa97a659a7f9f8212ed5b0346f6c28 100644
--- a/Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h
+++ b/Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h
@@ -257,7 +257,7 @@ private:
 
   };
 
-}; // namespace API
-};// namespace Mantid
+} // namespace API
+} // namespace Mantid
 
 #endif  /* MANTID_API_SCRIPTREPOSITORYVIEW_H_ */
diff --git a/Code/Mantid/MantidQt/API/src/MdConstants.cpp b/Code/Mantid/MantidQt/API/src/MdConstants.cpp
index d07c67b26b2edbad35472f1cbaea85883b490f5a..5eae091543035e64d667dcf69114833dae30c329 100644
--- a/Code/Mantid/MantidQt/API/src/MdConstants.cpp
+++ b/Code/Mantid/MantidQt/API/src/MdConstants.cpp
@@ -12,9 +12,9 @@ namespace MantidQt
     {
       initializeSettingsConstants();
       initializeViewConstants();
-    };
+    }
 
-    MdConstants::~MdConstants(){};
+    MdConstants::~MdConstants(){}
 
     void MdConstants::initializeSettingsConstants()
     {
diff --git a/Code/Mantid/MantidQt/API/src/PropertyWidget.cpp b/Code/Mantid/MantidQt/API/src/PropertyWidget.cpp
index 4b938ef3b9454bdb92eb9a48627ee80101aa7e22..2af591dd93965559c09b3a47daef8e4975725b75 100644
--- a/Code/Mantid/MantidQt/API/src/PropertyWidget.cpp
+++ b/Code/Mantid/MantidQt/API/src/PropertyWidget.cpp
@@ -171,7 +171,7 @@ namespace API
   /**
    * Destructor.
    */
-  ClickableLabel::~ClickableLabel() {};
+  ClickableLabel::~ClickableLabel() {}
 
   /**
    * Catches the mouse press event and emits the signal.
diff --git a/Code/Mantid/MantidQt/API/src/RepoModel.cpp b/Code/Mantid/MantidQt/API/src/RepoModel.cpp
index 14e3a8ebbc84bc57c1bcfd3944fe184ac9d30b84..0fd6e88b36bcf864f97927794d3ed9674a201295 100644
--- a/Code/Mantid/MantidQt/API/src/RepoModel.cpp
+++ b/Code/Mantid/MantidQt/API/src/RepoModel.cpp
@@ -940,21 +940,21 @@ bool RepoModel::isUploading(const QModelIndex & index)const{
 
 
 /// @return string to define the LOCAL_ONLY state
-const QString & RepoModel::localOnlySt(){return LOCALONLY;}; 
+const QString & RepoModel::localOnlySt(){return LOCALONLY;}
 /// @return string to define the REMOTE_ONLY state
-const QString & RepoModel::remoteOnlySt(){return REMOTEONLY;}; 
+const QString & RepoModel::remoteOnlySt(){return REMOTEONLY;}
 /// @return string to define the LOCAL_CHANGED state
-const QString & RepoModel::localChangedSt(){return LOCALCHANGED;}; 
+const QString & RepoModel::localChangedSt(){return LOCALCHANGED;}
 /// @return string to define the REMOTE_CHANGED state
-const QString & RepoModel::remoteChangedSt(){return REMOTECHANGED;}; 
+const QString & RepoModel::remoteChangedSt(){return REMOTECHANGED;}
 /// @return string to define the BOTH_UNCHANGED state
-const QString & RepoModel::updatedSt(){return BOTHUNCHANGED;}; 
+const QString & RepoModel::updatedSt(){return BOTHUNCHANGED;}
 /// @return string to define the BOTH_CHANGED state
-const QString & RepoModel::bothChangedSt(){return BOTHCHANGED;};
+const QString & RepoModel::bothChangedSt(){return BOTHCHANGED;}
 /// @return string to define the downloading state
-const QString & RepoModel::downloadSt(){return DOWNLOADST;};
+const QString & RepoModel::downloadSt(){return DOWNLOADST;}
 /// @return string to define the uploading state
-const QString & RepoModel::uploadSt(){return UPLOADST;};
+const QString & RepoModel::uploadSt(){return UPLOADST;}
 
 
 
diff --git a/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp b/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp
index 96cd7bcd4f4b3b742ae7006a272f36d329aa225c..5f76e642dc0ec7aab6683f0c939dbfc7f2ecebd0 100644
--- a/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp
+++ b/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp
@@ -377,7 +377,7 @@ bool  ScriptRepositoryView::RepoDelegate::editorEvent(QEvent *event,
 QSize ScriptRepositoryView::RepoDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex & /*index*/ ) const{
   return QSize(35,35);
 
-} ;
+}
 
 
 //////////////////////////////////////////////////
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
index 1cad4d1c3eed2aa02c91eb775887ec5117678447..e16e6621686daa9fbd125bc94dddf8ed62462ac6 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
@@ -14,7 +14,7 @@ namespace MantidQt
 {
   namespace CustomDialogs
   {
-    DECLARE_DIALOG(CatalogPublishDialog);
+    DECLARE_DIALOG(CatalogPublishDialog)
 
     /**
      * Default constructor.
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
index 96b80b7c1a10d8c9bd49bcb0de432e4d3fb7af0f..314e3b9d9e81a95567f8f941eb6110ab35e6c222 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/ConvertTableToMatrixWorkspaceDialog.cpp
@@ -22,7 +22,7 @@ namespace MantidQt
   namespace CustomDialogs
   {
     // Declare the dialog. Name must match the class name
-    DECLARE_DIALOG(ConvertTableToMatrixWorkspaceDialog);
+    DECLARE_DIALOG(ConvertTableToMatrixWorkspaceDialog)
 
     //--------------------------------------------------------------------------
     // Public methods
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp
index c0345f3727b179b415cb8d877a1bb3642a76a87a..02aa58ba0026daf06094976a5a807d40226ee04c 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/CreateSampleShapeDialog.cpp
@@ -24,7 +24,7 @@ namespace MantidQt
 {
 namespace CustomDialogs
 {
-  DECLARE_DIALOG(CreateSampleShapeDialog);
+  DECLARE_DIALOG(CreateSampleShapeDialog)
 }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/FitDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/FitDialog.cpp
index 7b4217a2dc42a1c363509643b2f6cfe3c7849d7c..d39863b1b7767173d76e1c7b7024b48fab709f25 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/FitDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/FitDialog.cpp
@@ -31,7 +31,7 @@ namespace CustomDialogs
 {
 
 // Declare the dialog. Name must match the class name
-DECLARE_DIALOG(FitDialog);
+DECLARE_DIALOG(FitDialog)
 
 //------------------------------------------------------
 // InputWorkspaceWidget methods
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp
index 5fdda1e5b182bbbbc9a093bd6bbf840dc01bdf38..15280c6c137d709330b7f28fcdd760c936618603 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/LOQScriptInputDialog.cpp
@@ -13,7 +13,7 @@ namespace MantidQt
 {
 namespace CustomDialogs
 {
-  DECLARE_DIALOG(LOQScriptInputDialog);
+  DECLARE_DIALOG(LOQScriptInputDialog)
 }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/LoadDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/LoadDialog.cpp
index 2f88ee8c8972a01ab23344eebd9e4b6545bded73..7c4f993de8deda0bdbbf36c86f8a933d1323bd2a 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/LoadDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/LoadDialog.cpp
@@ -41,7 +41,7 @@ namespace MantidQt
     }
 
     // Declare the dialog. Name must match the class name
-    DECLARE_DIALOG(LoadDialog);
+    DECLARE_DIALOG(LoadDialog)
 
     //--------------------------------------------------------------------------
     // Public methods
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/LoadInstrumentDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/LoadInstrumentDialog.cpp
index 37192b4c29992eacad85712ece2b9f4edfbca603..5716406111d92270b3c458c55d12be125a332c2b 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/LoadInstrumentDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/LoadInstrumentDialog.cpp
@@ -11,7 +11,7 @@ namespace MantidQt
 {
   namespace CustomDialogs
   {
-    DECLARE_DIALOG(LoadInstrumentDialog);
+    DECLARE_DIALOG(LoadInstrumentDialog)
 
     /**
     Constructor
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp
index 5b2a0dc90887d7f12a5feccb3c54ecdaadb478c9..7a81d7a310dc9bce13ba71f3205d938db5bf6736 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/SortTableWorkspaceDialog.cpp
@@ -15,7 +15,7 @@ namespace CustomDialogs
 {
 
 // Declare the dialog. Name must match the class name
-DECLARE_DIALOG(SortTableWorkspaceDialog);
+DECLARE_DIALOG(SortTableWorkspaceDialog)
 
 
 /// Default constructor
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp
index 65330a4d7d5f02c2605754fc78f702ab9470dc9e..0450d6bd8eaf6fa7e9de4db4d790a0a66bc3f5d9 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp
+++ b/Code/Mantid/MantidQt/CustomDialogs/src/StartLiveDataDialog.cpp
@@ -64,7 +64,7 @@ namespace MantidQt
 {
 namespace CustomDialogs
 {
-  DECLARE_DIALOG(StartLiveDataDialog);
+  DECLARE_DIALOG(StartLiveDataDialog)
 
 //----------------------
 // Public member functions
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/DataComparison.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/DataComparison.cpp
index ef9f33f7c4f1b33132aa670fdb3de9434659704b..240476a99036c5c7b49b8b01c4ad1ea6aa630814 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/DataComparison.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/DataComparison.cpp
@@ -17,7 +17,7 @@ namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  DECLARE_SUBWINDOW(DataComparison);
+  DECLARE_SUBWINDOW(DataComparison)
 }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
index 2220d18b31e6bf0e1e51e0b8964ee4e0f580eb61..bbb7e3d71242d485f3a1cc8a93ebc36b5b2f2e44 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/DirectConvertToEnergy.cpp
@@ -21,7 +21,7 @@ namespace MantidQt
 {
   namespace CustomInterfaces
   {
-    DECLARE_SUBWINDOW(DirectConvertToEnergy);
+    DECLARE_SUBWINDOW(DirectConvertToEnergy)
   }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
index b1c8f32029d5c4e00ec093512dcf3f0e3f492bad..5b804a41d51346611690e28960ba8c15dab8bbc5 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectBayes.cpp
@@ -14,7 +14,7 @@ namespace MantidQt
 {
   namespace CustomInterfaces
   {
-    DECLARE_SUBWINDOW(IndirectBayes);
+    DECLARE_SUBWINDOW(IndirectBayes)
   }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
index fccc4b5d9b65ff6670c9fae894744f2560e148e6..c4e6b705319331cd2ab47f9fe87fb79ce65ec875 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataAnalysis.cpp
@@ -27,7 +27,7 @@ namespace CustomInterfaces
 namespace IDA
 {
   // Add this class to the list of specialised dialogs in this namespace
-  DECLARE_SUBWINDOW(IndirectDataAnalysis);
+  DECLARE_SUBWINDOW(IndirectDataAnalysis)
 
   /**
    * Constructor.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
index f167fa71ea6ea714b4fdbb91813e32aa4c66bcd1..3bc7f982fb8738ef2db888419b97e1f06509c6c7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp
@@ -29,7 +29,7 @@ namespace MantidQt
 {
   namespace CustomInterfaces
   {
-    DECLARE_SUBWINDOW(IndirectDataReduction);
+    DECLARE_SUBWINDOW(IndirectDataReduction)
   }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
index ec4de290209dffb88b4e6be4939c98af143baa28..9516a1d50162596e62d2b2cf206f41d93fd02377 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
@@ -33,7 +33,7 @@ namespace // anon
   }
 } // anon namespace
 
-DECLARE_SUBWINDOW(IndirectDiffractionReduction);
+DECLARE_SUBWINDOW(IndirectDiffractionReduction)
 
 using namespace Mantid::API;
 using namespace MantidQt::CustomInterfaces;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
index d0e38f7b34a0a8b34d47a19bfb904715e7bf6cd0..79454dfac0308058917c5f2ee0a935292af33a31 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectSimulation.cpp
@@ -14,7 +14,7 @@ namespace MantidQt
 {
   namespace CustomInterfaces
   {
-    DECLARE_SUBWINDOW(IndirectSimulation);
+    DECLARE_SUBWINDOW(IndirectSimulation)
   }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
index f1f20f03fe2e7f9330d3e8b49e64e11bc5ace019..12d5730862cb9175e31470ae701d84ba7f1e0f87 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectTools.cpp
@@ -13,7 +13,7 @@ namespace MantidQt
 {
   namespace CustomInterfaces
   {
-    DECLARE_SUBWINDOW(IndirectTools);
+    DECLARE_SUBWINDOW(IndirectTools)
   }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MantidEV.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MantidEV.cpp
index 12e730113c93f845e337af4abc2c69cff1ad69de..39964eda49a65ef0b605494dd47e165886e1ce11 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/MantidEV.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/MantidEV.cpp
@@ -16,7 +16,7 @@ namespace CustomInterfaces
 {
 
 //Register the class with the factory
-DECLARE_SUBWINDOW(MantidEV);
+DECLARE_SUBWINDOW(MantidEV)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp
index d2f78f8aea274891da734f5bd26faace46366734..096dd495cc22e961564d3e4aa4aed52ddea52010 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp
@@ -701,7 +701,7 @@ void EditLocalParameterDialog::valueChanged(int row, int col)
 /*==========================================================================================*/
 
 //Register the class with the factory
-DECLARE_SUBWINDOW(MultiDatasetFit);
+DECLARE_SUBWINDOW(MultiDatasetFit)
 
 /**
  * Constructor
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
index cfcce6e7aaef299491d61ac6a85b5f2f25b14f71..4de693e73db68b5a1563337d426d0c040a396f37 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/ALCInterface.cpp
@@ -15,7 +15,7 @@ namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  DECLARE_SUBWINDOW(ALCInterface);
+  DECLARE_SUBWINDOW(ALCInterface)
 
   const QStringList ALCInterface::STEP_NAMES =
       QStringList() << "Data loading" << "Baseline modelling" << "Peak fitting";
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
index 22c2f7fd75ae174cb3780ea84d4a835187038369..9e408a5109f36ef810dd12ca9c8a88df2e233869 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
@@ -63,7 +63,7 @@ namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  DECLARE_SUBWINDOW(MuonAnalysis);
+  DECLARE_SUBWINDOW(MuonAnalysis)
 
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
index 7882684398a58cd2c7b56a8589207ad780db5f78..11776a19d3524bc3b89477d470504c222530fce1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
@@ -14,7 +14,7 @@ namespace MantidQt
   {
     using namespace Mantid::API;
 
-    DECLARE_SUBWINDOW(QtReflMainView);
+    DECLARE_SUBWINDOW(QtReflMainView)
 
     //----------------------------------------------------------------------------------------------
     /** Constructor
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
index 1767acd57efd1dac3eb88703a2011890a6445ee8..c1be652ce1893086dde17f8be70bff29af6f2bf9 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
@@ -59,7 +59,7 @@ namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  DECLARE_SUBWINDOW(SANSRunWindow);
+  DECLARE_SUBWINDOW(SANSRunWindow)
 
 
 using namespace MantidQt::MantidWidgets;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/SampleTransmission.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/SampleTransmission.cpp
index c44be8a5c1cd9b77393efe04622e08e3c2b54826..6a95f432c7da1345f3a802eb4e3acd13ac4e67b7 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/SampleTransmission.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/SampleTransmission.cpp
@@ -19,7 +19,7 @@ namespace MantidQt
 {
 namespace CustomInterfaces
 {
-  DECLARE_SUBWINDOW(SampleTransmission);
+  DECLARE_SUBWINDOW(SampleTransmission)
 }
 }
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/StepScan.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/StepScan.cpp
index 1281594d11f4654e9cd96fd8aeaed82e0bfc01ad..9b5df3cf3c275fdc4fe4cd28b84d9f92c3d07016 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/StepScan.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/StepScan.cpp
@@ -21,7 +21,7 @@ namespace CustomInterfaces
 {
 
 //Register the class with the factory
-DECLARE_SUBWINDOW(StepScan);
+DECLARE_SUBWINDOW(StepScan)
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/SlicingAlgorithmDialog.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/SlicingAlgorithmDialog.cpp
index e6d8d87c6c1c37ee8484e845ba9cc91fb9ad052f..61a4e257246bafb4a8b61222f6f709c85e87ca92 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/SlicingAlgorithmDialog.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/SlicingAlgorithmDialog.cpp
@@ -16,8 +16,8 @@ namespace MantidQt
 {
   namespace MantidWidgets
   {
-    DECLARE_DIALOG(SliceMDDialog);
-    DECLARE_DIALOG(BinMDDialog);
+    DECLARE_DIALOG(SliceMDDialog)
+    DECLARE_DIALOG(BinMDDialog)
 
     /**
     Constructor
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/PeaksFilter/vtkPeaksFilter.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/PeaksFilter/vtkPeaksFilter.cxx
index fdf20fa28303c06777aa95d603caa228a2fe86c2..27c35049f11bf54af934caaf89ea9be38599ffe0 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/PeaksFilter/vtkPeaksFilter.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/PeaksFilter/vtkPeaksFilter.cxx
@@ -17,7 +17,7 @@
 #include <vtkUnstructuredGrid.h>
 #include <vtkFieldData.h>
 
-vtkStandardNewMacro(vtkPeaksFilter);
+vtkStandardNewMacro(vtkPeaksFilter)
 
 using namespace Mantid::VATES;
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/vtkScaleWorkspace.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/vtkScaleWorkspace.cxx
index a9eef434d14e69bd0b5fcc06b8478c280001e375..e9b15021d609133cb6f51eed9b88836e0b8f1f2e 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/vtkScaleWorkspace.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/vtkScaleWorkspace.cxx
@@ -11,7 +11,7 @@
 #include <vtkUnstructuredGridAlgorithm.h>
 #include <vtkUnstructuredGrid.h>
 
-vtkStandardNewMacro(vtkScaleWorkspace);
+vtkStandardNewMacro(vtkScaleWorkspace)
 
 using namespace Mantid::VATES;
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx
index b2266585c5321043191545e8756e02c042dd8248..7a60a3852bef3d1482bc4c830864cd7eaeed2067 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx
@@ -20,7 +20,7 @@
 using namespace Mantid::API;
 using namespace Mantid::VATES;
 
-vtkStandardNewMacro(vtkSplatterPlot);
+vtkStandardNewMacro(vtkSplatterPlot)
 
 /// Constructor
 vtkSplatterPlot::vtkSplatterPlot() : m_numberPoints(0), m_topPercentile(0.0),
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
index db709eb1240a81744f9e13d7a00c7cca69809f17..6edd4d02dad28f5390c1fa7bae58800858712a37 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
@@ -18,7 +18,7 @@
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
 
-vtkStandardNewMacro(vtkEventNexusReader);
+vtkStandardNewMacro(vtkEventNexusReader)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
index 6cd9ab74d996765a44ca49bfc67c53c13d2e8513..880b277761c1022eef60995f53879fa5a5713ca4 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
@@ -21,7 +21,7 @@
 
 #include <QtDebug>
 
-vtkStandardNewMacro(vtkMDEWNexusReader);
+vtkStandardNewMacro(vtkMDEWNexusReader)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx
index 95f90f535cc83a342a0d2a09ad7ee5b7ab38389a..834965eb2c5cff7b5ce314d5c66311dabffc5e7a 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx
@@ -19,7 +19,7 @@
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
 
-vtkStandardNewMacro(vtkMDHWNexusReader);
+vtkStandardNewMacro(vtkMDHWNexusReader)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.cxx
index d04f458bb6ed8791f5eb29b5d2244037b599bd09..7e228505d0867c284eb3bfa61c8fe381d01bbcad 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.cxx
@@ -23,7 +23,7 @@
 #include <nexus/NeXusException.hpp>
 #include <boost/algorithm/string.hpp>    
 
-vtkStandardNewMacro(vtkNexusPeaksReader);
+vtkStandardNewMacro(vtkNexusPeaksReader)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx
index a63fce33d42a2124a35b59f0e88f75f36fec9fa2..70a227c7af43491c669f37378ce6624c80fb58ab 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx
@@ -22,7 +22,7 @@
 
 #include <boost/algorithm/string.hpp>    
 
-vtkStandardNewMacro(vtkPeaksReader);
+vtkStandardNewMacro(vtkPeaksReader)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
index d964c50c2d613f66fe9e4f17c8ea86ee59b43b1e..ef61e72c3cc659df3fb6115e1038ea11706e8c30 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
@@ -19,7 +19,7 @@
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
 
-vtkStandardNewMacro(vtkSQWEventReader);
+vtkStandardNewMacro(vtkSQWEventReader)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
index 12fc54a626e157a8dae75ade5443cd399ee3a8c9..196dd73e69c89ad37b7fcd5e524f70af033017e5 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
@@ -19,7 +19,7 @@
 
 using namespace Mantid::VATES;
 
-vtkStandardNewMacro(vtkMDEWSource);
+vtkStandardNewMacro(vtkMDEWSource)
 
 /// Constructor
 vtkMDEWSource::vtkMDEWSource() :  m_wsName(""), m_depth(1000), m_time(0), m_presenter(NULL), m_isStartup(true), m_startupTimeValue(0)
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
index 26ed4e7eba59c5dda0e41098d7c1e493341cdc8c..e2757e29cacbdf39746273ce58366e5dac853dd3 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
@@ -19,7 +19,7 @@
 
 using namespace Mantid::VATES;
 
-vtkStandardNewMacro(vtkMDHWSource);
+vtkStandardNewMacro(vtkMDHWSource)
 
 /// Constructor
 vtkMDHWSource::vtkMDHWSource() :  m_wsName(""), m_time(0), m_presenter(NULL)
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.cxx
index 6709e928e1f7d89a664fcd38c5d23855e48532d3..e3ff1ab962be5ecd64eb83c51ebccf2f687db319 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.cxx
@@ -16,7 +16,7 @@
 #include "MantidAPI/AnalysisDataService.h"
 
 
-vtkStandardNewMacro(vtkPeaksSource);
+vtkStandardNewMacro(vtkPeaksSource)
 
 using namespace Mantid::VATES;
 using Mantid::Geometry::IMDDimension_sptr;
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/SinglePeakMarkerSource/vtkSinglePeakMarkerSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/SinglePeakMarkerSource/vtkSinglePeakMarkerSource.cxx
index e8da4f13ecdcf8869f319cf583371ae80f0a18db..d607310440f8b68c6fcdb0e63170f4530c0dddbc 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/SinglePeakMarkerSource/vtkSinglePeakMarkerSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/SinglePeakMarkerSource/vtkSinglePeakMarkerSource.cxx
@@ -6,7 +6,7 @@
 
 #include "MantidVatesAPI/vtkSinglePeakMarker.h"
 
-vtkStandardNewMacro(vtkSinglePeakMarkerSource);
+vtkStandardNewMacro(vtkSinglePeakMarkerSource)
 
 using namespace Mantid::VATES;
 
diff --git a/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp b/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp
index 29c450db97fe41320a5d3389771d92186f41742e..4bc43553b977c210ed5412e656e8d8ad8305dac5 100644
--- a/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp
@@ -66,7 +66,7 @@ namespace Mantid
 {
   namespace VATES
   {
-    DECLARE_FILELOADER_ALGORITHM(LoadVTK);
+    DECLARE_FILELOADER_ALGORITHM(LoadVTK)
 
     /**
      * Return the confidence with with this algorithm can load the file
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/AutoScaleRangeGenerator.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/AutoScaleRangeGenerator.cpp
index b82e74ce8f4de0ea46f8052eb9ab006c0096139f..8bb04709ace7bf305902120620028907daefc127 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/AutoScaleRangeGenerator.cpp
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/AutoScaleRangeGenerator.cpp
@@ -39,7 +39,7 @@ namespace SimpleGui
   {
     //Set the initial log scale state due to the mode
     m_mdSettings.setLastSessionLogScale(getLogScale());
-  };
+  }
 
   /**
    * Gets the log scale for the mode
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/BackgroundRgbProvider.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/BackgroundRgbProvider.cpp
index 7cba3778ed2e1c915e2229ddaf411ea3a1274a5b..59b0757a017629cff5dc453b01656a09b1bf9f23 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/BackgroundRgbProvider.cpp
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/BackgroundRgbProvider.cpp
@@ -29,13 +29,13 @@ namespace Mantid
 
       BackgroundRgbProvider::BackgroundRgbProvider()
       {
-      };
+      }
 
       BackgroundRgbProvider::~BackgroundRgbProvider()
       {
          // Need to record the background color
          update();
-      };
+      }
 
       std::vector<double> BackgroundRgbProvider::getRgb(bool viewSwitched)
       {