Modernise some code

Author: nyalldawson

python/core/layout/qgslayoutmeasurementconverter.sip

@@ -27,6 +27,9 @@ class QgsLayoutMeasurementConverter
   public:
 
     QgsLayoutMeasurementConverter();
+%Docstring
+ Constructor for QgsLayoutMeasurementConverter.
+%End
 
     void setDpi( const double dpi );
 %Docstring

src/core/layout/qgslayoutmeasurement.h

@@ -123,8 +123,8 @@ class CORE_EXPORT QgsLayoutMeasurement
 
   private:
 
-    double mLength;
-    QgsUnitTypes::LayoutUnit mUnits;
+    double mLength = 0.0;
+    QgsUnitTypes::LayoutUnit mUnits = QgsUnitTypes::LayoutMillimeters;
 
 };
 

src/core/layout/qgslayoutmeasurementconverter.cpp

@@ -18,11 +18,6 @@
 #include "qgslayoutmeasurementconverter.h"
 
 
-QgsLayoutMeasurementConverter::QgsLayoutMeasurementConverter()
-  : mDpi( 300.0 )
-{
-}
-
 QgsLayoutMeasurement QgsLayoutMeasurementConverter::convert( const QgsLayoutMeasurement &measurement, const QgsUnitTypes::LayoutUnit targetUnits ) const
 {
   if ( measurement.units() == targetUnits )

src/core/layout/qgslayoutmeasurementconverter.h

@@ -41,7 +41,10 @@ class CORE_EXPORT QgsLayoutMeasurementConverter
 {
   public:
 
-    QgsLayoutMeasurementConverter();
+    /**
+     * Constructor for QgsLayoutMeasurementConverter.
+     */
+    QgsLayoutMeasurementConverter() = default;
 
     /**
      * Sets the dots per inch (\a dpi) for the measurement converter. This is used
@@ -83,7 +86,7 @@ class CORE_EXPORT QgsLayoutMeasurementConverter
 
   private:
 
-    double mDpi;
+    double mDpi = 300.0;
 
     double convertToMillimeters( const QgsLayoutMeasurement &measurement ) const;
     double convertToCentimeters( const QgsLayoutMeasurement &measurement ) const;

src/core/layout/qgslayoutpoint.cpp

@@ -29,9 +29,7 @@ QgsLayoutPoint::QgsLayoutPoint( const double x, const double y, const QgsUnitTyp
 }
 
 QgsLayoutPoint::QgsLayoutPoint( const QgsUnitTypes::LayoutUnit units )
-  : mX( 0.0 )
-  , mY( 0.0 )
-  , mUnits( units )
+  : mUnits( units )
 {
 
 }

src/core/layout/qgslayoutpoint.h

@@ -151,9 +151,9 @@ class CORE_EXPORT QgsLayoutPoint
 
   private:
 
-    double mX;
-    double mY;
-    QgsUnitTypes::LayoutUnit mUnits;
+    double mX = 0.0;
+    double mY = 0.0;
+    QgsUnitTypes::LayoutUnit mUnits = QgsUnitTypes::LayoutMillimeters;
 
 };
 

src/core/layout/qgslayoutsize.cpp

@@ -27,9 +27,7 @@ QgsLayoutSize::QgsLayoutSize( const double width, const double height, const Qgs
 }
 
 QgsLayoutSize::QgsLayoutSize( const QgsUnitTypes::LayoutUnit units )
-  : mWidth( 0.0 )
-  , mHeight( 0.0 )
-  , mUnits( units )
+  : mUnits( units )
 {
 
 }

src/core/layout/qgslayoutsize.h

@@ -155,9 +155,9 @@ class CORE_EXPORT QgsLayoutSize
 
   private:
 
-    double mWidth;
-    double mHeight;
-    QgsUnitTypes::LayoutUnit mUnits;
+    double mWidth = 0.0;
+    double mHeight = 0.0;
+    QgsUnitTypes::LayoutUnit mUnits = QgsUnitTypes::LayoutMillimeters;
 
 };