Skip to content

Commit 48c7e31

Browse files
committedNov 11, 2017
Fix Coverity uninitialized member warnings
1 parent 450887e commit 48c7e31

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed
 

‎src/3d/chunks/qgschunkedentity_p.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class QgsChunkedEntity : public Qt3DCore::QEntity
103103
//! root node of the quadtree hierarchy
104104
QgsChunkNode *mRootNode = nullptr;
105105
//! A chunk has been loaded recently? let's display it!
106-
bool mNeedsUpdate;
106+
bool mNeedsUpdate = false;
107107
//! max. allowed screen space error
108108
float mTau;
109109
//! maximum allowed depth of quad tree
@@ -117,14 +117,14 @@ class QgsChunkedEntity : public Qt3DCore::QEntity
117117
//! list of nodes that are being currently used for rendering
118118
QList<QgsChunkNode *> mActiveNodes;
119119
//! number of nodes omitted during frustum culling - for the curious ones
120-
int mFrustumCulled;
120+
int mFrustumCulled = 0;
121121

122122
// TODO: max. length for loading queue
123123

124124
QTime mCurrentTime;
125125

126126
//! max. length for replacement queue
127-
int mMaxLoadedChunks;
127+
int mMaxLoadedChunks = 512;
128128

129129
//! Entity that shows bounding boxes of active chunks (null if not enabled)
130130
QgsChunkBoundsEntity *mBboxesEntity = nullptr;

‎src/3d/terrain/qgsterraintextureimage_p.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ QgsTerrainTextureImage::QgsTerrainTextureImage( const QImage &image, const QgsRe
7272
, mExtent( extent )
7373
, mDebugText( debugText )
7474
, mImage( image )
75-
, mVersion( 1 )
7675
{
7776
}
7877

‎src/3d/terrain/qgsterraintextureimage_p.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ class QgsTerrainTextureImage : public Qt3DRender::QAbstractTextureImage
6464
QgsRectangle mExtent;
6565
QString mDebugText;
6666
QImage mImage;
67-
int mVersion;
68-
int mJobId;
67+
int mVersion = 1;
6968
};
7069

7170
/// @endcond

‎src/3d/terrain/qgsterraintileloader_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class QgsTerrainTileLoader : public QgsChunkLoader
6363
QgsTerrainEntity *mTerrain = nullptr;
6464
QgsRectangle mExtentMapCrs;
6565
QString mTileDebugText;
66-
int mTextureJobId;
66+
int mTextureJobId = -1;
6767
QImage mTextureImage;
6868
};
6969

‎src/core/qgsrelation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ class CORE_EXPORT QgsRelation
370370
//! The parent layer
371371
QgsVectorLayer *mReferencedLayer = nullptr;
372372

373-
RelationStrength mRelationStrength;
373+
RelationStrength mRelationStrength = Association;
374374

375375
/**
376376
* A list of fields which define the relation.

‎src/providers/postgres/qgspostgresfeatureiterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class QgsPostgresFeatureIterator : public QgsAbstractFeatureIteratorFromSource<Q
111111
//! Set to true, if geometry is in the requested columns
112112
bool mFetchGeometry;
113113

114-
bool mIsTransactionConnection;
114+
bool mIsTransactionConnection = false;
115115

116116
virtual bool providerCanSimplify( QgsSimplifyMethod::MethodType methodType ) const override;
117117

‎src/providers/spatialite/qgsspatialitefeatureiterator.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,18 @@ class QgsSpatiaLiteFeatureIterator : public QgsAbstractFeatureIteratorFromSource
9090
sqlite3_stmt *sqliteStatement = nullptr;
9191

9292
//! Geometry column index used when fetching geometry
93-
int mGeomColIdx;
93+
int mGeomColIdx = 1;
9494

9595
//! Set to true, if geometry is in the requested columns
96-
bool mFetchGeometry;
96+
bool mFetchGeometry = true;
9797

9898
bool mHasPrimaryKey;
9999
QgsFeatureId mRowNumber;
100100

101101
bool prepareOrderBy( const QList<QgsFeatureRequest::OrderByClause> &orderBys ) override;
102102

103-
bool mOrderByCompiled;
104-
bool mExpressionCompiled;
103+
bool mOrderByCompiled = false;
104+
bool mExpressionCompiled = false;
105105

106106
QgsRectangle mFilterRect;
107107
QgsCoordinateTransform mTransform;

0 commit comments

Comments
 (0)
Please sign in to comment.