Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jul 6, 2016
1 parent 01f61c5 commit 0fc21a8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/providers/oracle/qgsoracledataitems.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ void QgsOracleConnectionItem::refresh()

void QgsOracleConnectionItem::setAllAsPopulated()
{
Q_FOREACH ( QgsDataItem *child, mChildren )
{
child->setState( Populated );
}
setState( Populated );
Q_FOREACH ( QgsDataItem *child, mChildren )
{
child->setState( Populated );
}
setState( Populated );
}

QVector<QgsDataItem*> QgsOracleConnectionItem::createChildren()
Expand Down
3 changes: 0 additions & 3 deletions src/providers/oracle/qgsoraclefeatureiterator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour

//NOTE - must be last added!
mExpressionCompiled = false;
mCompileStatus = NoCompilation;
QString fallbackStatement;
bool useFallback = false;
if ( request.filterType() == QgsFeatureRequest::FilterExpression )
Expand All @@ -181,7 +180,6 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour

//if only partial success when compiling expression, we need to double-check results using QGIS' expressions
mExpressionCompiled = ( result == QgsSqlExpressionCompiler::Complete );
mCompileStatus = ( mExpressionCompiled ? Compiled : PartiallyCompiled );
limitAtProvider = mExpressionCompiled;
}
else
Expand Down Expand Up @@ -216,7 +214,6 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
if ( result )
{
mExpressionCompiled = false;
mCompileStatus = NoCompilation;
}
}
}
Expand Down

0 comments on commit 0fc21a8

Please sign in to comment.