Skip to content

Commit b508790

Browse files
committed
fix precise build (+ foreach->Q_FOREACH)
1 parent e19ad4b commit b508790

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF
6464
{
6565
QString values = quotedColumn( mDefinition.uid() ) + " IN (";
6666
bool first = true;
67-
foreach ( auto& v, request.filterFids() )
67+
Q_FOREACH ( const QgsFeatureId &v, request.filterFids() )
6868
{
6969
if ( !first )
7070
{
@@ -82,7 +82,7 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF
8282
{
8383

8484
// copy only selected fields
85-
foreach ( int idx, request.subsetOfAttributes() )
85+
Q_FOREACH ( int idx, request.subsetOfAttributes() )
8686
{
8787
mAttributes << idx;
8888
}
@@ -103,7 +103,7 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF
103103
{
104104
columns = "0";
105105
}
106-
foreach ( int i, mAttributes )
106+
Q_FOREACH ( int i, mAttributes )
107107
{
108108
columns += ",";
109109
QString cname = mFields.at( i ).name().toLower();
@@ -190,7 +190,7 @@ bool QgsVirtualLayerFeatureIterator::fetchFeature( QgsFeature& feature )
190190

191191
int n = mQuery->columnCount();
192192
int i = 0;
193-
foreach ( int idx, mAttributes )
193+
Q_FOREACH ( int idx, mAttributes )
194194
{
195195
int type = mQuery->columnType( i + 1 );
196196
switch ( type )

src/providers/virtual/qgsvirtuallayerprovider.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ QgsVirtualLayerProvider::QgsVirtualLayerProvider( QString const &uri )
9797

9898
bool QgsVirtualLayerProvider::loadSourceLayers()
9999
{
100-
foreach ( const QgsVirtualLayerDefinition::SourceLayer& layer, mDefinition.sourceLayers() )
100+
Q_FOREACH ( const QgsVirtualLayerDefinition::SourceLayer &layer, mDefinition.sourceLayers() )
101101
{
102102
if ( layer.isReferenced() )
103103
{
@@ -221,7 +221,7 @@ bool QgsVirtualLayerProvider::createIt()
221221
{
222222

223223
QStringList tables = referencedTables( mDefinition.query() );
224-
foreach ( const QString& tname, tables )
224+
Q_FOREACH ( const QString &tname, tables )
225225
{
226226
// is it in source layers ?
227227
if ( mDefinition.hasSourceLayer( tname ) )
@@ -230,7 +230,7 @@ bool QgsVirtualLayerProvider::createIt()
230230
}
231231
// is it in loaded layers ?
232232
bool found = false;
233-
foreach ( const QgsMapLayer* l, QgsMapLayerRegistry::instance()->mapLayers() )
233+
Q_FOREACH ( const QgsMapLayer *l, QgsMapLayerRegistry::instance()->mapLayers() )
234234
{
235235
if ( l->type() != QgsMapLayer::VectorLayer )
236236
continue;
@@ -418,7 +418,7 @@ bool QgsVirtualLayerProvider::createIt()
418418
mTableName = mLayers[0].name;
419419

420420
TableDef td = tableDefinitionFromVirtualTable( mSqlite.get(), mTableName );
421-
foreach ( const ColumnDef& c, td )
421+
Q_FOREACH ( const ColumnDef &c, td )
422422
{
423423
if ( !c.isGeometry() )
424424
{

0 commit comments

Comments
 (0)