Merge pull request #5602 from nyalldawson/modernize2

Apply some more clang-tidy modernizations
qgis · Nov 11, 2017 · bcb815b · bcb815b
2 parents 8c6e029 + 5a6c222
commit bcb815b
Show file tree

Hide file tree

Showing 189 changed files with 356 additions and 588 deletions.
diff --git a/python/core/effects/qgsimageoperation.sip b/python/core/effects/qgsimageoperation.sip
@@ -93,7 +93,6 @@ class QgsImageOperation
 
     struct DistanceTransformProperties
     {
-      DistanceTransformProperties();
 
       bool shadeExterior;
 %Docstring

diff --git a/python/core/effects/qgspainteffect.sip b/python/core/effects/qgspainteffect.sip
@@ -300,6 +300,9 @@ class QgsDrawSourceEffect : QgsPaintEffect
   public:
 
     QgsDrawSourceEffect();
+%Docstring
+Constructor for QgsDrawSourceEffect
+%End
 
     static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
 %Docstring

diff --git a/python/core/fieldformatter/qgsvaluerelationfieldformatter.sip b/python/core/fieldformatter/qgsvaluerelationfieldformatter.sip
@@ -25,8 +25,14 @@ class QgsValueRelationFieldFormatter : QgsFieldFormatter
     struct ValueRelationItem
     {
       ValueRelationItem( const QVariant &key, const QString &value );
+%Docstring
+Constructor for ValueRelationItem
+%End
 
       ValueRelationItem();
+%Docstring
+Constructor for ValueRelationItem
+%End
 
       QVariant key;
       QString value;

diff --git a/python/core/geometry/qgsabstractgeometry.sip b/python/core/geometry/qgsabstractgeometry.sip
@@ -646,6 +646,9 @@ class QgsVertexIterator
 %End
   public:
     QgsVertexIterator();
+%Docstring
+Constructor for QgsVertexIterator
+%End
 
     QgsVertexIterator( const QgsAbstractGeometry *geometry );
 %Docstring

diff --git a/python/core/qgsdartmeasurement.sip b/python/core/qgsdartmeasurement.sip
@@ -24,6 +24,9 @@ class QgsDartMeasurement
     };
 
     QgsDartMeasurement();
+%Docstring
+Constructor for QgsDartMeasurement
+%End
 
     QgsDartMeasurement( const QString &name, Type type, const QString &value );
 

diff --git a/python/core/qgsdiagramrenderer.sip b/python/core/qgsdiagramrenderer.sip
@@ -319,6 +319,9 @@ class QgsDiagramSettings
     };
 
     QgsDiagramSettings();
+%Docstring
+Constructor for QgsDiagramSettings
+%End
 
     bool enabled;
     QFont font;
@@ -614,7 +617,11 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
 #include "qgsdiagramrenderer.h"
 %End
   public:
+
     QgsSingleCategoryDiagramRenderer();
+%Docstring
+Constructor for QgsSingleCategoryDiagramRenderer
+%End
 
     virtual QgsSingleCategoryDiagramRenderer *clone() const /Factory/;
 

diff --git a/python/core/qgseditformconfig.sip b/python/core/qgseditformconfig.sip
@@ -29,6 +29,9 @@ class QgsEditFormConfig
     struct GroupData
     {
       GroupData();
+%Docstring
+Constructor for GroupData
+%End
       GroupData( const QString &name, const QList<QString> &fields );
       QString mName;
       QList<QString> mFields;
@@ -37,6 +40,9 @@ class QgsEditFormConfig
     struct TabData
     {
       TabData();
+%Docstring
+Constructor for TabData
+%End
       TabData( const QString &name, const QList<QString> &fields, const QList<QgsEditFormConfig::GroupData> &groups );
       QString mName;
       QList<QString> mFields;

diff --git a/python/core/qgseditorwidgetsetup.sip b/python/core/qgseditorwidgetsetup.sip
@@ -27,6 +27,9 @@ class QgsEditorWidgetSetup
 %End
 
     QgsEditorWidgetSetup();
+%Docstring
+Constructor for QgsEditorWidgetSetup
+%End
 
     QString type() const;
 %Docstring

diff --git a/python/core/qgserror.sip b/python/core/qgserror.sip
@@ -27,6 +27,9 @@ class QgsErrorMessage
     };
 
     QgsErrorMessage();
+%Docstring
+Constructor for QgsErrorMessage
+%End
 
     QgsErrorMessage( const QString &message, const QString &tag = QString(), const QString &file = QString(), const QString &function = QString(), int line = 0 );
 %Docstring
@@ -75,6 +78,9 @@ class QgsError
   public:
 
     QgsError();
+%Docstring
+Constructor for QgsError
+%End
 
     QgsError( const QString &message, const QString &tag );
 %Docstring

diff --git a/python/core/qgsexpressioncontext.sip b/python/core/qgsexpressioncontext.sip
@@ -345,6 +345,9 @@ class QgsExpressionContext
   public:
 
     QgsExpressionContext();
+%Docstring
+Constructor for QgsExpressionContext
+%End
 
     explicit QgsExpressionContext( const QList<QgsExpressionContextScope *> &scopes /Transfer/ );
 %Docstring

diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -20,7 +20,11 @@ class QgsLabelPosition
 %End
   public:
     QgsLabelPosition( int id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString &providerId = QString() );
+
     QgsLabelPosition();
+%Docstring
+Constructor for QgsLabelPosition
+%End
 
     int featureId;
     double rotation;

diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
@@ -107,6 +107,9 @@ There are two possibilities how to use this class:
     struct MetaData
     {
       MetaData();
+%Docstring
+Constructor for MetaData
+%End
 
       MetaData( const QString &longName, const QString &trLongName, const QString &glob, const QString &ext, const QMap<QString, QgsVectorFileWriter::Option *> &driverOptions, const QMap<QString, QgsVectorFileWriter::Option *> &layerOptions, const QString &compulsoryEncoding = QString() );
 

diff --git a/python/core/qgsvectorlayereditbuffer.sip b/python/core/qgsvectorlayereditbuffer.sip
@@ -249,6 +249,9 @@ Signals emitted after committing changes
   protected:
 
     QgsVectorLayerEditBuffer();
+%Docstring
+Constructor for QgsVectorLayerEditBuffer
+%End
 
     void updateFields( QgsFields &fields );
 

diff --git a/python/core/qgsvectorlayerutils.sip b/python/core/qgsvectorlayerutils.sip
@@ -36,6 +36,9 @@ class QgsVectorLayerUtils
       public:
 
         QgsDuplicateFeatureContext();
+%Docstring
+Constructor for QgsDuplicateFeatureContext
+%End
 
         QList<QgsVectorLayer *> layers() const;
 %Docstring

diff --git a/python/core/symbology/qgssymbol.sip b/python/core/symbology/qgssymbol.sip
@@ -404,6 +404,7 @@ class QgsSymbolRenderContext
  \param mapUnitScale
 %End
 
+
     QgsRenderContext &renderContext();
 %Docstring
  :rtype: QgsRenderContext

diff --git a/python/gui/qgsattributeeditorcontext.sip b/python/gui/qgsattributeeditorcontext.sip
@@ -39,6 +39,9 @@ class QgsAttributeEditorContext
     };
 
     QgsAttributeEditorContext();
+%Docstring
+Constructor for QgsAttributeEditorContext
+%End
 
     QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, FormMode formMode );
 

diff --git a/python/gui/qgsidentifymenu.sip b/python/gui/qgsidentifymenu.sip
@@ -32,6 +32,9 @@ class QgsIdentifyMenu : QMenu
     struct ActionData
     {
       ActionData();
+%Docstring
+Constructor for ActionData
+%End
 
       ActionData( QgsMapLayer *layer, QgsMapLayerAction *mapLayerAction = 0 );
 

diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip
@@ -20,8 +20,6 @@ class QgsLongLongValidator : QValidator
 
     QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );
 
-    ~QgsLongLongValidator();
-
     virtual QValidator::State validate( QString &input, int & ) const;
 
     void setBottom( qint64 bottom );

diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip
@@ -47,6 +47,9 @@ after selecting a point, performs the identification:
     struct IdentifyResult
     {
       IdentifyResult();
+%Docstring
+Constructor for IdentifyResult
+%End
 
       IdentifyResult( QgsMapLayer *layer, const QgsFeature &feature, const QMap< QString, QString > &derivedAttributes );
       IdentifyResult( QgsMapLayer *layer, const QString &label, const QMap< QString, QString > &attributes, const QMap< QString, QString > &derivedAttributes );

diff --git a/python/gui/qgssublayersdialog.sip b/python/gui/qgssublayersdialog.sip
@@ -25,8 +25,6 @@ class QgsSublayersDialog : QDialog
 
     struct LayerDefinition
     {
-      LayerDefinition();
-
       int layerId;
       QString layerName;  //!< Name of the layer (not necessarily unique)
       int count;

diff --git a/python/server/qgsbufferserverresponse.sip b/python/server/qgsbufferserverresponse.sip
@@ -22,6 +22,7 @@ class QgsBufferServerResponse: QgsServerResponse
 
     QgsBufferServerResponse();
 
+
     virtual void setHeader( const QString &key, const QString &value );
 
 %Docstring

diff --git a/src/3d/chunks/qgschunkedentity_p.h b/src/3d/chunks/qgschunkedentity_p.h
@@ -103,7 +103,7 @@ class QgsChunkedEntity : public Qt3DCore::QEntity
     //! root node of the quadtree hierarchy
     QgsChunkNode *mRootNode = nullptr;
     //! A chunk has been loaded recently? let's display it!
-    bool mNeedsUpdate;
+    bool mNeedsUpdate = false;
     //! max. allowed screen space error
     float mTau;
     //! maximum allowed depth of quad tree
@@ -117,14 +117,14 @@ class QgsChunkedEntity : public Qt3DCore::QEntity
     //! list of nodes that are being currently used for rendering
     QList<QgsChunkNode *> mActiveNodes;
     //! number of nodes omitted during frustum culling - for the curious ones
-    int mFrustumCulled;
+    int mFrustumCulled = 0;
 
     // TODO: max. length for loading queue
 
     QTime mCurrentTime;
 
     //! max. length for replacement queue
-    int mMaxLoadedChunks;
+    int mMaxLoadedChunks = 512;
 
     //! Entity that shows bounding boxes of active chunks (null if not enabled)
     QgsChunkBoundsEntity *mBboxesEntity = nullptr;

diff --git a/src/3d/chunks/qgschunklist_p.cpp b/src/3d/chunks/qgschunklist_p.cpp
@@ -19,13 +19,6 @@
 
 ///@cond PRIVATE
 
-QgsChunkList::QgsChunkList()
-  : mHead( nullptr )
-  , mTail( nullptr )
-  , mCount( 0 )
-{
-}
-
 int QgsChunkList::trueCount() const
 {
   int len = 0;

diff --git a/src/3d/chunks/qgschunklist_p.h b/src/3d/chunks/qgschunklist_p.h
@@ -64,7 +64,8 @@ struct QgsChunkListEntry
 class QgsChunkList
 {
   public:
-    QgsChunkList();
+    //! Constructor for QgsChunkList
+    QgsChunkList() = default;
 
     //! Counts the real number of entries by walking the list (for debugging purposes only)
     int trueCount() const;
@@ -99,7 +100,7 @@ class QgsChunkList
   private:
     QgsChunkListEntry *mHead = nullptr;
     QgsChunkListEntry *mTail = nullptr;
-    int mCount;
+    int mCount = 0;
 };
 
 /// @endcond

diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -42,7 +42,6 @@
 Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent )
   : Qt3DCore::QEntity( parent )
   , mMap( map )
-  , mTerrain( nullptr )
   , mForwardRenderer( defaultFrameGraph )
 {
 

diff --git a/src/3d/qgs3dmapsettings.cpp b/src/3d/qgs3dmapsettings.cpp
@@ -26,23 +26,6 @@
 #include "qgssymbollayerutils.h"
 #include "qgsrasterlayer.h"
 
-
-Qgs3DMapSettings::Qgs3DMapSettings()
-  : mOriginX( 0 )
-  , mOriginY( 0 )
-  , mOriginZ( 0 )
-  , mBackgroundColor( Qt::black )
-  , mTerrainVerticalScale( 1 )
-  , mMapTileResolution( 512 )
-  , mMaxTerrainScreenError( 3.f )
-  , mMaxTerrainGroundError( 1.f )
-  , mShowTerrainBoundingBoxes( false )
-  , mShowTerrainTileInfo( false )
-  , mShowLabels( false )
-  , mSkyboxEnabled( false )
-{
-}
-
 Qgs3DMapSettings::Qgs3DMapSettings( const Qgs3DMapSettings &other )
   : QObject()
   , mOriginX( other.mOriginX )

diff --git a/src/3d/qgs3dmapsettings.h b/src/3d/qgs3dmapsettings.h
@@ -47,7 +47,9 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject
 {
     Q_OBJECT
   public:
-    Qgs3DMapSettings();
+
+    //! Constructor for Qgs3DMapSettings
+    Qgs3DMapSettings() = default;
     //! Copy constructor
     Qgs3DMapSettings( const Qgs3DMapSettings &other );
     ~Qgs3DMapSettings();
@@ -206,23 +208,28 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject
     void showLabelsChanged();
 
   private:
-    double mOriginX, mOriginY, mOriginZ;   //!< Coordinates in map CRS at which our 3D world has origin (0,0,0)
+    //! X coordinate in map CRS at which our 3D world has origin (0,0,0)
+    double mOriginX = 0;
+    //! Y coordinate in map CRS at which our 3D world has origin (0,0,0)
+    double mOriginY = 0;
+    //! Z coordinate in map CRS at which our 3D world has origin (0,0,0)
+    double mOriginZ = 0;
     QgsCoordinateReferenceSystem mCrs;   //!< Destination coordinate system of the world
-    QColor mBackgroundColor;   //!< Background color of the scene
+    QColor mBackgroundColor = Qt::black;   //!< Background color of the scene
-    QColor mSelectionColor;    //!< Color to be used for selected map features
+    QColor mSelectionColor; //!< Color to be used for selected map features
-    double mTerrainVerticalScale;   //!< Multiplier of terrain heights to make the terrain shape more pronounced
+    double mTerrainVerticalScale = 1;   //!< Multiplier of terrain heights to make the terrain shape more pronounced
     std::unique_ptr<QgsTerrainGenerator> mTerrainGenerator;  //!< Implementation of the terrain generation
-    int mMapTileResolution;   //!< Size of map textures of tiles in pixels (width/height)
+    int mMapTileResolution = 512;   //!< Size of map textures of tiles in pixels (width/height)
-    float mMaxTerrainScreenError;   //!< Maximum allowed terrain error in pixels (determines when tiles are switched to more detailed ones)
+    float mMaxTerrainScreenError = 3.f;   //!< Maximum allowed terrain error in pixels (determines when tiles are switched to more detailed ones)
-    float mMaxTerrainGroundError;  //!< Maximum allowed horizontal map error in map units (determines how many zoom levels will be used)
+    float mMaxTerrainGroundError = 1.f;  //!< Maximum allowed horizontal map error in map units (determines how many zoom levels will be used)
-    bool mShowTerrainBoundingBoxes;  //!< Whether to show bounding boxes of entities - useful for debugging
+    bool mShowTerrainBoundingBoxes = false;  //!< Whether to show bounding boxes of entities - useful for debugging
-    bool mShowTerrainTileInfo;  //!< Whether to draw extra information about terrain tiles to the textures - useful for debugging
+    bool mShowTerrainTileInfo = false;  //!< Whether to draw extra information about terrain tiles to the textures - useful for debugging
-    bool mShowLabels; //!< Whether to display labels on terrain tiles
+    bool mShowLabels = false; //!< Whether to display labels on terrain tiles
     QList<QgsMapLayerRef> mLayers;   //!< Layers to be rendered
     QList<QgsAbstract3DRenderer *> mRenderers;  //!< Extra stuff to render as 3D object
-    bool mSkyboxEnabled;  //!< Whether to render skybox
+    bool mSkyboxEnabled = false;  //!< Whether to render skybox
-    QString mSkyboxFileBase;   //!< Base part of the files with skybox textures
+    QString mSkyboxFileBase; //!< Base part of the files with skybox textures
-    QString mSkyboxFileExtension;  //!< Extension part of the files with skybox textures
+    QString mSkyboxFileExtension; //!< Extension part of the files with skybox textures
 };
 
 

diff --git a/src/3d/qgsaabb.cpp b/src/3d/qgsaabb.cpp
@@ -15,11 +15,6 @@
 
 #include "qgsaabb.h"
 
-QgsAABB::QgsAABB()
-  : xMin( 0 ), yMin( 0 ), zMin( 0 ), xMax( 0 ), yMax( 0 ), zMax( 0 )
-{
-}
-
 QgsAABB::QgsAABB( float xMin, float yMin, float zMin, float xMax, float yMax, float zMax )
   : xMin( xMin ), yMin( yMin ), zMin( zMin ), xMax( xMax ), yMax( yMax ), zMax( zMax )
 {