Remove redundant initializations

Fixes when a member is initialized both in the header and source to the same initial value (via clang-tidy modernize-use-default-member-init fixit)
qgis · Sep 11, 2017 · ba64e3e
1 parent 32dee44
commit ba64e3e
Show file tree

Hide file tree

Showing 273 changed files with 207 additions and 825 deletions.
diff --git a/src/analysis/interpolation/CloughTocherInterpolator.cpp b/src/analysis/interpolation/CloughTocherInterpolator.cpp
@@ -20,8 +20,7 @@
 #include "NormVecDecorator.h"
 
 CloughTocherInterpolator::CloughTocherInterpolator()
-  : mTIN( nullptr )
-  , mEdgeTolerance( 0.00001 )
+  : mEdgeTolerance( 0.00001 )
   , der1X( 0.0 )
   , der1Y( 0.0 )
   , der2X( 0.0 )

diff --git a/src/analysis/interpolation/qgsgridfilewriter.cpp b/src/analysis/interpolation/qgsgridfilewriter.cpp
@@ -35,8 +35,7 @@ QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator *i, const QString &outputP
 }
 
 QgsGridFileWriter::QgsGridFileWriter()
-  : mInterpolator( nullptr )
-  , mNumColumns( 0 )
+  : mNumColumns( 0 )
   , mNumRows( 0 )
   , mCellSizeX( 0 )
   , mCellSizeY( 0 )

diff --git a/src/analysis/interpolation/qgstininterpolator.cpp b/src/analysis/interpolation/qgstininterpolator.cpp
@@ -31,8 +31,6 @@
 
 QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData> &inputData, TINInterpolation interpolation, QgsFeedback *feedback )
   : QgsInterpolator( inputData )
-  , mTriangulation( nullptr )
-  , mTriangleInterpolator( nullptr )
   , mIsInitialized( false )
   , mFeedback( feedback )
   , mInterpolation( interpolation )

diff --git a/src/analysis/openstreetmap/qgsosmdatabase.cpp b/src/analysis/openstreetmap/qgsosmdatabase.cpp
@@ -21,13 +21,6 @@
 
 QgsOSMDatabase::QgsOSMDatabase( const QString &dbFileName )
   : mDbFileName( dbFileName )
-  , mDatabase( nullptr )
-  , mStmtNode( nullptr )
-  , mStmtNodeTags( nullptr )
-  , mStmtWay( nullptr )
-  , mStmtWayNode( nullptr )
-  , mStmtWayNodePoints( nullptr )
-  , mStmtWayTags( nullptr )
 {
 }
 
@@ -547,7 +540,6 @@ QString QgsOSMDatabase::quotedValue( QString value )
 
 
 QgsOSMNodeIterator::QgsOSMNodeIterator( sqlite3 *handle )
-  : mStmt( nullptr )
 {
   const char *sql = "SELECT id,lon,lat FROM nodes";
   if ( sqlite3_prepare_v2( handle, sql, -1, &mStmt, nullptr ) != SQLITE_OK )
@@ -593,7 +585,6 @@ void QgsOSMNodeIterator::close()
 
 
 QgsOSMWayIterator::QgsOSMWayIterator( sqlite3 *handle )
-  : mStmt( nullptr )
 {
   const char *sql = "SELECT id FROM ways";
   if ( sqlite3_prepare_v2( handle, sql, -1, &mStmt, nullptr ) != SQLITE_OK )

diff --git a/src/analysis/openstreetmap/qgsosmdownload.cpp b/src/analysis/openstreetmap/qgsosmdownload.cpp
@@ -39,14 +39,12 @@ QString QgsOSMDownload::queryFromRect( const QgsRectangle &rect )
 
 QgsOSMDownload::QgsOSMDownload()
   : mServiceUrl( defaultServiceUrl() )
-  , mReply( nullptr )
 {
 }
 
 QgsOSMDownload::QgsOSMDownload( const QString &query )
   : mServiceUrl( defaultServiceUrl() )
   , mQuery( query )
-  , mReply( nullptr )
 {
 }
 

diff --git a/src/analysis/openstreetmap/qgsosmimport.cpp b/src/analysis/openstreetmap/qgsosmimport.cpp
@@ -23,12 +23,6 @@
 QgsOSMXmlImport::QgsOSMXmlImport( const QString &xmlFilename, const QString &dbFilename )
   : mXmlFileName( xmlFilename )
   , mDbFileName( dbFilename )
-  , mDatabase( nullptr )
-  , mStmtInsertNode( nullptr )
-  , mStmtInsertNodeTag( nullptr )
-  , mStmtInsertWay( nullptr )
-  , mStmtInsertWayNode( nullptr )
-  , mStmtInsertWayTag( nullptr )
 {
 
 }

diff --git a/src/analysis/raster/qgsalignraster.cpp b/src/analysis/raster/qgsalignraster.cpp
@@ -116,7 +116,6 @@ static CPLErr rescalePostWarpChunkProcessor( void *pKern, void *pArg )
 
 
 QgsAlignRaster::QgsAlignRaster()
-  : mProgressHandler( nullptr )
 {
   // parameters
   mCellSizeX = mCellSizeY = 0;

diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp
@@ -19,28 +19,20 @@
 
 QgsRasterCalcNode::QgsRasterCalcNode()
   : mType( tNumber )
-  , mLeft( nullptr )
-  , mRight( nullptr )
   , mNumber( 0 )
-  , mMatrix( nullptr )
   , mOperator( opNONE )
 {
 }
 
 QgsRasterCalcNode::QgsRasterCalcNode( double number )
   : mType( tNumber )
-  , mLeft( nullptr )
-  , mRight( nullptr )
   , mNumber( number )
-  , mMatrix( nullptr )
   , mOperator( opNONE )
 {
 }
 
 QgsRasterCalcNode::QgsRasterCalcNode( QgsRasterMatrix *matrix )
   : mType( tMatrix )
-  , mLeft( nullptr )
-  , mRight( nullptr )
   , mNumber( 0 )
   , mMatrix( matrix )
   , mOperator( opNONE )
@@ -53,18 +45,14 @@ QgsRasterCalcNode::QgsRasterCalcNode( Operator op, QgsRasterCalcNode *left, QgsR
   , mLeft( left )
   , mRight( right )
   , mNumber( 0 )
-  , mMatrix( nullptr )
   , mOperator( op )
 {
 }
 
 QgsRasterCalcNode::QgsRasterCalcNode( const QString &rasterName )
   : mType( tRasterRef )
-  , mLeft( nullptr )
-  , mRight( nullptr )
   , mNumber( 0 )
   , mRasterName( rasterName )
-  , mMatrix( nullptr )
   , mOperator( opNONE )
 {
   if ( mRasterName.startsWith( '"' ) && mRasterName.endsWith( '"' ) )

diff --git a/src/analysis/raster/qgsrastermatrix.cpp b/src/analysis/raster/qgsrastermatrix.cpp