Const iterate to avoid copy; fix empty group expression case

qgis · Jan 18, 2021 · 3272a88 · 3272a88
1 parent cbe1b04
commit 3272a88
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/analysis/processing/qgsalgorithmpointstolines.cpp b/src/analysis/processing/qgsalgorithmpointstolines.cpp
@@ -98,8 +98,8 @@ QVariantMap QgsPointsToLinesAlgorithm::processAlgorithm( const QVariantMap &para
   orderExpression.prepare( &expressionContext );
 
   QgsFields outputFields = QgsFields();
-  QString groupExpressionString = parameterAsString( parameters, QStringLiteral( "GROUP_EXPRESSION" ), context );
-  QgsExpression groupExpression = QgsExpression( groupExpressionString );
+  const QString groupExpressionString = parameterAsString( parameters, QStringLiteral( "GROUP_EXPRESSION" ), context );
+  QgsExpression groupExpression = groupExpressionString.isEmpty() ? QgsExpression( QString( "true" ) ) : QgsExpression( groupExpressionString );
   if ( groupExpression.hasParserError() )
     throw QgsProcessingException( groupExpression.parserErrorString() );
   if ( ! groupExpressionString.isEmpty() )
@@ -191,14 +191,14 @@ QVariantMap QgsPointsToLinesAlgorithm::processAlgorithm( const QVariantMap &para
 
 
     QVector<QgsPoint> linePoints;
-    for ( const auto pair : pairs )
+    for ( QVector< QPair< QVariant, const QgsPoint * > >::ConstIterator pit = pairs.constBegin(); pit != pairs.constEnd(); ++pit )
     {
       if ( feedback->isCanceled() )
       {
         break;
       }
       feedback->setProgress( currentPoint * totalPoints );
-      linePoints.append( *pair.second );
+      linePoints.append( *pit->second );
       ++currentPoint;
     }
     if ( linePoints.size() < 2 )