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 · 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
@@ -22,7 +22,6 @@
 QgsRasterMatrix::QgsRasterMatrix()
   : mColumns( 0 )
   , mRows( 0 )
-  , mData( nullptr )
   , mNodataValue( -1 )
 {
 }
@@ -38,7 +37,6 @@ QgsRasterMatrix::QgsRasterMatrix( int nCols, int nRows, double *data, double nod
 QgsRasterMatrix::QgsRasterMatrix( const QgsRasterMatrix &m )
   : mColumns( 0 )
   , mRows( 0 )
-  , mData( nullptr )
 {
   operator=( m );
 }

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -656,6 +656,14 @@ if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET_TARGET_PROPERTIES(qgis_app PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
 ENDIF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
 
+# clang-tidy
+IF(CLANG_TIDY_EXE)
+  SET_TARGET_PROPERTIES(
+    qgis_app PROPERTIES
+    CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+  )
+ENDIF(CLANG_TIDY_EXE)
+
 IF(NOT WIN32)
   TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} qgis_app)
 ENDIF(NOT WIN32)

diff --git a/src/app/composer/qgsattributeselectiondialog.cpp b/src/app/composer/qgsattributeselectiondialog.cpp
@@ -272,13 +272,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
   : QDialog( parent, f )
   , mComposerTable( table )
   , mVectorLayer( vLayer )
-  , mColumnModel( nullptr )
-  , mSortedProxyModel( nullptr )
-  , mAvailableSortProxyModel( nullptr )
-  , mColumnAlignmentDelegate( nullptr )
-  , mColumnSourceDelegate( nullptr )
-  , mColumnSortOrderDelegate( nullptr )
-  , mColumnWidthDelegate( nullptr )
+
 {
   setupUi( this );
 

diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp
@@ -72,10 +72,7 @@ QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml *html, QgsComposer
 
 QgsComposerHtmlWidget::QgsComposerHtmlWidget()
   : QgsComposerItemBaseWidget( nullptr, nullptr )
-  , mHtml( nullptr )
-  , mFrame( nullptr )
-  , mHtmlEditor( nullptr )
-  , mStylesheetEditor( nullptr )
+
 {
 }
 

diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -119,7 +119,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend *legend )
   connect( mItemFontButton, &QgsFontButton::changed, this, &QgsComposerLegendWidget::itemFontChanged );
 }
 
-QgsComposerLegendWidget::QgsComposerLegendWidget(): QgsComposerItemBaseWidget( nullptr, nullptr ), mLegend( nullptr )
+QgsComposerLegendWidget::QgsComposerLegendWidget(): QgsComposerItemBaseWidget( nullptr, nullptr )
 {
   setupUi( this );
 }

diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp
@@ -125,7 +125,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget *parent, QgsComposition *c )
 
 QgsCompositionWidget::QgsCompositionWidget()
   : QgsPanelWidget( nullptr )
-  , mComposition( nullptr )
+
 {
   setupUi( this );
 }

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -62,7 +62,6 @@
 
 QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas *thepCanvas, QWidget *parent, Qt::WindowFlags f )
   : QWidget( parent, f )
-  , mNmea( nullptr )
   , mpCanvas( thepCanvas )
 {
   setupUi( this );

diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -33,9 +33,7 @@ QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId,
                                         QgsVectorLayer *vlayer,
                                         QgsMapCanvas *canvas )
   : mFeatureId( featureId )
-  , mGeometry( nullptr )
   , mChangingGeometry( false )
-  , mValidator( nullptr )
 {
   setSelectedFeature( featureId, vlayer, canvas );
 }

diff --git a/src/app/nodetool/qgsvertexentry.cpp b/src/app/nodetool/qgsvertexentry.cpp
@@ -22,7 +22,6 @@ QgsVertexEntry::QgsVertexEntry( QgsMapCanvas *canvas, QgsMapLayer *layer, const
   , mPenWidth( penWidth )
   , mToolTip( tooltip )
   , mType( type )
-  , mMarker( nullptr )
   , mCanvas( canvas )
   , mLayer( layer )
 {

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -605,39 +605,9 @@ QgisApp *QgisApp::sInstance = nullptr;
 // constructor starts here
 QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCheck, const QString rootProfileLocation, const QString activeProfile, QWidget *parent, Qt::WindowFlags fl )
   : QMainWindow( parent, fl )
-  , mNonEditMapTool( nullptr )
-  , mScaleWidget( nullptr )
-  , mMagnifierWidget( nullptr )
-  , mCoordsEdit( nullptr )
-  , mRotationLabel( nullptr )
-  , mRotationEdit( nullptr )
-  , mRotationEditValidator( nullptr )
-  , mProgressBar( nullptr )
-  , mRenderSuppressionCBox( nullptr )
-  , mOnTheFlyProjectionStatusLabel( nullptr )
-  , mOnTheFlyProjectionStatusButton( nullptr )
-  , mMessageButton( nullptr )
-  , mFeatureActionMenu( nullptr )
-  , mPopupMenu( nullptr )
-  , mDatabaseMenu( nullptr )
-  , mWebMenu( nullptr )
-  , mToolPopupOverviews( nullptr )
-  , mToolPopupDisplay( nullptr )
-  , mLayerTreeCanvasBridge( nullptr )
   , mSplash( splash )
-  , mInternalClipboard( nullptr )
   , mShowProjectionTab( false )
-  , mPythonUtils( nullptr )
-  , mSnappingWidget( nullptr )
-  , mMapStylingDock( nullptr )
-  , mComposerManager( nullptr )
-  , mpTileScaleWidget( nullptr )
-  , mpGpsWidget( nullptr )
-  , mTracer( nullptr )
-  , mSnappingUtils( nullptr )
   , mProjectLastModified()
-  , mWelcomePage( nullptr )
-  , mCentralContainer( nullptr )
 {
   if ( sInstance )
   {
@@ -1240,90 +1210,16 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
 
 QgisApp::QgisApp()
   : QMainWindow( nullptr, 0 )
-  , mStyleSheetBuilder( nullptr )
-  , mActionPluginSeparator1( nullptr )
-  , mActionPluginSeparator2( nullptr )
-  , mActionRasterSeparator( nullptr )
-  , mMapToolGroup( nullptr )
-  , mPreviewGroup( nullptr )
 #ifdef Q_OS_MAC
   , mWindowMenu( nullptr )
 #endif
-  , mPanelMenu( nullptr )
-  , mToolbarMenu( nullptr )
-  , mLayerTreeDock( nullptr )
-  , mLayerOrderDock( nullptr )
-  , mOverviewDock( nullptr )
-  , mpGpsDock( nullptr )
-  , mLogDock( nullptr )
-  , mNonEditMapTool( nullptr )
-  , mTaskManagerWidget( nullptr )
-  , mScaleWidget( nullptr )
-  , mMagnifierWidget( nullptr )
-  , mCoordsEdit( nullptr )
-  , mRotationLabel( nullptr )
-  , mRotationEdit( nullptr )
-  , mRotationEditValidator( nullptr )
-  , mProgressBar( nullptr )
-  , mRenderSuppressionCBox( nullptr )
-  , mOnTheFlyProjectionStatusLabel( nullptr )
-  , mOnTheFlyProjectionStatusButton( nullptr )
-  , mMessageButton( nullptr )
-  , mFeatureActionMenu( nullptr )
-  , mPopupMenu( nullptr )
-  , mDatabaseMenu( nullptr )
-  , mWebMenu( nullptr )
-  , mConfigMenu( nullptr )
-  , mToolPopupOverviews( nullptr )
-  , mToolPopupDisplay( nullptr )
-  , mMapCanvas( nullptr )
-  , mOverviewCanvas( nullptr )
-  , mLayerTreeView( nullptr )
-  , mLayerTreeCanvasBridge( nullptr )
-  , mMapLayerOrder( nullptr )
-  , mOverviewMapCursor( nullptr )
-  , mMapWindow( nullptr )
-  , mQgisInterface( nullptr )
-  , mSplash( nullptr )
-  , mInternalClipboard( nullptr )
   , mShowProjectionTab( false )
-  , mpMapTipsTimer( nullptr )
-  , mpMaptip( nullptr )
   , mMapTipsVisible( false )
   , mFullScreenMode( false )
   , mPrevScreenModeMaximized( false )
   , mSaveRollbackInProgress( false )
-  , mPythonUtils( nullptr )
-  , mUndoWidget( nullptr )
-  , mUndoDock( nullptr )
-  , mBrowserWidget( nullptr )
-  , mBrowserWidget2( nullptr )
-  , mAdvancedDigitizingDockWidget( nullptr )
-  , mStatisticalSummaryDockWidget( nullptr )
-  , mBookMarksDockWidget( nullptr )
-  , mSnappingWidget( nullptr )
-  , mSnappingDialogContainer( nullptr )
-  , mSnappingDialog( nullptr )
-  , mPluginManager( nullptr )
-  , mMapStylingDock( nullptr )
-  , mMapStyleWidget( nullptr )
-  , mComposerManager( nullptr )
-  , mpTileScaleWidget( nullptr )
-  , mpGpsWidget( nullptr )
-  , mLastMapToolMessage( nullptr )
-  , mLogViewer( nullptr )
   , mTrustedMacros( false )
-  , mMacrosWarn( nullptr )
-  , mUserInputDockWidget( nullptr )
-  , mVectorLayerTools( nullptr )
-  , mTracer( nullptr )
-  , mActionFilterLegend( nullptr )
-  , mActionStyleDock( nullptr )
-  , mLegendExpressionFilterButton( nullptr )
-  , mSnappingUtils( nullptr )
   , mProjectLastModified()
-  , mWelcomePage( nullptr )
-  , mCentralContainer( nullptr )
   , mProjOpen( 0 )
 {
   sInstance = this;

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -51,7 +51,6 @@
 
 QgisAppInterface::QgisAppInterface( QgisApp *_qgis )
   : qgis( _qgis )
-  , mTimer( nullptr )
   , pluginManagerIface( _qgis->pluginManager() )
 {
   // connect signals

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -82,9 +82,8 @@ void QgsAttributeTableDialog::updateMultiEditButtonState()
 
 QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget *parent, Qt::WindowFlags flags )
   : QDialog( parent, flags )
-  , mDock( nullptr )
   , mLayer( layer )
-  , mCurrentSearchWidgetWrapper( nullptr )
+
 {
   setObjectName( QStringLiteral( "QgsAttributeTableDialog/" ) + layer->id() );
   setupUi( this );