Try to fix astyle errors

qgis · Feb 12, 2019 · 76b7bce · 76b7bce
1 parent 493185c
commit 76b7bce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -351,7 +351,8 @@ void QgsFieldCalculator::populateOutputFieldTypes()
   mOutputFieldTypeComboBox->blockSignals( true );
 
   // Standard subset of fields in case of virtual
-  const QList< QgsVectorDataProvider::NativeType > &typelist { mCreateVirtualFieldCheckbox->isChecked() ? ( QList< QgsVectorDataProvider::NativeType >()
+  const QList< QgsVectorDataProvider::NativeType > &typelist = mCreateVirtualFieldCheckbox->isChecked() ?
+      ( QList< QgsVectorDataProvider::NativeType >()
         << QgsVectorDataProvider::NativeType( tr( "Whole number (integer)" ), QStringLiteral( "integer" ), QVariant::Int, 0, 10 )
         << QgsVectorDataProvider::NativeType( tr( "Decimal number (double)" ), QStringLiteral( "double precision" ), QVariant::Double, -1, -1, -1, -1 )
         << QgsVectorDataProvider::NativeType( tr( "Text (string)" ), QStringLiteral( "string" ), QVariant::String )
@@ -365,7 +366,7 @@ void QgsFieldCalculator::populateOutputFieldTypes()
         << QgsVectorDataProvider::NativeType( tr( "Boolean" ), QStringLiteral( "bool" ), QVariant::Bool )
         // blob
         << QgsVectorDataProvider::NativeType( tr( "Binary object (BLOB)" ), QStringLiteral( "binary" ), QVariant::ByteArray ) ) :
-    provider->nativeTypes() };
+      provider->nativeTypes();
 
   mOutputFieldTypeComboBox->clear();
   for ( int i = 0; i < typelist.size(); i++ )

diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -469,24 +469,24 @@ void QgsMultiBandColorRenderer::toSld( QDomDocument &doc, QDomElement &element,
                                mBlueContrastEnhancement->maximumValue() == statBlue.maximumValue )
                            );
   }
-  if ( isDefaultCombination ):
-      return
+  if ( isDefaultCombination )
+    return;
 #endif
 
-        // look for RasterSymbolizer tag
-        QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
-    if ( elements.size() == 0 )
-      return;
+  // look for RasterSymbolizer tag
+  QDomNodeList elements = element.elementsByTagName( QStringLiteral( "sld:RasterSymbolizer" ) );
+  if ( elements.size() == 0 )
+    return;
 
-    // there SHOULD be only one
-    QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
+  // there SHOULD be only one
+  QDomElement rasterSymbolizerElem = elements.at( 0 ).toElement();
 
-    // add Channel Selection tags
-    // Need to insert channelSelection in the correct sequence as in SLD standard e.g.
-    // after opacity or geometry or as first element after sld:RasterSymbolizer
-    QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
-    elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
-    if ( elements.size() != 0 )
+  // add Channel Selection tags
+  // Need to insert channelSelection in the correct sequence as in SLD standard e.g.
+  // after opacity or geometry or as first element after sld:RasterSymbolizer
+  QDomElement channelSelectionElem = doc.createElement( QStringLiteral( "sld:ChannelSelection" ) );
+  elements = rasterSymbolizerElem.elementsByTagName( QStringLiteral( "sld:Opacity" ) );
+  if ( elements.size() != 0 )
   {
     rasterSymbolizerElem.insertAfter( channelSelectionElem, elements.at( 0 ) );
   }