Skip to content

Commit bab8b78

Browse files
committed
Use correct member variable prefix
1 parent 79ba0ee commit bab8b78

File tree

2 files changed

+29
-33
lines changed

2 files changed

+29
-33
lines changed

src/providers/ogr/qgsogrfeatureiterator.cpp

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@
4040

4141
QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool ownSource, const QgsFeatureRequest &request )
4242
: QgsAbstractFeatureIteratorFromSource<QgsOgrFeatureSource>( source, ownSource, request )
43-
, mSubsetStringSet( false )
44-
, mOrigFidAdded( false )
45-
, mFetchGeometry( false )
46-
, mExpressionCompiled( false )
4743
, mFilterFids( mRequest.filterFids() )
4844
, mFilterFidsIt( mFilterFids.constBegin() )
4945
{
@@ -56,21 +52,21 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
5652

5753
if ( mSource->mLayerName.isNull() )
5854
{
59-
ogrLayer = GDALDatasetGetLayer( mConn->ds, mSource->mLayerIndex );
55+
mOgrLayer = GDALDatasetGetLayer( mConn->ds, mSource->mLayerIndex );
6056
}
6157
else
6258
{
63-
ogrLayer = GDALDatasetGetLayerByName( mConn->ds, mSource->mLayerName.toUtf8().constData() );
59+
mOgrLayer = GDALDatasetGetLayerByName( mConn->ds, mSource->mLayerName.toUtf8().constData() );
6460
}
65-
if ( !ogrLayer )
61+
if ( !mOgrLayer )
6662
{
6763
return;
6864
}
6965

7066
if ( !mSource->mSubsetString.isEmpty() )
7167
{
72-
ogrLayer = QgsOgrProviderUtils::setSubsetString( ogrLayer, mConn->ds, mSource->mEncoding, mSource->mSubsetString, mOrigFidAdded );
73-
if ( !ogrLayer )
68+
mOgrLayer = QgsOgrProviderUtils::setSubsetString( mOgrLayer, mConn->ds, mSource->mEncoding, mSource->mSubsetString, mOrigFidAdded );
69+
if ( !mOgrLayer )
7470
{
7571
return;
7672
}
@@ -131,17 +127,17 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
131127
// filter if we choose to ignore them (fixes #11223)
132128
if ( ( mSource->mDriverName != QLatin1String( "VRT" ) && mSource->mDriverName != QLatin1String( "OGR_VRT" ) ) || mFilterRect.isNull() )
133129
{
134-
QgsOgrProviderUtils::setRelevantFields( ogrLayer, mSource->mFields.count(), mFetchGeometry, attrs, mSource->mFirstFieldIsFid );
130+
QgsOgrProviderUtils::setRelevantFields( mOgrLayer, mSource->mFields.count(), mFetchGeometry, attrs, mSource->mFirstFieldIsFid );
135131
}
136132

137133
// spatial query to select features
138134
if ( !mFilterRect.isNull() )
139135
{
140-
OGR_L_SetSpatialFilterRect( ogrLayer, mFilterRect.xMinimum(), mFilterRect.yMinimum(), mFilterRect.xMaximum(), mFilterRect.yMaximum() );
136+
OGR_L_SetSpatialFilterRect( mOgrLayer, mFilterRect.xMinimum(), mFilterRect.yMinimum(), mFilterRect.xMaximum(), mFilterRect.yMaximum() );
141137
}
142138
else
143139
{
144-
OGR_L_SetSpatialFilter( ogrLayer, nullptr );
140+
OGR_L_SetSpatialFilter( mOgrLayer, nullptr );
145141
}
146142

147143
if ( request.filterType() == QgsFeatureRequest::FilterExpression
@@ -161,7 +157,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
161157
if ( result == QgsSqlExpressionCompiler::Complete || result == QgsSqlExpressionCompiler::Partial )
162158
{
163159
QString whereClause = compiler->result();
164-
if ( OGR_L_SetAttributeFilter( ogrLayer, mSource->mEncoding->fromUnicode( whereClause ).constData() ) == OGRERR_NONE )
160+
if ( OGR_L_SetAttributeFilter( mOgrLayer, mSource->mEncoding->fromUnicode( whereClause ).constData() ) == OGRERR_NONE )
165161
{
166162
//if only partial success when compiling expression, we need to double-check results using QGIS' expressions
167163
mExpressionCompiled = ( result == QgsSqlExpressionCompiler::Complete );
@@ -170,14 +166,14 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
170166
}
171167
else
172168
{
173-
OGR_L_SetAttributeFilter( ogrLayer, nullptr );
169+
OGR_L_SetAttributeFilter( mOgrLayer, nullptr );
174170
}
175171

176172
delete compiler;
177173
}
178174
else
179175
{
180-
OGR_L_SetAttributeFilter( ogrLayer, nullptr );
176+
OGR_L_SetAttributeFilter( mOgrLayer, nullptr );
181177
}
182178

183179

@@ -204,12 +200,12 @@ bool QgsOgrFeatureIterator::fetchFeatureWithId( QgsFeatureId id, QgsFeature &fea
204200
gdal::ogr_feature_unique_ptr fet;
205201
if ( mOrigFidAdded )
206202
{
207-
OGR_L_ResetReading( ogrLayer );
208-
OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( ogrLayer );
203+
OGR_L_ResetReading( mOgrLayer );
204+
OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( mOgrLayer );
209205
int lastField = OGR_FD_GetFieldCount( fdef ) - 1;
210206
if ( lastField >= 0 )
211207
{
212-
while ( fet.reset( OGR_L_GetNextFeature( ogrLayer ) ), fet )
208+
while ( fet.reset( OGR_L_GetNextFeature( mOgrLayer ) ), fet )
213209
{
214210
if ( OGR_F_GetFieldAsInteger64( fet.get(), lastField ) == id )
215211
{
@@ -220,7 +216,7 @@ bool QgsOgrFeatureIterator::fetchFeatureWithId( QgsFeatureId id, QgsFeature &fea
220216
}
221217
else
222218
{
223-
fet.reset( OGR_L_GetFeature( ogrLayer, FID_TO_NUMBER( id ) ) );
219+
fet.reset( OGR_L_GetFeature( mOgrLayer, FID_TO_NUMBER( id ) ) );
224220
}
225221

226222
if ( !fet )
@@ -239,7 +235,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature &feature )
239235
{
240236
feature.setValid( false );
241237

242-
if ( mClosed || !ogrLayer )
238+
if ( mClosed || !mOgrLayer )
243239
return false;
244240

245241
if ( mRequest.filterType() == QgsFeatureRequest::FilterFid )
@@ -264,7 +260,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature &feature )
264260

265261
gdal::ogr_feature_unique_ptr fet;
266262

267-
while ( fet.reset( OGR_L_GetNextFeature( ogrLayer ) ), fet )
263+
while ( fet.reset( OGR_L_GetNextFeature( mOgrLayer ) ), fet )
268264
{
269265
if ( !readFeature( std::move( fet ), feature ) )
270266
continue;
@@ -286,10 +282,10 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature &feature )
286282

287283
bool QgsOgrFeatureIterator::rewind()
288284
{
289-
if ( mClosed || !ogrLayer )
285+
if ( mClosed || !mOgrLayer )
290286
return false;
291287

292-
OGR_L_ResetReading( ogrLayer );
288+
OGR_L_ResetReading( mOgrLayer );
293289

294290
mFilterFidsIt = mFilterFids.constBegin();
295291

@@ -305,14 +301,14 @@ bool QgsOgrFeatureIterator::close()
305301
iteratorClosed();
306302

307303
// Will for example release SQLite3 statements
308-
if ( ogrLayer )
304+
if ( mOgrLayer )
309305
{
310-
OGR_L_ResetReading( ogrLayer );
306+
OGR_L_ResetReading( mOgrLayer );
311307
}
312308

313309
if ( mSubsetStringSet )
314310
{
315-
GDALDatasetReleaseResultSet( mConn->ds, ogrLayer );
311+
GDALDatasetReleaseResultSet( mConn->ds, mOgrLayer );
316312
}
317313

318314
if ( mConn )
@@ -322,7 +318,7 @@ bool QgsOgrFeatureIterator::close()
322318
}
323319

324320
mConn = nullptr;
325-
ogrLayer = nullptr;
321+
mOgrLayer = nullptr;
326322

327323
mClosed = true;
328324
return true;
@@ -350,7 +346,7 @@ bool QgsOgrFeatureIterator::readFeature( gdal::ogr_feature_unique_ptr fet, QgsFe
350346
{
351347
if ( mOrigFidAdded )
352348
{
353-
OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( ogrLayer );
349+
OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( mOgrLayer );
354350
int lastField = OGR_FD_GetFieldCount( fdef ) - 1;
355351
if ( lastField >= 0 )
356352
feature.setId( OGR_F_GetFieldAsInteger64( fet.get(), lastField ) );

src/providers/ogr/qgsogrfeatureiterator.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ class QgsOgrFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsOgr
7272
void getFeatureAttribute( OGRFeatureH ogrFet, QgsFeature &f, int attindex ) const;
7373

7474
QgsOgrConn *mConn = nullptr;
75-
OGRLayerH ogrLayer = nullptr;
75+
OGRLayerH mOgrLayer = nullptr;
7676

77-
bool mSubsetStringSet;
78-
bool mOrigFidAdded;
77+
bool mSubsetStringSet = false;
78+
bool mOrigFidAdded = false;
7979

8080
//! Sets to true, if geometry is in the requested columns
81-
bool mFetchGeometry;
81+
bool mFetchGeometry = false;
8282

83-
bool mExpressionCompiled;
83+
bool mExpressionCompiled = false;
8484
QgsFeatureIds mFilterFids;
8585
QgsFeatureIds::const_iterator mFilterFidsIt;
8686

0 commit comments

Comments
 (0)