sip sync and indentation update

python/core/symbology-ng/qgsinvertedpolygonrenderer.sip

@@ -33,7 +33,7 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
      */
     virtual void stopRender( QgsRenderContext& context );
 
-  /** @returns a textual reprensation of the renderer */
+    /** @returns a textual representation of the renderer */
     virtual QString dump() const;
 
     /** Proxy that will call this method on the embedded renderer. */
@@ -48,6 +48,10 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
     virtual QgsSymbolV2List symbolsForFeature( QgsFeature& feat );
     /** Proxy that will call this method on the embedded renderer. */
     virtual QgsLegendSymbologyList legendSymbologyItems( QSize iconSize );
+    /** Proxy that will call this method on the embedded renderer.
+      @note not available in python bindings
+     */
+    // virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = "" );
     /** Proxy that will call this method on the embedded renderer. */
     virtual bool willRenderFeature( QgsFeature& feat );
 

scripts/astyle-all.sh

@@ -22,30 +22,6 @@ set -e
 export elcr="$(tput el)$(tput cr)"
 
 find python src tests -type f -print | while read f; do
-	case "$f" in
-        src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/sqlanywhere/sqlanyconnection/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
-                echo $f skipped
-                continue
-                ;;
-
-        *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp)
-                cmd=astyle.sh
-                ;;
-
-        *.ui|*.qgm|*.txt|*.t2t|*.sip|resources/context_help/*)
-                cmd="flip -ub"
-                ;;
-
-	*.py)
-                cmd="perl -i.prepare -pe 's/[\r\t ]+$//;'"
-		;;
-
-        *)
-                echo -ne "$f skipped $elcr"
-                continue
-                ;;
-        esac
-
         if [ -f "$f.astyle" ]; then
 		# reformat backup
                 cp "$f.astyle" "$f"
@@ -56,8 +32,8 @@ find python src tests -type f -print | while read f; do
                 touch -r "$f" "$f.astyle"
         fi
 
-  	echo -ne "Reformating $f $elcr"
-	eval "$cmd '$f'"
+	echo -ne "Reformatting $f $elcr"
+	astyle.sh "$f"
 done
 
 echo

scripts/astyle.sh

@@ -59,6 +59,30 @@ $ARTISTIC_STYLE_OPTIONS \
 --unpad=paren"
 
 for f in "$@"; do
+	case "$f" in
+        src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/sqlanywhere/sqlanyconnection/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
+                echo $f skipped
+                continue
+                ;;
+
+        *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp)
+                cmd="$ASTYLE $ARTISTIC_STYLE_OPTIONS"
+                ;;
+
+        *.ui|*.qgm|*.txt|*.t2t|*.sip|resources/context_help/*)
+                cmd=:
+                ;;
+
+        *.py)
+                cmd="perl -i.prepare -pe 's/[\r\t ]+$//;'"
+                ;;
+
+        *)
+                echo -ne "$f skipped $elcr"
+                continue
+                ;;
+        esac
+
 	if ! [ -f "$f" ]; then
 		echo "$f not found" >&2
 		continue
@@ -66,5 +90,5 @@ for f in "$@"; do
 
 	flip -ub "$f" 
 	#qgsloggermig.pl "$f"
-	$ASTYLE $ARTISTIC_STYLE_OPTIONS "$f"
+        eval "$cmd '$f'"
 done

src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp

@@ -30,10 +30,12 @@
 QgsInvertedPolygonRenderer::QgsInvertedPolygonRenderer( const QgsFeatureRendererV2* subRenderer )
     : QgsFeatureRendererV2( "invertedPolygonRenderer" )
 {
-  if ( subRenderer ) {
+  if ( subRenderer )
+  {
     setEmbeddedRenderer( subRenderer );
   }
-  else {
+  else
+  {
     mSubRenderer.reset( QgsFeatureRendererV2::defaultRenderer( QGis::Polygon ) );
   }
 }
@@ -44,10 +46,12 @@ QgsInvertedPolygonRenderer::~QgsInvertedPolygonRenderer()
 
 void QgsInvertedPolygonRenderer::setEmbeddedRenderer( const QgsFeatureRendererV2* subRenderer )
 {
-  if ( subRenderer ) {
+  if ( subRenderer )
+  {
     mSubRenderer.reset( const_cast<QgsFeatureRendererV2*>( subRenderer )->clone() );
   }
-  else {
+  else
+  {
     mSubRenderer.reset( 0 );
   }
 }
@@ -59,7 +63,8 @@ const QgsFeatureRendererV2* QgsInvertedPolygonRenderer::embeddedRenderer() const
 
 void QgsInvertedPolygonRenderer::startRender( QgsRenderContext& context, const QgsFields& fields )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return;
   }
 
@@ -125,7 +130,8 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
   // This QByteArray can then be used as a key for a QMap where the list of
   // features for this category is stored
   QByteArray catId;
-  if ( capabilities() & MoreSymbolsPerFeature ) {
+  if ( capabilities() & MoreSymbolsPerFeature )
+  {
     QgsSymbolV2List syms( mSubRenderer->symbolsForFeature( feature ) );
     foreach ( QgsSymbolV2* sym, syms )
     {
@@ -136,7 +142,8 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
   else
   {
     QgsSymbolV2* sym = mSubRenderer->symbolForFeature( feature );
-    if (sym) {
+    if ( sym )
+    {
       catId.append( reinterpret_cast<const char*>( &sym ), sizeof( sym ) );
     }
   }
@@ -174,20 +181,25 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
     return false;
   }
   if (( geom->wkbType() == QGis::WKBPolygon ) ||
-       (geom->wkbType() == QGis::WKBPolygon25D) ) {
+      ( geom->wkbType() == QGis::WKBPolygon25D ) )
+  {
     multi.append( geom->asPolygon() );
   }
   else if (( geom->wkbType() == QGis::WKBMultiPolygon ) ||
-            (geom->wkbType() == QGis::WKBMultiPolygon25D) ) {
+           ( geom->wkbType() == QGis::WKBMultiPolygon25D ) )
+  {
     multi = geom->asMultiPolygon();
   }
 
-  for ( int i = 0; i < multi.size(); i++ ) {
+  for ( int i = 0; i < multi.size(); i++ )
+  {
     // add the exterior ring as interior ring to the first polygon
-    if ( mTransform ) {
+    if ( mTransform )
+    {
       QgsPolyline new_ls;
       QgsPolyline& old_ls = multi[i][0];
-      for ( int k = 0; k < old_ls.size(); k++ ) {
+      for ( int k = 0; k < old_ls.size(); k++ )
+      {
         new_ls.append( mTransform->transform( old_ls[k] ) );
       }
       cFeat.multiPolygon[0].append( new_ls );
@@ -197,12 +209,15 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
       cFeat.multiPolygon[0].append( multi[i][0] );
     }
     // add interior rings as new polygons
-    for ( int j = 1; j < multi[i].size(); j++ ) {
+    for ( int j = 1; j < multi[i].size(); j++ )
+    {
       QgsPolygon new_poly;
-      if ( mTransform ) {
+      if ( mTransform )
+      {
         QgsPolyline new_ls;
         QgsPolyline& old_ls = multi[i][j];
-        for ( int k = 0; k < old_ls.size(); k++ ) {
+        for ( int k = 0; k < old_ls.size(); k++ )
+        {
           new_ls.append( mTransform->transform( old_ls[k] ) );
         }
         new_poly.append( new_ls );
@@ -220,7 +235,8 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
 
 void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return;
   }
 
@@ -260,7 +276,8 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
 
 QString QgsInvertedPolygonRenderer::dump() const
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return "INVERTED: NULL";
   }
   return "INVERTED [" + mSubRenderer->dump() + "]";
@@ -304,7 +321,8 @@ QDomElement QgsInvertedPolygonRenderer::save( QDomDocument& doc )
 
 QgsSymbolV2* QgsInvertedPolygonRenderer::symbolForFeature( QgsFeature& feature )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return 0;
   }
   return mSubRenderer->symbolForFeature( feature );
@@ -312,7 +330,8 @@ QgsSymbolV2* QgsInvertedPolygonRenderer::symbolForFeature( QgsFeature& feature )
 
 QgsSymbolV2List QgsInvertedPolygonRenderer::symbolsForFeature( QgsFeature& feature )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return QgsSymbolV2List();
   }
   return mSubRenderer->symbolsForFeature( feature );
@@ -320,7 +339,8 @@ QgsSymbolV2List QgsInvertedPolygonRenderer::symbolsForFeature( QgsFeature& featu
 
 QgsSymbolV2List QgsInvertedPolygonRenderer::symbols()
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return QgsSymbolV2List();
   }
   return mSubRenderer->symbols();
@@ -328,7 +348,8 @@ QgsSymbolV2List QgsInvertedPolygonRenderer::symbols()
 
 int QgsInvertedPolygonRenderer::capabilities()
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return 0;
   }
   return mSubRenderer->capabilities();
@@ -336,7 +357,8 @@ int QgsInvertedPolygonRenderer::capabilities()
 
 QList<QString> QgsInvertedPolygonRenderer::usedAttributes()
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return QList<QString>();
   }
   return mSubRenderer->usedAttributes();
@@ -344,7 +366,8 @@ QList<QString> QgsInvertedPolygonRenderer::usedAttributes()
 
 QgsLegendSymbologyList QgsInvertedPolygonRenderer::legendSymbologyItems( QSize iconSize )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return QgsLegendSymbologyList();
   }
   return mSubRenderer->legendSymbologyItems( iconSize );
@@ -352,7 +375,8 @@ QgsLegendSymbologyList QgsInvertedPolygonRenderer::legendSymbologyItems( QSize i
 
 QgsLegendSymbolList QgsInvertedPolygonRenderer::legendSymbolItems( double scaleDenominator, QString rule )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return QgsLegendSymbolList();
   }
   return mSubRenderer->legendSymbolItems( scaleDenominator, rule );
@@ -360,7 +384,8 @@ QgsLegendSymbolList QgsInvertedPolygonRenderer::legendSymbolItems( double scaleD
 
 bool QgsInvertedPolygonRenderer::willRenderFeature( QgsFeature& feat )
 {
-  if ( !mSubRenderer ) {
+  if ( !mSubRenderer )
+  {
     return false;
   }
   return mSubRenderer->willRenderFeature( feat );

src/core/symbology-ng/qgsinvertedpolygonrenderer.h

@@ -69,7 +69,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2
      */
     virtual void stopRender( QgsRenderContext& context );
 
-  /** @returns a textual reprensation of the renderer */
+    /** @returns a textual representation of the renderer */
     virtual QString dump() const;
 
     /** Proxy that will call this method on the embedded renderer. */
@@ -84,7 +84,9 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2
     virtual QgsSymbolV2List symbolsForFeature( QgsFeature& feat );
     /** Proxy that will call this method on the embedded renderer. */
     virtual QgsLegendSymbologyList legendSymbologyItems( QSize iconSize );
-  /** Proxy that will call this method on the embedded renderer. */
+    /** Proxy that will call this method on the embedded renderer.
+      @note not available in python bindings
+     */
     virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = "" );
     /** Proxy that will call this method on the embedded renderer. */
     virtual bool willRenderFeature( QgsFeature& feat );

src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp

@@ -29,7 +29,8 @@ QgsRendererV2Widget* QgsInvertedPolygonRendererWidget::create( QgsVectorLayer* l
 QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
     : QgsRendererV2Widget( layer, style )
 {
-  if ( !layer ) {
+  if ( !layer )
+  {
     return;
   }
 
@@ -122,7 +123,8 @@ void QgsInvertedPolygonRendererWidget::on_mRendererComboBox_currentIndexChanged(
   {
     mEmbeddedRendererWidget.reset( m->createRendererWidget( mLayer, mStyle, const_cast<QgsFeatureRendererV2*>( mRenderer->embeddedRenderer() )->clone() ) );
 
-    if ( mLayout->count() > 1 ) {
+    if ( mLayout->count() > 1 )
+    {
       // remove the current renderer widget
       mLayout->takeAt( 1 );
     }