From 9fd8d1b1407aee651602e7ba5a32bab2094d8039 Mon Sep 17 00:00:00 2001
From: Harry Jeffery <henry.jeffery@stfc.ac.uk>
Date: Thu, 19 Mar 2015 09:46:31 +0000
Subject: [PATCH] Refs #11400 Fix extra ';' warnings

---
 .../API/inc/MantidAPI/ScriptRepository.h      |  4 +--
 Code/Mantid/Framework/API/src/LinearScale.cpp |  2 +-
 Code/Mantid/Framework/API/src/LogManager.cpp  | 14 ++++----
 .../Framework/API/src/LogarithmScale.cpp      |  2 +-
 .../API/test/CostFunctionFactoryTest.h        |  2 +-
 .../API/test/FuncMinimizerFactoryTest.h       |  2 +-
 .../Framework/API/test/FunctionFactoryTest.h  |  8 ++---
 .../API/test/FunctionParameterDecoratorTest.h |  6 ++--
 .../Framework/API/test/FunctionPropertyTest.h |  2 +-
 .../API/test/ImmutableCompositeFunctionTest.h |  4 +--
 .../Framework/API/test/MatrixWorkspaceTest.h  |  2 +-
 .../API/test/MultiDomainFunctionTest.h        |  2 +-
 .../Algorithms/src/AppendSpectra.cpp          |  4 +--
 .../Algorithms/src/AverageLogData.cpp         |  4 +--
 .../Algorithms/src/CalculateDIFC.cpp          |  4 +--
 .../Algorithms/src/CalculateResolution.cpp    |  6 ++--
 .../Algorithms/src/CalculateSlits.cpp         |  6 ++--
 .../Algorithms/src/ChangeLogTime.cpp          |  2 +-
 .../src/ClearInstrumentParameters.cpp         |  4 +--
 .../Algorithms/src/ClearMaskFlag.cpp          |  4 +--
 .../Algorithms/src/ConvertAxesToRealSpace.cpp |  4 +--
 .../Algorithms/src/ConvertEmptyToTof.cpp      |  4 +--
 .../Algorithms/src/ConvertToHistogram.cpp     |  2 +-
 .../Algorithms/src/ConvertToPointData.cpp     |  2 +-
 .../Framework/Algorithms/src/CopyLogs.cpp     |  4 +--
 .../src/CreateFlatEventWorkspace.cpp          |  4 +--
 .../Algorithms/src/CreateSampleWorkspace.cpp  |  4 +--
 .../src/CreateTransmissionWorkspace.cpp       |  4 +--
 .../Algorithms/src/DeleteWorkspace.cpp        |  2 +-
 .../Algorithms/src/DetectorDiagnostic.cpp     |  2 +-
 .../src/DetectorEfficiencyCorUser.cpp         |  4 +--
 .../Algorithms/src/FilterByXValue.cpp         |  4 +--
 .../Algorithms/src/GroupWorkspaces.cpp        |  2 +-
 .../Algorithms/src/IntegrateByComponent.cpp   |  4 +--
 .../Algorithms/src/LorentzCorrection.cpp      |  4 +--
 .../Algorithms/src/MedianDetectorTest.cpp     |  2 +-
 .../Algorithms/src/ModeratorTzero.cpp         |  2 +-
 .../Algorithms/src/MuonGroupDetectors.cpp     |  4 +--
 .../Algorithms/src/NormaliseByDetector.cpp    |  6 ++--
 .../Mantid/Framework/Algorithms/src/Pause.cpp |  4 +--
 .../Algorithms/src/PerformIndexOperations.cpp |  4 +--
 .../Algorithms/src/PolarizationCorrection.cpp |  4 +--
 .../Algorithms/src/RebinByPulseTimes.cpp      |  4 +--
 .../Algorithms/src/RebinByTimeAtSample.cpp    |  2 +-
 .../src/ReflectometryReductionOne.cpp         |  4 +--
 .../src/ReflectometryReductionOneAuto.cpp     |  6 ++--
 .../Algorithms/src/RemoveBackground.cpp       |  2 +-
 .../Algorithms/src/RemoveWorkspaceHistory.cpp |  6 ++--
 .../src/ResizeRectangularDetector.cpp         |  4 +--
 .../Framework/Algorithms/src/RingProfile.cpp  |  4 +--
 .../Framework/Algorithms/src/SassenaFFT.cpp   |  2 +-
 .../Algorithms/src/SetInstrumentParameter.cpp |  4 +--
 .../Algorithms/src/SignalOverError.cpp        |  4 +--
 .../src/SpecularReflectionCalculateTheta.cpp  |  4 +--
 .../src/SpecularReflectionPositionCorrect.cpp |  4 +--
 .../Algorithms/src/SumEventsByLogValue.cpp    |  2 +-
 .../Algorithms/src/UpdateScriptRepository.cpp |  4 +--
 .../src/WeightedMeanOfWorkspace.cpp           |  4 +--
 .../Algorithms/src/WeightingStrategy.cpp      |  4 +--
 .../Framework/Algorithms/src/WienerSmooth.cpp |  4 +--
 .../Framework/Crystal/src/AddPeakHKL.cpp      |  4 +--
 .../Crystal/src/CalculatePeaksHKL.cpp         |  4 +--
 Code/Mantid/Framework/Crystal/src/ClearUB.cpp |  4 +--
 .../Crystal/src/CombinePeaksWorkspaces.cpp    |  4 +--
 .../Crystal/src/DiffPeaksWorkspaces.cpp       |  4 +--
 .../Framework/Crystal/src/FilterPeaks.cpp     |  4 +--
 .../Crystal/src/FindClusterFaces.cpp          |  4 +--
 Code/Mantid/Framework/Crystal/src/HasUB.cpp   |  4 +--
 .../Crystal/src/IntegratePeaksHybrid.cpp      |  4 +--
 .../src/IntegratePeaksUsingClusters.cpp       |  4 +--
 .../Framework/Crystal/src/LoadIsawPeaks.cpp   |  2 +-
 .../Crystal/src/PeakIntensityVsRadius.cpp     |  4 +--
 .../Framework/Crystal/src/PeaksInRegion.cpp   |  4 +--
 .../Framework/Crystal/src/PeaksOnSurface.cpp  |  4 +--
 .../Crystal/src/SetSpecialCoordinates.cpp     |  4 +--
 .../Crystal/src/SortPeaksWorkspace.cpp        |  4 +--
 .../src/CalculateGammaBackground.cpp          |  2 +-
 .../Framework/CurveFitting/src/Chebyshev.cpp  |  2 +-
 .../CurveFitting/src/ComptonPeakProfile.cpp   |  2 +-
 .../src/ComptonScatteringCountRate.cpp        |  2 +-
 .../CurveFitting/src/ConvertToYSpace.cpp      |  2 +-
 .../CurveFitting/src/CubicSpline.cpp          |  2 +-
 .../src/DiffRotDiscreteCircle.cpp             |  6 ++--
 .../Framework/CurveFitting/src/DiffSphere.cpp |  6 ++--
 .../CurveFitting/src/EstimatePeakErrors.cpp   |  2 +-
 .../src/GaussianComptonProfile.cpp            |  2 +-
 .../src/GramCharlierComptonProfile.cpp        |  2 +-
 .../CurveFitting/src/IkedaCarpenterPV.cpp     | 10 +++---
 .../Framework/CurveFitting/src/Lorentzian.cpp |  2 +-
 .../CurveFitting/src/PseudoVoigt.cpp          |  2 +-
 .../CurveFitting/src/SplineInterpolation.cpp  |  2 +-
 .../CurveFitting/src/SplineSmoothing.cpp      |  6 ++--
 .../CurveFitting/src/VesuvioResolution.cpp    |  2 +-
 .../Framework/CurveFitting/src/Voigt.cpp      |  2 +-
 .../CurveFitting/test/CompositeFunctionTest.h |  4 +--
 .../CurveFitting/test/ConvolutionTest.h       |  6 ++--
 .../test/FunctionFactoryConstraintTest.h      |  8 ++---
 .../test/FunctionParameterDecoratorFitTest.h  |  2 +-
 .../CurveFitting/test/GaussianTest.h          |  2 +-
 .../CurveFitting/test/ProductFunctionTest.h   |  4 +--
 .../CurveFitting/test/ResolutionTest.h        |  2 +-
 .../DataHandling/src/CreateChopperModel.cpp   |  6 ++--
 .../src/CreateChunkingFromInstrument.cpp      |  4 +--
 .../DataHandling/src/CreateModeratorModel.cpp |  4 +--
 .../src/CreateSimulationWorkspace.cpp         |  6 ++--
 .../DataHandling/src/DeleteTableRows.cpp      |  2 +-
 .../src/ExtractMonitorWorkspace.cpp           |  4 +--
 .../DataHandling/src/FindDetectorsPar.cpp     |  4 +--
 .../DataHandling/src/ISISDataArchive.cpp      |  2 +-
 .../Framework/DataHandling/src/Load.cpp       |  2 +-
 .../Framework/DataHandling/src/LoadAscii.cpp  |  2 +-
 .../Framework/DataHandling/src/LoadAscii2.cpp |  2 +-
 .../Framework/DataHandling/src/LoadBBY.cpp    |  2 +-
 .../DataHandling/src/LoadCanSAS1D.cpp         |  2 +-
 .../DataHandling/src/LoadCanSAS1D2.cpp        |  2 +-
 .../DataHandling/src/LoadDaveGrp.cpp          |  2 +-
 .../DataHandling/src/LoadEventPreNexus.cpp    |  2 +-
 .../Framework/DataHandling/src/LoadFITS.cpp   |  2 +-
 .../Framework/DataHandling/src/LoadILL.cpp    |  2 +-
 .../DataHandling/src/LoadILLIndirect.cpp      |  6 ++--
 .../DataHandling/src/LoadILLReflectometry.cpp |  6 ++--
 .../DataHandling/src/LoadILLSANS.cpp          |  4 +--
 .../DataHandling/src/LoadISISNexus2.cpp       |  2 +-
 .../Framework/DataHandling/src/LoadLLB.cpp    |  6 ++--
 .../Framework/DataHandling/src/LoadMcStas.cpp |  6 ++--
 .../DataHandling/src/LoadMcStasNexus.cpp      |  6 ++--
 .../DataHandling/src/LoadMuonNexus1.cpp       |  2 +-
 .../DataHandling/src/LoadMuonNexus2.cpp       |  2 +-
 .../Framework/DataHandling/src/LoadNXSPE.cpp  |  2 +-
 .../DataHandling/src/LoadNexusProcessed.cpp   |  2 +-
 .../DataHandling/src/LoadPDFgetNFile.cpp      |  2 +-
 .../DataHandling/src/LoadPreNexus.cpp         |  2 +-
 .../Framework/DataHandling/src/LoadQKK.cpp    |  2 +-
 .../Framework/DataHandling/src/LoadRKH.cpp    |  2 +-
 .../Framework/DataHandling/src/LoadRaw3.cpp   |  2 +-
 .../DataHandling/src/LoadReflTBL.cpp          |  2 +-
 .../DataHandling/src/LoadSINQFocus.cpp        |  6 ++--
 .../DataHandling/src/LoadSNSspec.cpp          |  2 +-
 .../Framework/DataHandling/src/LoadSPE.cpp    |  2 +-
 .../DataHandling/src/LoadSassena.cpp          |  2 +-
 .../DataHandling/src/LoadSavuTomoConfig.cpp   |  2 +-
 .../DataHandling/src/LoadSpice2D.cpp          |  2 +-
 .../DataHandling/src/LoadTOFRawNexus.cpp      |  2 +-
 .../DataHandling/src/NexusTester.cpp          |  4 +--
 .../src/PDLoadCharacterizations.cpp           |  4 +--
 .../DataHandling/src/SNSDataArchive.cpp       |  2 +-
 .../Framework/DataHandling/src/SavePAR.cpp    |  2 +-
 .../Framework/DataHandling/src/SavePHX.cpp    |  2 +-
 .../DataHandling/src/SaveParameterFile.cpp    |  4 +--
 .../DataHandling/src/SortTableWorkspace.cpp   |  4 +--
 .../inc/MantidDataObjects/VectorColumn.h      |  2 +-
 .../Framework/DataObjects/src/PeakColumn.cpp  |  2 +-
 .../DataObjects/src/PeaksWorkspace.cpp        |  2 +-
 .../DataObjects/src/TableWorkspace.cpp        |  2 +-
 .../src/Crystal/SymmetryElementFactory.cpp    | 10 +++---
 .../ISISLiveData/src/FakeISISEventDAE.cpp     |  2 +-
 .../Kernel/inc/MantidKernel/ChecksumHelper.h  |  2 +-
 .../inc/MantidKernel/PropertyWithValue.h      |  8 ++---
 .../Kernel/src/FilteredTimeSeriesProperty.cpp | 20 +++++------
 .../Framework/Kernel/src/IPropertyManager.cpp | 34 +++++++++----------
 .../Framework/Kernel/src/MatrixProperty.cpp   |  6 ++--
 .../Kernel/src/PropertyWithValue.cpp          | 20 +++++------
 .../Framework/Kernel/src/Statistics.cpp       | 16 ++++-----
 .../Kernel/src/TimeSeriesProperty.cpp         | 20 +++++------
 Code/Mantid/Framework/Kernel/src/Unit.cpp     |  4 +--
 .../Kernel/test/TypedValidatorTest.h          |  6 ++--
 .../LiveData/src/MonitorLiveData.cpp          |  4 +--
 .../LiveData/src/SNSLiveEventDataListener.cpp |  2 +-
 .../Framework/LiveData/src/StartLiveData.cpp  |  4 +--
 .../Framework/MDAlgorithms/src/AndMD.cpp      |  4 +--
 .../MDAlgorithms/src/BinaryOperationMD.cpp    |  4 +--
 .../src/BooleanBinaryOperationMD.cpp          |  4 +--
 .../MDAlgorithms/src/CalculateCoverageDGS.cpp |  4 +--
 .../MDAlgorithms/src/CompareMDWorkspaces.cpp  |  4 +--
 .../src/ConvertToDetectorFaceMD.cpp           |  4 +--
 .../src/ConvertToMDMinMaxGlobal.cpp           |  4 +--
 .../src/CreateMDHistoWorkspace.cpp            |  4 +--
 .../Framework/MDAlgorithms/src/DivideMD.cpp   |  4 +--
 .../Framework/MDAlgorithms/src/EqualToMD.cpp  |  4 +--
 .../MDAlgorithms/src/EvaluateMDFunction.cpp   |  4 +--
 .../MDAlgorithms/src/ExponentialMD.cpp        |  4 +--
 .../MDAlgorithms/src/GreaterThanMD.cpp        |  4 +--
 .../MDAlgorithms/src/IntegrateFlux.cpp        |  4 +--
 .../Framework/MDAlgorithms/src/LessThanMD.cpp |  4 +--
 .../MDAlgorithms/src/LoadILLAscii.cpp         |  4 +--
 .../Framework/MDAlgorithms/src/LoadMD.cpp     |  2 +-
 .../Framework/MDAlgorithms/src/LoadSQW.cpp    |  2 +-
 .../MDAlgorithms/src/LogarithmMD.cpp          |  4 +--
 .../Framework/MDAlgorithms/src/MaskMD.cpp     |  4 +--
 .../Framework/MDAlgorithms/src/MergeMD.cpp    |  4 +--
 .../Framework/MDAlgorithms/src/MinusMD.cpp    |  4 +--
 .../Framework/MDAlgorithms/src/MultiplyMD.cpp |  4 +--
 .../Framework/MDAlgorithms/src/NotMD.cpp      |  4 +--
 .../Framework/MDAlgorithms/src/OrMD.cpp       |  4 +--
 .../Framework/MDAlgorithms/src/PowerMD.cpp    |  4 +--
 .../src/PreprocessDetectorsToMD.cpp           |  2 +-
 .../FitResolutionConvolvedModel.cpp           |  2 +-
 .../Quantification/Models/MullerAnsatz.cpp    |  2 +-
 .../src/Quantification/Models/QCoordinate.cpp |  2 +-
 .../Quantification/Models/Strontium122.cpp    |  2 +-
 .../Resolution/TobyFitResolutionModel.cpp     |  2 +-
 .../ResolutionConvolvedCrossSection.cpp       |  2 +-
 .../SimulateResolutionConvolvedModel.cpp      |  2 +-
 .../Framework/MDAlgorithms/src/SaveZODS.cpp   |  4 +--
 .../MDAlgorithms/src/SetMDUsingMask.cpp       |  4 +--
 .../MDAlgorithms/src/ThresholdMD.cpp          |  4 +--
 .../MDAlgorithms/src/TransformMD.cpp          |  4 +--
 .../MDAlgorithms/src/UnaryOperationMD.cpp     |  4 +--
 .../Framework/MDAlgorithms/src/XorMD.cpp      |  4 +--
 .../MantidMDEvents/CoordTransformAligned.h    |  6 ++--
 .../MantidMDEvents/CoordTransformDistance.h   |  4 +--
 .../Framework/MDEvents/src/ConvToMDBase.cpp   |  2 +-
 .../MDEvents/src/ConvertToReflectometryQ.cpp  |  4 +--
 Code/Mantid/Framework/MDEvents/src/FitMD.cpp  |  2 +-
 .../MDEvents/src/ImportMDEventWorkspace.cpp   |  4 +--
 .../MDEvents/src/ImportMDHistoWorkspace.cpp   |  4 +--
 Code/Mantid/Framework/MDEvents/src/MDBox.cpp  |  4 +--
 .../Framework/MDEvents/src/MDTransfModQ.cpp   |  2 +-
 .../Framework/MDEvents/src/MDTransfNoQ.cpp    |  4 +--
 .../Framework/MDEvents/src/MDTransfQ3D.cpp    |  2 +-
 .../MDEvents/src/MDWSDescription.cpp          |  2 +-
 .../MDEvents/src/UnitsConversionHelper.cpp    |  2 +-
 .../Framework/MDEvents/src/UserFunctionMD.cpp |  2 +-
 .../mantid/api/src/Exports/Algorithm.cpp      |  6 ++--
 .../api/src/Exports/AlgorithmFactory.cpp      |  2 +-
 .../api/src/Exports/AlgorithmManager.cpp      |  4 +--
 .../mantid/api/src/Exports/Axis.cpp           |  2 +-
 .../mantid/api/src/Exports/ExperimentInfo.cpp |  2 +-
 .../mantid/api/src/Exports/IFunction.cpp      |  4 +--
 .../mantid/api/src/Exports/Workspace.cpp      |  2 +-
 .../api/src/Exports/WorkspaceFactory.cpp      |  6 ++--
 .../mantid/geometry/src/Exports/Component.cpp | 18 +++++-----
 .../geometry/src/Exports/Goniometer.cpp       |  2 +-
 .../kernel/src/Converters/CloneToNumpy.cpp    | 18 +++++-----
 .../kernel/src/Converters/NDArrayToVector.cpp | 18 +++++-----
 .../src/Converters/NDArrayTypeIndex.cpp       | 18 +++++-----
 .../kernel/src/Converters/WrapWithNumpy.cpp   | 16 ++++-----
 .../kernel/src/Exports/ConfigService.cpp      |  4 +--
 .../mantid/kernel/src/Exports/Statistics.cpp  | 10 +++---
 .../kernel/src/Exports/TimeSeriesProperty.cpp |  1 -
 .../src/Registry/SequenceTypeHandler.cpp      | 18 +++++-----
 .../WorkspaceCreationHelperModule.cpp         |  6 ++--
 .../ScriptRepositoryImpl.h                    |  4 +--
 .../src/ScriptRepositoryImpl.cpp              |  2 +-
 .../TestHelpers/src/ScopedFileHelper.cpp      |  4 +--
 .../src/DgsAbsoluteUnitsReduction.cpp         |  4 +--
 .../src/DgsConvertToEnergyTransfer.cpp        |  4 +--
 .../WorkflowAlgorithms/src/DgsDiagnose.cpp    |  4 +--
 .../src/DgsPreprocessData.cpp                 |  4 +--
 .../WorkflowAlgorithms/src/DgsReduction.cpp   |  4 +--
 .../WorkflowAlgorithms/src/DgsRemap.cpp       |  4 +--
 .../src/MuonCalculateAsymmetry.cpp            |  4 +--
 .../WorkflowAlgorithms/src/MuonLoad.cpp       |  4 +--
 .../WorkflowAlgorithms/src/StepScan.cpp       |  4 +--
 Code/Mantid/MantidPlot/src/ExpDecayDialog.cpp |  4 +--
 Code/Mantid/MantidPlot/src/FFTDialog.cpp      |  6 ++--
 Code/Mantid/MantidPlot/src/FilterDialog.cpp   |  2 +-
 Code/Mantid/MantidPlot/src/FitDialog.cpp      |  4 +--
 Code/Mantid/MantidPlot/src/Graph.h            |  2 +-
 .../MantidPlot/src/InterpolationDialog.cpp    |  4 +--
 .../InstrumentWidget/InstrumentTreeWidget.cpp |  2 +-
 .../Mantid/MantidPlot/src/Mantid/MantidUI.cpp |  2 +-
 Code/Mantid/MantidPlot/src/MdiSubWindow.cpp   |  2 +-
 Code/Mantid/MantidPlot/src/MultiLayer.h       |  2 +-
 Code/Mantid/MantidPlot/src/Plot3DDialog.cpp   |  2 +-
 .../MantidPlot/src/PolynomFitDialog.cpp       |  4 +--
 .../MantidQt/API/inc/MantidQtAPI/Message.h    |  2 +-
 .../MantidQt/API/inc/MantidQtAPI/RepoModel.h  |  4 +--
 Code/Mantid/MantidQt/API/src/MdConstants.cpp  |  4 +--
 .../MantidQt/API/src/PropertyWidget.cpp       |  2 +-
 Code/Mantid/MantidQt/API/src/RepoModel.cpp    | 16 ++++-----
 .../MantidQt/API/src/ScriptRepositoryView.cpp |  2 +-
 .../src/CatalogPublishDialog.cpp              |  2 +-
 .../ConvertTableToMatrixWorkspaceDialog.cpp   |  2 +-
 .../src/CreateSampleShapeDialog.cpp           |  2 +-
 .../MantidQt/CustomDialogs/src/FitDialog.cpp  |  2 +-
 .../src/LOQScriptInputDialog.cpp              |  2 +-
 .../MantidQt/CustomDialogs/src/LoadDialog.cpp |  2 +-
 .../src/LoadInstrumentDialog.cpp              |  2 +-
 .../src/SortTableWorkspaceDialog.cpp          |  2 +-
 .../CustomDialogs/src/StartLiveDataDialog.cpp |  2 +-
 .../CustomInterfaces/src/DataComparison.cpp   |  2 +-
 .../src/DirectConvertToEnergy.cpp             |  2 +-
 .../src/Indirect/IndirectBayes.cpp            |  2 +-
 .../src/Indirect/IndirectDataAnalysis.cpp     |  2 +-
 .../src/Indirect/IndirectDataReduction.cpp    |  2 +-
 .../Indirect/IndirectDiffractionReduction.cpp |  2 +-
 .../src/Indirect/IndirectSimulation.cpp       |  2 +-
 .../src/Indirect/IndirectTools.cpp            |  2 +-
 .../CustomInterfaces/src/MantidEV.cpp         |  2 +-
 .../CustomInterfaces/src/MultiDatasetFit.cpp  |  2 +-
 .../src/Muon/ALCInterface.cpp                 |  2 +-
 .../src/Muon/MuonAnalysis.cpp                 |  2 +-
 .../CustomInterfaces/src/QtReflMainView.cpp   |  2 +-
 .../CustomInterfaces/src/SANSRunWindow.cpp    |  2 +-
 .../src/SampleTransmission.cpp                |  2 +-
 .../CustomInterfaces/src/StepScan.cpp         |  2 +-
 .../src/SlicingAlgorithmDialog.cpp            |  4 +--
 .../PeaksFilter/vtkPeaksFilter.cxx            |  2 +-
 .../ScaleWorkspace/vtkScaleWorkspace.cxx      |  2 +-
 .../SplatterPlot/vtkSplatterPlot.cxx          |  2 +-
 .../EventNexusReader/vtkEventNexusReader.cxx  |  2 +-
 .../MDEWNexusReader/vtkMDEWNexusReader.cxx    |  2 +-
 .../MDHWNexusReader/vtkMDHWNexusReader.cxx    |  2 +-
 .../NexusPeaksReader/vtkNexusPeaksReader.cxx  |  2 +-
 .../PeaksReader/vtkPeaksReader.cxx            |  2 +-
 .../SQWEventReader/vtkSQWEventReader.cxx      |  2 +-
 .../MDEWSource/vtkMDEWSource.cxx              |  2 +-
 .../MDHWSource/vtkMDHWSource.cxx              |  2 +-
 .../PeaksSource/vtkPeaksSource.cxx            |  2 +-
 .../vtkSinglePeakMarkerSource.cxx             |  2 +-
 Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp    |  2 +-
 .../src/AutoScaleRangeGenerator.cpp           |  2 +-
 .../ViewWidgets/src/BackgroundRgbProvider.cpp |  4 +--
 314 files changed, 614 insertions(+), 615 deletions(-)

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
index b528bdb6e70..9e5b8ba6b7f 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 14d1ff6820d..4d11c0fb962 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 572043d9303..ae405738634 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 1ecb35a5d53..1e4abfdd83c 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 c0c567cc8b2..d54b9807c85 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 640b7345c48..2cef42deca3 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 0654f99aca5..131988e174f 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 4cea527b1a5..3a02a1c8138 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 ee488c5a7cd..4618e0e2c89 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 cf4287e72d7..b3299c9b356 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 38aedd75341..d3dbf138901 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 adf7b610d24..4e7b1870ec6 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 6567ccf080c..7c37d7c6e2c 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 40fa96ee2e9..7430a5f108b 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 a77fb56a196..8b7b1fcbf15 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 51eac3c536b..a0a89809664 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 7808595add8..b3e4872292c 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 8663e0a329e..a42d58d7676 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 74fc77c9e1d..04c3f06953c 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 71b53a9b1d9..ba16cd12b7f 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 6ef693883bb..0305cd92847 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 28bbd9076ec..144171a08a4 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 3b87dc49dbe..37acbb1439e 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 ccc2e8ac79b..739ca37a910 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 f7aadd28a09..c250b707784 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 f2dc26c177f..525c556bfca 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 0b665c471eb..0c08dda844c 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 ac913604c97..2b7b6da1227 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 329b737da19..7cb53d9b5af 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 2b6ab8e2618..35dafe442d1 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 4c92103f327..559a747688b 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 a73f536d6ed..29a8be14083 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 fd55a82efa0..110b07a9e15 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 f5e1a98e61b..3736939ef44 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 0100a0000ef..2d42cd4b7cc 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 db2e7c678a2..a6798977247 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 36224d81a0e..c7a22c2a163 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 b1d711f7e20..105188cee04 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 3c4cfc0867c..97e2ee6a72e 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 007f5e10f8d..170559caff2 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 3a8fb0f7dd7..a3d760f3e67 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 b2a1760dd6f..4a9ef9b303a 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 2bbe560658f..fce9355eb4d 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 c7d3f0491c9..ff2234d2fec 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 ab6ebf78f1a..dfb1a293219 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 f29229096e2..884848559d9 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 706570edca1..8601d1e2c38 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 8d30c4fa14d..4d6ecc74b7c 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 bb719da6425..d5c40de7a07 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 b558c1a8584..21be96faae1 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 c51071190ef..bd0e048fd71 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 487d9566591..e06d9b1f72e 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 2354d0369c3..9d36340512c 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 917f3aa741e..ac7c575361f 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 b69a6128a5e..3497a23d437 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 7829bd0452a..48f47cff4a6 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 b56a1c0be37..45e620542ce 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 baf8f509414..4703eb91d2f 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 f09fd1e6658..17af7d37ded 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 e4baaba6d2b..f8762cd5a56 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 78c563d096e..2e770043c2b 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 46cac8737cd..10dc1653c94 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 fdcefa2a893..54f27de7e26 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 f59b28b0a0a..e4e518348f7 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 00a3cb839e6..34337d74f91 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 efecf7a037a..86ff9a78ccc 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 fe9266df134..2332de05184 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 fcc9477ff9f..2bf028caa4c 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 83c00772d38..c7d2f6fd8ed 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 84843b0b2b3..5b6aeeb7677 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 1e4e7a331a1..9612ce7b263 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 53ccf36f905..e1381d541da 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 b8b112cb7a4..dc590f5b4c6 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 f0dded52a84..3bd6da8e03f 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 784d7244d52..61ecc88afb9 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 d9422413e6c..2045ca8d73f 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 6e1ab71224a..d4dfeb2503d 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 eb033059438..7da4e1d0b88 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 45de6859785..92328afbcff 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 7bb7dd9b2a5..c0862428093 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 456d7355884..5cb55c3d2aa 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 893e0f59420..6b0d2815989 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 1c2042fbdee..0ba4b041a6f 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 aafd90d88c5..32f8f1c44ce 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 b2d70ca84b5..a57f7e2cfd2 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 f1600c26fc8..b77daafba10 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 c6a64b0fbb4..fe20a841b14 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 e9d8a908511..527a9c39698 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 7791d92f6ea..8d58c9a3915 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 585d1d6eb8b..a492df6add6 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 266f44f7e91..d476c8013e8 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 0d1f3d560a0..cd8f927f1b6 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 d13a8297536..fac486c744a 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 fd520534558..9e006da4d31 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 ec353f5b2a6..678334f2bd1 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 afc285cfb1c..c548fc16127 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 af5617975a9..16b1c76cc47 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 47cc259f355..592a90b7305 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 40a9a43251b..dcbddf65af1 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 3232dc248cb..22833a6a4bf 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 ea03a3aa012..e4df7ce1a5c 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 b3284c6ee7f..48274f1aa5f 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 d19f7f04c25..49ef716f071 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 a1f51bbddd7..d2008b1d47e 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 3652a1d48ce..512b02efd72 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 84502532b0a..3a9b1c3bbb4 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 ca9a49e80fe..3461ebea7d9 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 a0babedbc04..0a01cab4a09 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 df3faa501c6..4e5f2d69d3f 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 9ca1b7ac270..cc23bd0ae14 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 6beb06f3fbf..747bd5422b9 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 37dc4a4e643..3d603570fc4 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 6794b27e119..daddef4a35d 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 1d07a5bb752..b3066362340 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 7dff9888a52..378569dbbbb 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 8ceabc67d96..45ddef1b6dc 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 d8d0ab699c6..6fa76790f67 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 5d21f759abc..86df82bf489 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 783927212fd..0f84c252a6f 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 8309a686e68..37e810ffae2 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 331795f61c3..739c5f9a6f6 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 6c3b96b5807..b29c361ef19 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 ca7d7a0dcf2..61cb6b4339f 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 b6fa8df3d96..ab280168840 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 027c60f08be..26c18005d88 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 ca5c88515d9..b9d6986d76d 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 7a71f4f24f5..6f59be7278a 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 d3876404a28..a885a97ada6 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 5c5b4dc6416..e9da8a302a8 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 ffbfaac2167..21f97ef9eb2 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 a0f89f59619..108723a73f5 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 55090665c09..4d076651853 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 cee4c47b1cd..859b592c087 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 453b4745c08..6ee8786c72d 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 421add0dc04..9d95242111e 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 bdbd87357b8..31c713233a6 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 482729016aa..c06cdf04b68 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 a1c3ffd90e6..bbef0ccaf55 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 25e3b4c72b7..004b48b0a2b 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 e1f23f9bd4b..2f749d8a078 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 172ca4b47c5..50184d1d4ea 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 1d8a877675e..49b271ef922 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 549ddc74278..d477812c624 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 19657640086..2f1ed8f0471 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 8e73ca0e825..34b98ec08a1 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 2ecc8bd1680..ca088cab0fa 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 8d2ff9739bf..d318f94f549 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 ecb428de9af..7c221896f8b 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 9bee776e07f..931538cbb94 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 98b38f0fe8e..6909250252c 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 72c1e503135..54952d823c7 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 b844cf39687..b3d7e129cc9 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 4259cce7f86..890e3e1e447 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 138856ae152..d2eac126779 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 40b6ba8c633..cdf42076ca5 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 6d5a6fa75c9..c699dfb9411 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 5a4f70794fe..54a6b5fcf22 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 85f67ac066d..bd55cf9b501 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 07d01c24be0..52a8e817ddb 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 0d1730b581d..36961d43915 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 3ff63a07bf7..ddd680bdac9 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 e087f25a23f..038a26cc359 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 9af3f0335c5..6a021e75780 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 e129b7010c2..c6057895d5f 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 82e3541bc80..8495405f210 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 79693e0335b..124c4655af4 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 8262af09878..8491c3d349b 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 50b2621e222..b70faa984ea 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 c890cac2ab6..49338ad3a41 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 613414e8bec..4f18cf8d185 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 5868cf52579..c618b3692d4 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 3c000629af7..26d6ce08579 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 82b7e4dabb1..9a435bf5db1 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 e7959d9c9fb..28178f447fa 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 414eb440975..a2adcd804e4 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 b4ccc704bb3..a20bd7ded85 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 6684e1cac42..71f53a68117 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 a471bc0c91f..d5a31cf34ce 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 f53d3f33f7f..32216e09f5f 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 d395663cb7b..10f64648dac 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 50ffffa72ea..7da6298e57a 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 8818bc87c81..f98766cfff7 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 95092d1e84b..1bb592d391f 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 da8b7db1879..ba6e3f654cb 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 ffe7780809d..aff2b3ba119 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 d50f3f3a368..7b7d5eafaad 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 30682a7f2d1..5f2e8770c49 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 e60b1f162ce..2111d83e333 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 8a9110bf339..a9f49837d99 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 c21455165f3..2ab9e507511 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 5b16eb8e592..7985cc9b0eb 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 38dd9296568..5ba0de5c451 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 fbe2573df7e..00757fb06ef 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 2dc5f30133e..1ff0932783e 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 90cdcc44f54..d4e03afa6bc 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 d8cec796d70..f705eaaab27 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 dbe25098514..da845673529 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 2afe41cc2bd..708ae56914c 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 cb3d62350f1..ca3ed919e0a 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 de1d838c465..d613b2059c8 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 cabafe77cd9..3ac60433469 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 031e84db52c..ba9dd517a09 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 e7582e636b6..e9cb4227084 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 1b7ad75e9a5..df0b220d579 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 bb35f8b1048..2363f5970a6 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 217943daffb..bb03a8dfb78 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 20cd8862083..896c29c74d7 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 3d6d07f994e..38862d9c214 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 2a388274f38..c960c27df58 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 cc57d1f8ca3..5dd40ca97fb 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 2c332767cc1..4da70fdac7e 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 2bb6898f1a0..34beee6fd33 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 c8785b26cb2..1c5df9e388a 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 dbb17e2e1f4..64d2ce71eb3 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 778dae5954c..25613ad3894 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 3773fc18023..134a84b5007 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 510d96f65f5..6f4964c01fd 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 c5066f6a2b2..64150e9fa8a 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 ea013bd3239..f8022527aff 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 aacc63c1c09..4b28ee72256 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 10b30e0d713..e0ec2978af5 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 9ef8f0b06ef..8ae92746877 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 7b2eb2d1dd0..bb44a519185 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 71dd4571e32..99e7e215f5d 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 12bfc84afbc..4719f8e9591 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 d44c0a1f606..4296086b4f6 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 0a1e917bd12..4151bcbebf8 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 4f784af07ea..b02c444f40f 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 caa28aea2a0..d43ac0538b7 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 6ec0dcda804..11dd4f9b8bf 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 6ff101d8ddd..e7cc6802b0f 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 406a438bcb3..02856d5765b 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 16bcc7cf7b1..74b37cfebea 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 6213ffb71c9..bc85d3edd85 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 8151c09da2f..759fe6b6e03 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 a1efd28e193..5a7981231fa 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 d353890b416..8b56c8eb7a1 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 762f446435d..45a9d0f8a55 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 8fc7a039ebf..3bfa9244083 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 09343884313..2f9bf530009 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 067aa64fc4d..627bc2d4cd0 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 032de062643..0ae46ae1427 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 64c0750492a..89900eeee1b 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 1f0f1ea8175..a3e8d448ce0 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 e8708decc76..243f36ff137 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 f8cff1c7562..7f146efc89a 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 9b5d8f18600..643c68fa0c2 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 bbb21dc2cd5..85be54fcfc2 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 56bce546f2d..56258b060d0 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 0b8a0820970..f5dc93a0b54 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 5a15d54b267..d4008ae2aa5 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 a508a720150..a70b9f91146 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 9d2771c1ea4..0690f08d3c2 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 616e1df5844..4541b25d6ea 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 98154dc22ff..cd334774930 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 f83ac4f22c9..e6453e17b29 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 6f02ae0d0fe..1e16d247b59 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 27936290bc3..701adfc599b 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 07cab9df684..7480107f3b1 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 4d0ceb1722e..efc62a72028 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 6caf14cffda..a2649437b34 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 2ef4c3335a4..68905abb215 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 3e003d1b593..f0b014fb79a 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 e561a61a0fd..cba7586a9b7 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 f1cab9fe0ed..a231acee361 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 ae9655bcc77..f1e19dc4809 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 0f5c32d37b4..c14f3a1fd7a 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 cd4cd846ea5..f630804187f 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 d07c67b26b2..5eae0915430 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 4b938ef3b94..2af591dd939 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 14e3a8ebbc8..0fd6e88b36b 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 96cd7bcd4f4..5f76e642dc0 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 1cad4d1c3ee..e16e6621686 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 96b80b7c1a1..314e3b9d9e8 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 c0345f3727b..02aa58ba002 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 7b4217a2dc4..d39863b1b77 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 5fdda1e5b18..15280c6c137 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 2f88ee8c897..7c4f993de8d 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 37192b4c299..5716406111d 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 5b2a0dc9088..7a81d7a310d 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 65330a4d7d5..0450d6bd8ea 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 ef9f33f7c4f..240476a9903 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 2220d18b31e..bbb7e3d7124 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 b1c8f32029d..5b804a41d51 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 fccc4b5d9b6..c4e6b705319 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 f167fa71ea6..3bc7f982fb8 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 ec4de290209..9516a1d5016 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 d0e38f7b34a..79454dfac03 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 f1f20f03fe2..12d5730862c 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 12e730113c9..39964eda49a 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 d2f78f8aea2..096dd495cc2 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 cfcce6e7aae..4de693e73db 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 22c2f7fd75a..9e408a5109f 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 7882684398a..11776a19d35 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 1767acd57ef..c1be652ce18 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 c44be8a5c1c..6a95f432c7d 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 1281594d11f..9b5df3cf3c2 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 e6d8d87c6c1..61a4e257246 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 fdf20fa2830..27c35049f11 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 a9eef434d14..e9b15021d60 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 b2266585c53..7a60a3852be 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 db709eb1240..6edd4d02dad 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 6cd9ab74d99..880b277761c 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 95f90f535cc..834965eb2c5 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 d04f458bb6e..7e228505d08 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 a63fce33d42..70a227c7af4 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 d964c50c2d6..ef61e72c3cc 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 12fc54a626e..196dd73e69c 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 26ed4e7eba5..e2757e29cac 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 6709e928e1f..e3ff1ab962b 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 e8da4f13ecd..d607310440f 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 29c450db97f..4bc43553b97 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 b82e74ce8f4..8bb04709ace 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 7cba3778ed2..59b0757a017 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)
       {
-- 
GitLab