Fix uninitialized members

qgis · Feb 16, 2015 · d3c8837 · d3c8837
1 parent 2d8feeb
commit d3c8837
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 6 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -503,7 +503,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
     , mToolPopupOverviews( 0 )
     , mToolPopupDisplay( 0 )
     , mLayerTreeCanvasBridge( 0 )
-    , mPreviousNonZoomMapTool( 0 )
     , mSplash( splash )
     , mMousePrecisionDecimalPlaces( 0 )
     , mInternalClipboard( 0 )
@@ -841,6 +840,31 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
 
 QgisApp::QgisApp()
     : QMainWindow( 0, 0 )
+    , mNonEditMapTool( 0 )
+    , mScaleLabel( 0 )
+    , mScaleEdit( 0 )
+    , mScaleEditValidator( 0 )
+    , mCoordsLabel( 0 )
+    , mCoordsEdit( 0 )
+    , mCoordsEditValidator( 0 )
+    , mRotationLabel( 0 )
+    , mRotationEdit( 0 )
+    , mRotationEditValidator( 0 )
+    , mProgressBar( 0 )
+    , mRenderSuppressionCBox( 0 )
+    , mToggleExtentsViewButton( 0 )
+    , mOnTheFlyProjectionStatusLabel( 0 )
+    , mOnTheFlyProjectionStatusButton( 0 )
+    , mMessageButton( 0 )
+    , mFeatureActionMenu( 0 )
+    , mPopupMenu( 0 )
+    , mDatabaseMenu( 0 )
+    , mWebMenu( 0 )
+    , mToolPopupOverviews( 0 )
+    , mToolPopupDisplay( 0 )
+    , mMapCanvas( 0 )
+    , mLayerTreeView( 0 )
+    , mLayerTreeCanvasBridge( 0 )
     , mMapLayerOrder( 0 )
     , mOverviewMapCursor( 0 )
     , mMapWindow( 0 )
@@ -863,6 +887,7 @@ QgisApp::QgisApp()
     , mSnappingDialog( 0 )
     , mPluginManager( 0 )
     , mComposerManager( 0 )
+    , mpTileScaleWidget( 0 )
     , mLastComposerId( 0 )
     , mpGpsWidget( 0 )
     , mLastMapToolMessage( 0 )

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1395,6 +1395,54 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     class Tools
     {
       public:
+
+        Tools()
+            : mZoomIn( 0 )
+            , mZoomOut( 0 )
+            , mPan( 0 )
+#ifdef HAVE_TOUCH
+            , mTouch( 0 )
+#endif
+            , mIdentify( 0 )
+            , mFeatureAction( 0 )
+            , mMeasureDist( 0 )
+            , mMeasureArea( 0 )
+            , mMeasureAngle( 0 )
+            , mAddFeature( 0 )
+            , mMoveFeature( 0 )
+            , mOffsetCurve( 0 )
+            , mReshapeFeatures( 0 )
+            , mSplitFeatures( 0 )
+            , mSplitParts( 0 )
+            , mSelect( 0 )
+            , mSelectFeatures( 0 )
+            , mSelectPolygon( 0 )
+            , mSelectFreehand( 0 )
+            , mSelectRadius( 0 )
+            , mVertexAdd( 0 )
+            , mVertexMove( 0 )
+            , mVertexDelete( 0 )
+            , mAddRing( 0 )
+            , mFillRing( 0 )
+            , mAddPart( 0 )
+            , mSimplifyFeature( 0 )
+            , mDeleteRing( 0 )
+            , mDeletePart( 0 )
+            , mNodeTool( 0 )
+            , mRotatePointSymbolsTool( 0 )
+            , mAnnotation( 0 )
+            , mFormAnnotation( 0 )
+            , mHtmlAnnotation( 0 )
+            , mSvgAnnotation( 0 )
+            , mTextAnnotation( 0 )
+            , mPinLabels( 0 )
+            , mShowHideLabels( 0 )
+            , mMoveLabel( 0 )
+            , mRotateFeature( 0 )
+            , mRotateLabel( 0 )
+            , mChangeLabelProperties( 0 )
+        {}
+
         QgsMapTool *mZoomIn;
         QgsMapTool *mZoomOut;
         QgsMapTool *mPan;
@@ -1496,8 +1544,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QCursor *mOverviewMapCursor;
     //! Current map window extent in real-world coordinates
     QRect *mMapWindow;
-    //! The previously selected non zoom map tool.
-    int mPreviousNonZoomMapTool;
     QString mStartupPath;
     //! full path name of the current map file (if it has been saved or loaded)
     QString mFullPathName;

diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -147,9 +147,32 @@ QgsGrassEdit::QgsGrassEdit( QgisInterface *iface, QgsMapLayer *layer, bool newMa
                             QWidget *parent, Qt::WindowFlags f )
     : QMainWindow( parent, f )
     , QgsGrassEditBase()
+    , mLayer( 0 )
+    , mToolBar( 0 )
+    , mSize( 0 )
     , mValid( false )
     , mInited( false )
     , mIface( iface )
+    , mCanvas( 0 )
+    , mProvider( 0 )
+    , mTool( QgsGrassEdit::NONE )
+    , mSuspend( false )
+    , mEditPoints( 0 )
+    , mPoints( 0 )
+    , mCats( 0 )
+    , mPixmap( 0 )
+    , mTransform( 0 )
+    , mSelectedLine( 0 )
+    , mSelectedPart( 0 )
+    , mAddVertexEnd( false )
+    , mLineWidth( 0 )
+    , mMarkerSize( 0 )
+    , mAttributes( 0 )
+    , mNewMap( newMap )
+    , mNewPointAction( 0 )
+    , mNewLineAction( 0 )
+    , mNewBoundaryAction( 0 )
+    , mNewCentroidAction( 0 )
     , mMoveVertexAction( 0 )
     , mAddVertexAction( 0 )
     , mDeleteVertexAction( 0 )
@@ -168,9 +191,6 @@ QgsGrassEdit::QgsGrassEdit( QgisInterface *iface, QgsMapLayer *layer, bool newMa
   setupUi( this );
 
   mRunning = true;
-  mTool = QgsGrassEdit::NONE;
-  mSuspend = false;
-  mNewMap = newMap;
 
   mProjectionEnabled = ( QgsProject::instance()->readNumEntry( "SpatialRefSys", "/ProjectionsEnabled", 0 ) != 0 );
 

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -53,6 +53,7 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
     , mShared( new QgsPostgresSharedData )
     , mUseEstimatedMetadata( false )
     , mSelectAtIdDisabled( false )
+    , mEnabledCapabilities( 0 )
     , mConnectionRO( 0 )
     , mConnectionRW( 0 )
     , mTransaction( 0 )