Code style

m-kuhn · m-kuhn · commit d3a12dc63ad5 · 2019-03-09T11:49:37.000+01:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1633,7 +1633,6 @@ void QgsPalLayerSettings::registerFeature( const QgsFeature &f, QgsRenderContext
       quadOffsetY = -1.0;
       break;
     case QuadrantOver:
-    default:
       break;
   }
 
@@ -2133,7 +2132,7 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,
       case DDOpacity:
       {
         bool ok;
-        int size = exprVal.toDouble( &ok );
+        int size = exprVal.toInt( &ok );
         if ( ok && size >= 0 && size <= 100 )
         {
           dataDefinedValues.insert( p, QVariant( size ) );

Original file line number	Diff line number	Diff line change
`@@ -1633,7 +1633,6 @@ void QgsPalLayerSettings::registerFeature( const QgsFeature &f, QgsRenderContext`
`1633`	`1633`	`quadOffsetY = -1.0;`
`1634`	`1634`	`break;`
`1635`	`1635`	`case QuadrantOver:`
`1636`		`- default:`
`1637`	`1636`	`break;`
`1638`	`1637`	`}`
`1639`	`1638`
`@@ -2133,7 +2132,7 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,`
`2133`	`2132`	`case DDOpacity:`
`2134`	`2133`	`{`
`2135`	`2134`	`bool ok;`
`2136`		`- int size = exprVal.toDouble( &ok );`
	`2135`	`+ int size = exprVal.toInt( &ok );`
`2137`	`2136`	`if ( ok && size >= 0 && size <= 100 )`
`2138`	`2137`	`{`
`2139`	`2138`	`dataDefinedValues.insert( p, QVariant( size ) );`