Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix uninitialized members
  • Loading branch information
nyalldawson committed Aug 15, 2016
1 parent 5f6dfae commit 786b77a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/core/composer/qgscomposerlegend.cpp
Expand Up @@ -40,6 +40,7 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
, mCustomLayerTree( nullptr ) , mCustomLayerTree( nullptr )
, mComposerMap( nullptr ) , mComposerMap( nullptr )
, mLegendFilterByMap( false ) , mLegendFilterByMap( false )
, mLegendFilterByExpression( false )
, mFilterOutAtlas( false ) , mFilterOutAtlas( false )
, mFilterAskedForUpdate( false ) , mFilterAskedForUpdate( false )
, mInAtlas( false ) , mInAtlas( false )
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsfeaturerequest.cpp
Expand Up @@ -42,6 +42,7 @@ QgsFeatureRequest::QgsFeatureRequest( QgsFeatureId fid )


QgsFeatureRequest::QgsFeatureRequest( QgsFeatureIds fids ) QgsFeatureRequest::QgsFeatureRequest( QgsFeatureIds fids )
: mFilter( FilterFids ) : mFilter( FilterFids )
, mFilterFid( -1 )
, mFilterFids( fids ) , mFilterFids( fids )
, mFilterExpression( nullptr ) , mFilterExpression( nullptr )
, mFlags( nullptr ) , mFlags( nullptr )
Expand Down
3 changes: 2 additions & 1 deletion src/providers/oracle/qgsoracleprovider.cpp
Expand Up @@ -47,7 +47,9 @@ const QString ORACLE_DESCRIPTION = "Oracle data provider";
QgsOracleProvider::QgsOracleProvider( QString const & uri ) QgsOracleProvider::QgsOracleProvider( QString const & uri )
: QgsVectorDataProvider( uri ) : QgsVectorDataProvider( uri )
, mValid( false ) , mValid( false )
, mIsQuery( false )
, mPrimaryKeyType( pktUnknown ) , mPrimaryKeyType( pktUnknown )
, mFeaturesCounted( -1 )
, mDetectedGeomType( QgsWkbTypes::Unknown ) , mDetectedGeomType( QgsWkbTypes::Unknown )
, mRequestedGeomType( QgsWkbTypes::Unknown ) , mRequestedGeomType( QgsWkbTypes::Unknown )
, mHasSpatialIndex( false ) , mHasSpatialIndex( false )
Expand Down Expand Up @@ -133,7 +135,6 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )
} }


mLayerExtent.setMinimal(); mLayerExtent.setMinimal();
mFeaturesCounted = -1;


// set the primary key // set the primary key
if ( !determinePrimaryKey() ) if ( !determinePrimaryKey() )
Expand Down
1 change: 0 additions & 1 deletion src/providers/oracle/qgsoracleprovider.h
Expand Up @@ -409,7 +409,6 @@ class QgsOracleProvider : public QgsVectorDataProvider


QMap<QVariant, QgsFeatureId> mKeyToFid; //! map key values to feature id QMap<QVariant, QgsFeatureId> mKeyToFid; //! map key values to feature id
QMap<QgsFeatureId, QVariant> mFidToKey; //! map feature back to fea QMap<QgsFeatureId, QVariant> mFidToKey; //! map feature back to fea
QgsFeatureId mFidCounter; //! next feature id if map is used
QgsOracleConn *mConnection; QgsOracleConn *mConnection;


bool mHasSpatialIndex; //! Geometry column is indexed bool mHasSpatialIndex; //! Geometry column is indexed
Expand Down
1 change: 1 addition & 0 deletions src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
Expand Up @@ -89,6 +89,7 @@ namespace Sqlite
{ {
Query::Query( sqlite3* db, const QString& q ) Query::Query( sqlite3* db, const QString& q )
: db_( db ) : db_( db )
, stmt_( nullptr )
, nBind_( 1 ) , nBind_( 1 )
{ {
QByteArray ba( q.toLocal8Bit() ); QByteArray ba( q.toLocal8Bit() );
Expand Down

0 comments on commit 786b77a

Please sign in to comment.