Cppcheck fixes

Author: jclarkeSTFC

Framework/API/inc/MantidAPI/MatrixWorkspace.h

@@ -393,7 +393,7 @@ class MANTID_API_DLL MatrixWorkspace : public IMDWorkspace, public ExperimentInf
   /// Returns true if the workspace has common, integer X bins
   virtual bool isIntegerBins() const;
 
-  std::string YUnit() const;
+  const std::string &YUnit() const { return m_YUnit; }
   void setYUnit(const std::string &newUnit);
   std::string YUnitLabel(bool useLatex = false, bool plotAsDistribution = false) const;
   void setYUnitLabel(const std::string &newLabel);

Framework/API/src/MatrixWorkspace.cpp

@@ -1029,9 +1029,6 @@ bool MatrixWorkspace::isCommonLogBins() const {
  */
 size_t MatrixWorkspace::numberOfAxis() const { return m_axes.size(); }
 
-/// Returns the units of the data in the workspace
-std::string MatrixWorkspace::YUnit() const { return m_YUnit; }
-
 /// Sets a new unit for the data (Y axis) in the workspace
 void MatrixWorkspace::setYUnit(const std::string &newUnit) { m_YUnit = newUnit; }
 

Framework/Geometry/src/Objects/CSGObject.cpp

@@ -2122,11 +2122,11 @@ std::shared_ptr<GeometryHandler> CSGObject::getGeometryHandler() const {
 }
 
 std::string CSGObject::getGeometryShape() const {
-  Geometry::detail::ShapeInfo::GeometryShape shape;
+  Geometry::detail::ShapeInfo::GeometryShape geometryShape;
   std::vector<V3D> points;
   double radius, innerRadius, height = 0;
-  m_handler->GetObjectGeom(shape, points, innerRadius, radius, height);
-  switch (shape) {
+  m_handler->GetObjectGeom(geometryShape, points, innerRadius, radius, height);
+  switch (geometryShape) {
   case detail::ShapeInfo::GeometryShape::NOSHAPE:
     return "NOSHAPE";
   case detail::ShapeInfo::GeometryShape::CUBOID:

Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp

@@ -386,7 +386,7 @@ void export_MatrixWorkspace() {
            "Returns ``True`` if this is considered to be binned data.")
       .def("isDistribution", (bool(MatrixWorkspace::*)() const) & MatrixWorkspace::isDistribution, arg("self"),
            "Returns the status of the distribution flag")
-      .def("YUnit", &MatrixWorkspace::YUnit, arg("self"),
+      .def("YUnit", &MatrixWorkspace::YUnit, return_value_policy<copy_const_reference>(), arg("self"),
            "Returns the current Y unit for the data (Y axis) in the workspace")
       .def("YUnitLabel", &MatrixWorkspace::YUnitLabel,
            MatrixWorkspace_YUnitLabelOverloads((arg("self"), arg("useLatex"), arg("plotAsDistribution")),

Framework/PythonInterface/mantid/kernel/src/Exports/V3D.cpp

@@ -133,6 +133,7 @@ void export_V3D() {
       .def("norm", &V3D::norm, arg("self"), "Calculates the length of the vector")
       .def("norm2", &V3D::norm2, arg("self"), "Calculates the squared length of the vector")
       .def("getSpherical", &getSpherical, arg("self"), "Return the vector's position in spherical coordinates")
+      // cppcheck-suppress syntaxError
       .def("__add__", &V3D::operator+, (arg("left"), arg("right")))
       .def("__iadd__", &V3D::operator+=, return_self<>(), (arg("self"), arg("other")))
       .def("__sub__", static_cast<V3D (V3D::*)(const V3D &) const>(&V3D::operator-), (arg("left"), arg("right")))

buildconfig/CMake/CppCheck_Suppressions.txt.in

@@ -421,7 +421,7 @@ shadowFunction:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument.cpp:629
 shadowFunction:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument.cpp:642
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/CompAssembly.cpp:376
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/CompAssembly.cpp:405
-constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/ComponentInfo.cpp:129
+constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Instrument/ComponentInfo.cpp:134
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Rendering/RenderingHelpersOpenGL.cpp:204
 constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp:64
 constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp:83
@@ -554,7 +554,6 @@ unusedScopedObject:${CMAKE_SOURCE_DIR}/Framework/PythonInterface/mantid/api/src/
 constParameterCallback:${CMAKE_SOURCE_DIR}/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp:80
 unusedScopedObject:${CMAKE_SOURCE_DIR}/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp:113
 syntaxError:${CMAKE_SOURCE_DIR}/Framework/PythonInterface/mantid/dataobjects/src/Exports/EventList.cpp:37
-syntaxError:${CMAKE_SOURCE_DIR}/Framework/PythonInterface/mantid/kernel/src/Exports/V3D.cpp:123
 syntaxError:${CMAKE_SOURCE_DIR}/Framework/PythonInterface/mantid/kernel/src/Exports/VMD.cpp:100
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/CreateTransmissionWorkspace2.cpp:176
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/CreateTransmissionWorkspace2.cpp:177