Fix Travis build, take 2

nyalldawson · nyalldawson · commit 7ce8cade8e4c · 2016-07-02T11:16:00.000+10:00
diff --git a/python/core/symbology-ng/qgspointdisplacementrenderer.sip b/python/core/symbology-ng/qgspointdisplacementrenderer.sip
@@ -69,7 +69,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
     QString labelAttributeName() const;
 
     void setEmbeddedRenderer( QgsFeatureRendererV2* r /Transfer/ );
-    QgsFeatureRendererV2* embeddedRenderer();
+    const QgsFeatureRendererV2* embeddedRenderer() const;
 
     virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol );
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2985,7 +2985,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
         mDataProvider->uniqueValues( index, uniqueValues, limit );
         return;
       }
-
+      FALLTHROUGH;
       //we need to go through each feature
     case QgsFields::OriginJoin:
     case QgsFields::OriginExpression:
@@ -3046,7 +3046,7 @@ QVariant QgsVectorLayer::minimumValue( int index )
         return mDataProvider->minimumValue( index );
       }
     }
-
+    FALLTHROUGH;
     // no choice but to go through all features
     case QgsFields::OriginExpression:
     case QgsFields::OriginJoin:
@@ -3104,7 +3104,7 @@ QVariant QgsVectorLayer::maximumValue( int index )
         return mDataProvider->maximumValue( index );
       }
 
-
+      FALLTHROUGH;
       //no choice but to go through each feature
     case QgsFields::OriginJoin:
     case QgsFields::OriginExpression:

Original file line number	Diff line number	Diff line change
`@@ -2985,7 +2985,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`2985`	`2985`	`mDataProvider->uniqueValues( index, uniqueValues, limit );`
`2986`	`2986`	`return;`
`2987`	`2987`	`}`
`2988`		`-`
	`2988`	`+ FALLTHROUGH;`
`2989`	`2989`	`//we need to go through each feature`
`2990`	`2990`	`case QgsFields::OriginJoin:`
`2991`	`2991`	`case QgsFields::OriginExpression:`
`@@ -3046,7 +3046,7 @@ QVariant QgsVectorLayer::minimumValue( int index )`
`3046`	`3046`	`return mDataProvider->minimumValue( index );`
`3047`	`3047`	`}`
`3048`	`3048`	`}`
`3049`		`-`
	`3049`	`+ FALLTHROUGH;`
`3050`	`3050`	`// no choice but to go through all features`
`3051`	`3051`	`case QgsFields::OriginExpression:`
`3052`	`3052`	`case QgsFields::OriginJoin:`
`@@ -3104,7 +3104,7 @@ QVariant QgsVectorLayer::maximumValue( int index )`
`3104`	`3104`	`return mDataProvider->maximumValue( index );`
`3105`	`3105`	`}`
`3106`	`3106`
`3107`		`-`
	`3107`	`+ FALLTHROUGH;`
`3108`	`3108`	`//no choice but to go through each feature`
`3109`	`3109`	`case QgsFields::OriginJoin:`
`3110`	`3110`	`case QgsFields::OriginExpression:`