Fix uninitialized members

qgis · Aug 15, 2016 · 786b77a · 786b77a
1 parent 5f6dfae
commit 786b77a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -40,6 +40,7 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
     , mCustomLayerTree( nullptr )
     , mComposerMap( nullptr )
     , mLegendFilterByMap( false )
+    , mLegendFilterByExpression( false )
     , mFilterOutAtlas( false )
     , mFilterAskedForUpdate( false )
     , mInAtlas( false )

diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -42,6 +42,7 @@ QgsFeatureRequest::QgsFeatureRequest( QgsFeatureId fid )
 
 QgsFeatureRequest::QgsFeatureRequest( QgsFeatureIds fids )
     : mFilter( FilterFids )
+    , mFilterFid( -1 )
     , mFilterFids( fids )
     , mFilterExpression( nullptr )
     , mFlags( nullptr )

diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -47,7 +47,9 @@ const QString ORACLE_DESCRIPTION = "Oracle data provider";
 QgsOracleProvider::QgsOracleProvider( QString const & uri )
     : QgsVectorDataProvider( uri )
     , mValid( false )
+    , mIsQuery( false )
     , mPrimaryKeyType( pktUnknown )
+    , mFeaturesCounted( -1 )
     , mDetectedGeomType( QgsWkbTypes::Unknown )
     , mRequestedGeomType( QgsWkbTypes::Unknown )
     , mHasSpatialIndex( false )
@@ -133,7 +135,6 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )
   }
 
   mLayerExtent.setMinimal();
-  mFeaturesCounted = -1;
 
   // set the primary key
   if ( !determinePrimaryKey() )

diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h
@@ -409,7 +409,6 @@ class QgsOracleProvider : public QgsVectorDataProvider
 
     QMap<QVariant, QgsFeatureId> mKeyToFid;  //! map key values to feature id
     QMap<QgsFeatureId, QVariant> mFidToKey;  //! map feature back to fea
-    QgsFeatureId mFidCounter;                //! next feature id if map is used
     QgsOracleConn *mConnection;
 
     bool mHasSpatialIndex;                   //! Geometry column is indexed

diff --git a/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp b/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
@@ -89,6 +89,7 @@ namespace Sqlite
 {
   Query::Query( sqlite3* db, const QString& q )
       : db_( db )
+      , stmt_( nullptr )
       , nBind_( 1 )
   {
     QByteArray ba( q.toLocal8Bit() );