Skip to content
Permalink
Browse files

Fix uninitialized members

  • Loading branch information
nyalldawson committed Aug 15, 2016
1 parent 5f6dfae commit 786b77a1574497a775c1ef7a524741e4093e15b5
@@ -40,6 +40,7 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
, mCustomLayerTree( nullptr )
, mComposerMap( nullptr )
, mLegendFilterByMap( false )
, mLegendFilterByExpression( false )
, mFilterOutAtlas( false )
, mFilterAskedForUpdate( false )
, mInAtlas( false )
@@ -42,6 +42,7 @@ QgsFeatureRequest::QgsFeatureRequest( QgsFeatureId fid )

QgsFeatureRequest::QgsFeatureRequest( QgsFeatureIds fids )
: mFilter( FilterFids )
, mFilterFid( -1 )
, mFilterFids( fids )
, mFilterExpression( nullptr )
, mFlags( nullptr )
@@ -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() )
@@ -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
@@ -89,6 +89,7 @@ namespace Sqlite
{
Query::Query( sqlite3* db, const QString& q )
: db_( db )
, stmt_( nullptr )
, nBind_( 1 )
{
QByteArray ba( q.toLocal8Bit() );

0 comments on commit 786b77a

Please sign in to comment.
You can’t perform that action at this time.