Skip to content

Commit 786b77a

Browse files
committed
Fix uninitialized members
1 parent 5f6dfae commit 786b77a

File tree

5 files changed

+5
-2
lines changed

5 files changed

+5
-2
lines changed

src/core/composer/qgscomposerlegend.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
4040
, mCustomLayerTree( nullptr )
4141
, mComposerMap( nullptr )
4242
, mLegendFilterByMap( false )
43+
, mLegendFilterByExpression( false )
4344
, mFilterOutAtlas( false )
4445
, mFilterAskedForUpdate( false )
4546
, mInAtlas( false )

src/core/qgsfeaturerequest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ QgsFeatureRequest::QgsFeatureRequest( QgsFeatureId fid )
4242

4343
QgsFeatureRequest::QgsFeatureRequest( QgsFeatureIds fids )
4444
: mFilter( FilterFids )
45+
, mFilterFid( -1 )
4546
, mFilterFids( fids )
4647
, mFilterExpression( nullptr )
4748
, mFlags( nullptr )

src/providers/oracle/qgsoracleprovider.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ const QString ORACLE_DESCRIPTION = "Oracle data provider";
4747
QgsOracleProvider::QgsOracleProvider( QString const & uri )
4848
: QgsVectorDataProvider( uri )
4949
, mValid( false )
50+
, mIsQuery( false )
5051
, mPrimaryKeyType( pktUnknown )
52+
, mFeaturesCounted( -1 )
5153
, mDetectedGeomType( QgsWkbTypes::Unknown )
5254
, mRequestedGeomType( QgsWkbTypes::Unknown )
5355
, mHasSpatialIndex( false )
@@ -133,7 +135,6 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )
133135
}
134136

135137
mLayerExtent.setMinimal();
136-
mFeaturesCounted = -1;
137138

138139
// set the primary key
139140
if ( !determinePrimaryKey() )

src/providers/oracle/qgsoracleprovider.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ class QgsOracleProvider : public QgsVectorDataProvider
409409

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

415414
bool mHasSpatialIndex; //! Geometry column is indexed

src/providers/virtual/qgsvirtuallayersqlitehelper.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ namespace Sqlite
8989
{
9090
Query::Query( sqlite3* db, const QString& q )
9191
: db_( db )
92+
, stmt_( nullptr )
9293
, nBind_( 1 )
9394
{
9495
QByteArray ba( q.toLocal8Bit() );

0 commit comments

Comments
 (0)