indentation update

python/core/composer/qgsatlascomposition.sip

@@ -188,7 +188,7 @@ public:
     const QString& currentFilename() const;
 
     void writeXML( QDomElement& elem, QDomDocument& doc ) const;
-    
+
     /**Reads general atlas settings from xml
      * @param elem a QDomElement holding the atlas properties.
      * @param doc QDomDocument for the source xml.

python/core/composer/qgscomposerframe.sip

@@ -23,7 +23,7 @@ class QgsComposerFrame: QgsComposerItem
     int type() const;
 
     QgsComposerMultiFrame* multiFrame() const;
-    
+
     //Overriden to allow multiframe to set display name
     virtual QString displayName() const;
 };

python/core/composer/qgscomposerhtml.sip

@@ -5,15 +5,15 @@ class QgsComposerHtml: QgsComposerMultiFrame
 %End
 
  public:
- 
+
     /** Source modes for the HTML content to render in the item
     */
     enum ContentMode
     {
       Url, /*< Using this mode item fetches its content via a url*/
       ManualHtml /*< HTML content is manually set for the item*/
     };
-    
+
     QgsComposerHtml( QgsComposition* c, bool createUndoCommands );
     QgsComposerHtml();
     ~QgsComposerHtml();
@@ -73,7 +73,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
      * @note added in 2.5
      */
     QString html() const;
-    
+
     /**Returns whether html item will evaluate QGIS expressions prior to rendering
      * the HTML content. If set, any content inside [% %] tags will be
      * treated as a QGIS expression and evaluated against the current atlas
@@ -92,7 +92,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
      * @see evaluateExpressions
      * @note added in QGIS 2.5
      */
-    void setEvaluateExpressions( bool evaluateExpressions );    
+    void setEvaluateExpressions( bool evaluateExpressions );
 
     QSizeF totalSize() const;
     void render( QPainter* p, const QRectF& renderExtent );
@@ -144,7 +144,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
      * @see useSmartBreaks
      */
     double maxBreakDistance() const;
-    
+
     /**Sets the user stylesheet CSS rules to use while rendering the HTML content. These
      * allow for overriding the styles specified within the HTML source. Setting the stylesheet
      * using this function does not automatically refresh the item's contents. Call loadHtml
@@ -181,7 +181,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
      * @note added in 2.5
      */
     bool userStylesheetEnabled() const;
-    
+
     virtual QString displayName() const;
 
   public slots:
@@ -191,9 +191,9 @@ class QgsComposerHtml: QgsComposerMultiFrame
      * @see url
      */
     void loadHtml();
-    
+
     void refreshExpressionContext();
-    
+
     virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties );
 
 };

python/core/composer/qgscomposeritem.sip

@@ -452,7 +452,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @deprecated use QgsComposerUtils::fontDescentMM instead
      */
     double fontDescentMillimeters( const QFont& font ) const /Deprecated/;
-    
+
     /**Returns the font height in Millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE.
      * Font height equals the font ascent+descent+1 (for baseline).
      * @note Added in version 2.4
@@ -525,7 +525,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @see setId
     */
     QString uuid() const;
-    
+
     /**Get item display name. This is the item's id if set, and if
      * not, a user-friendly string identifying item type.
      * @returns display name for item
@@ -534,16 +534,16 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @note added in version 2.5
     */
     virtual QString displayName() const;
-    
+
     /**Sets visibility for item.
      * @param visible set to true to show item, false to hide item
      * @note QGraphicsItem::setVisible should not be called directly
      * on a QgsComposerItem, as some item types (eg groups) need to override
      * the visibility toggle.
      * @note added in version 2.5
     */
-    virtual void setVisibility( const bool visible );   
-    
+    virtual void setVisibility( const bool visible );
+
     /**Returns whether this item is part of a group
      * @returns true if item is in a group
      * @note added in version 2.5
@@ -643,7 +643,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @deprecated will be removed in QGIS 3.0
     */
     bool imageSizeConsideringRotation( double& width, double& height, double rotation ) const /Deprecated/;
-    
+
     /**Calculates width and hight of the picture (in mm) such that it fits into the item frame with the given rotation
      * @deprecated will be removed in QGIS 3.0
      */
@@ -662,7 +662,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @deprecated will be removed in QGIS 3.0
     */
     bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height, double rotation ) const /Deprecated/;
-    
+
     /**Calculates corner point after rotation and scaling
      * @deprecated will be removed in QGIS 3.0
      */
@@ -672,19 +672,19 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @deprecated will be removed in QGIS 3.0
     */
     void sizeChangedByRotation( double& width, double& height, double rotation ) /Deprecated/;
-    
+
     /**Calculates width / height of the bounding box of a rotated rectangle
      * @deprecated will be removed in QGIS 3.0
     */
     void sizeChangedByRotation( double& width, double& height ) /Deprecated/;
-    
+
     /**Rotates a point / vector
      * @param angle rotation angle in degrees, counterclockwise
      * @param x in/out: x coordinate before / after the rotation
      * @param y in/out: y cooreinate before / after the rotation
      * @deprecated use QgsComposerUtils:rotate instead
     */
-    void rotate( double angle, double& x, double& y ) const /Deprecated/;    
+    void rotate( double angle, double& x, double& y ) const /Deprecated/;
 
     /**Return horizontal align snap item. Creates a new graphics line if 0*/
     QGraphicsLineItem* hAlignSnapItem();

python/core/composer/qgscomposeritemgroup.sip

@@ -20,7 +20,7 @@ class QgsComposerItemGroup: QgsComposerItem
     /**Sets this items bound in scene coordinates such that 1 item size units
        corresponds to 1 scene size unit*/
     void setSceneRect( const QRectF& rectangle );
-    
+
     //overridden to also hide grouped items
     virtual void setVisibility( const bool visible );
 

python/core/composer/qgscomposerlabel.sip

@@ -75,7 +75,7 @@ class QgsComposerLabel : QgsComposerItem
        * @param doc document
        */
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
-    
+
     //Overriden to contain part of label's text
     virtual QString displayName() const;
 

python/core/composer/qgscomposermap.sip

@@ -494,7 +494,7 @@ class QgsComposerMap : QgsComposerItem
      * @see currentMapExtent
     */
     QPolygonF visibleExtentPolygon() const;
-    
+
     //overriden to show "Map 1" type names
     virtual QString displayName() const;
 

python/core/composer/qgscomposermodel.sip

@@ -15,14 +15,14 @@
  * stacking of items in the composition to the last known state, and emit the corresponding signals
  * as required.
  */
- 
+
 class QgsComposerModel : QAbstractItemModel
 {
 %TypeHeaderCode
 #include "qgscomposermodel.h"
 %End
   public:
-  
+
     /**Constructor
      * @param composition parent composition
      */
@@ -185,7 +185,7 @@ class QgsComposerModel : QAbstractItemModel
     void updateItemVisibility( QgsComposerItem *item );
 
   public slots:
-  
+
     /**Sets an item as the current selection from a QModelIndex
      * @param index QModelIndex of item to set as selected
      * @note added in QGIS 2.5

python/core/composer/qgscomposermultiframe.sip

@@ -72,7 +72,7 @@ class QgsComposerMultiFrame: QgsComposerObject
      * @note added in version 2.5
     */
     virtual QString displayName() const;
-    
+
   public slots:
 
     /**Recalculates the portion of the multiframe item which is shown in each of it's
@@ -90,7 +90,7 @@ class QgsComposerMultiFrame: QgsComposerObject
 
   signals:
     void changed();
-    
+
     /**Emitted when the contents of the multi frame have changed and the frames
      * must be redrawn.
     */

python/core/composer/qgscomposermultiframecommand.sip

@@ -12,15 +12,15 @@ class QgsComposerMultiFrameCommand : QUndoCommand
 
     void savePreviousState();
     void saveAfterState();
-    
+
     QDomDocument previousState() const;
     QDomDocument afterState() const;
 
     /**Returns true if previous state and after state are valid and different*/
     bool containsChange() const;
-    
+
     const QgsComposerMultiFrame* multiFrame() const;
-     
+
   protected:
 
     QgsComposerMultiFrameCommand(); //forbidden

python/core/composer/qgscomposerpicture.sip

@@ -161,13 +161,13 @@ class QgsComposerPicture: QgsComposerItem
      * instead
      */
     bool imageSizeConsideringRotation( double& width, double& height ) const /Deprecated/;
-    
+
     /**Calculates corner point after rotation and scaling
      * @deprecated Use QgsComposerItem::cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height, double rotation )
      * instead
      */
     bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height ) const /Deprecated/;
-    
+
     /**Calculates width / height of the bounding box of a rotated rectangle
      * @deprecated Use QgsComposerItem::sizeChangedByRotation( double& width, double& height, double rotation )
      * instead

python/core/composer/qgscomposershape.sip

@@ -64,7 +64,7 @@ class QgsComposerShape: QgsComposerItem
      * QgsComposerItem as it needs to call updateBoundingRect after the shape's size changes
     */
     void setSceneRect( const QRectF& rectangle );
-    
+
     //Overriden to return shape type
     virtual QString displayName() const;
 

python/core/composer/qgscomposerutils.sip

@@ -33,7 +33,7 @@ class QgsComposerUtils
      * @param y in/out: y cooreinate before / after the rotation
     */
     static void rotate( const double angle, double& x, double& y );
-    
+
     /**Ensures that an angle is in the range 0 <= angle < 360
      * @param angle angle in degrees
      * @returns equivalent angle within the range [0, 360)

python/core/layertree/qgslayertreenode.sip

@@ -118,7 +118,7 @@ class QgsLayerTreeNode : QObject
   protected:
 
     QgsLayerTreeNode( NodeType t );
-    
+
   private:
     QgsLayerTreeNode( const QgsLayerTreeNode& other );
 

python/core/qgscolorscheme.sip

@@ -54,7 +54,7 @@ class QgsColorScheme
      * @see isEditable
     */
     virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );
-    
+
     /**Clones a color scheme
      * @returns copy of color scheme
     */
@@ -108,7 +108,7 @@ class QgsCustomColorScheme : QgsColorScheme
 
     virtual QgsNamedColorList fetchColors( const QString context = QString(),
                                            const QColor baseColor = QColor() );
-                                           
+
     virtual bool isEditable() const;
 
     virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );

python/core/qgsmaplayerlegend.sip

@@ -13,7 +13,7 @@ class QgsLayerTreeModelLegendNode : QObject
 %TypeHeaderCode
 #include <qgsmaplayerlegend.h>
 %End
-    
+
   public:
 
     /** Return pointer to the parent layer node */
@@ -82,7 +82,7 @@ class QgsMapLayerLegend : QObject
 %TypeHeaderCode
 #include <qgsmaplayerlegend.h>
 %End
-    
+
   public:
     explicit QgsMapLayerLegend( QObject *parent /TransferThis/ = 0 );
 

python/core/symbology-ng/qgssymbollayerv2utils.sip

@@ -59,7 +59,7 @@ class QgsSymbolLayerV2Utils
 
     static QString encodeScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod );
     static QgsSymbolV2::ScaleMethod decodeScaleMethod( QString str );
-    
+
     static QPainter::CompositionMode decodeBlendMode( const QString& s );
 
     static QIcon symbolPreviewIcon( QgsSymbolV2* symbol, QSize size );
@@ -199,7 +199,7 @@ class QgsSymbolLayerV2Utils
      * @note added in 2.5
      */
     static QList< QColor > parseColorList( const QString colorStr );
-    
+
     /**
      * Attempts to parse mime data as a list of named colors
      * @param data mime data to parse
@@ -216,7 +216,7 @@ class QgsSymbolLayerV2Utils
      * @note added in 2.5
      */
     static QMimeData* colorListToMimeData( const QgsNamedColorList colorList, const bool allFormats = true );
-    
+
     /**
      * Exports colors to a gpl GIMP palette file
      * @param file destination file
@@ -235,7 +235,7 @@ class QgsSymbolLayerV2Utils
      * @see saveColorsToGpl
     */
     static QgsNamedColorList importColorsFromGpl( QFile &file, bool &ok );
-    
+
     /**
      * Attempts to parse a string as a color using a variety of common formats, including hex
      * codes, rgb and rgba strings.