indentation update and typo fixes

qgis · Nov 13, 2014 · d4f64d9 · d4f64d9
1 parent 701f464
commit d4f64d9
Show file tree

Hide file tree

Showing 69 changed files with 269 additions and 271 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,6 @@
 QGIS News
 Change history for the QGIS Project
-Thursday October 23, 2014
+Thursday November 13, 2014
 
 
 ------------------------------------------------------------------------
@@ -34,8 +34,8 @@ Thursday October 23, 2014
 ------------------------------------------------------------------------
 
 
-Last Updated: Thursday October 23, 2014
-Last Change : Thursday October 23, 2014
+Last Updated: Thursday November 13, 2014
+Last Change : Thursday November 13, 2014
 
 
   1. What's new in Version 2.6.0 'Brighton'?
@@ -60,7 +60,7 @@ This is a minor release increment with the following new features:
 - New Composer Item tree panel
 - More control over appearance of composer arrow/line items
 - Data defined control of composer items
-- Composer images can be specifed as remote URLS
+- Composer images can be specified as remote URLS
 - Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
 - Composer improvements
 - Improved item snapping

diff --git a/doc/news.html b/doc/news.html
@@ -77,7 +77,7 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS News</H1>
 <H2>Change history for the QGIS Project</H2>
-<H3>Thursday October 23, 2014</H3>
+<H3>Thursday November 13, 2014</H3>
 </DIV>
 
 <DIV CLASS="toc">
@@ -111,8 +111,8 @@ <H3>Thursday October 23, 2014</H3>
 </DIV>
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Thursday October 23, 2014
-Last Change : Thursday October 23, 2014
+Last Updated: Thursday November 13, 2014
+Last Change : Thursday November 13, 2014
 </P>
 
 <A NAME="toc1"></A>
@@ -140,7 +140,7 @@ <H1>1. What's new in Version 2.6.0 'Brighton'?</H1>
 <LI>New Composer Item tree panel
 <LI>More control over appearance of composer arrow/line items
 <LI>Data defined control of composer items
-<LI>Composer images can be specifed as remote URLS
+<LI>Composer images can be specified as remote URLS
 <LI>Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
 <LI>Composer improvements
 <LI>Improved item snapping

diff --git a/doc/news.t2t b/doc/news.t2t
@@ -59,7 +59,7 @@ This is a minor release increment with the following new features:
 - New Composer Item tree panel
 - More control over appearance of composer arrow/line items
 - Data defined control of composer items
-- Composer images can be specifed as remote URLS
+- Composer images can be specified as remote URLS
 - Composer Table improvements (header fonts / colors, better pagination support, filter to atlas feature etc.)
 - Composer improvements
 - Improved item snapping

diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -851,7 +851,7 @@ class EditorTabWidget(QTabWidget):
     def __init__(self, parent):
         QTabWidget.__init__(self, parent=None)
         self.parent = parent
-        
+
         self.settings = QSettings()
 
         self.idx = -1

diff --git a/python/core/composer/qgscomposerattributetablemodelv2.sip b/python/core/composer/qgscomposerattributetablemodelv2.sip
@@ -33,7 +33,7 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
     bool insertRows( int row, int count, const QModelIndex &parent = QModelIndex() );
     QModelIndex index( int row, int column, const QModelIndex &parent ) const;
     QModelIndex parent( const QModelIndex &child ) const;
-    
+
     /**Moves the specified row up or down in the model. Used for rearranging the attribute tables
      * columns.
      * @returns true if the move is allowed
@@ -48,7 +48,7 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
      * @note added in 2.3
      */
     void resetToLayer();
-    
+
     /**Returns the QgsComposerTableColumn corresponding to an index in the model.
      * @returns QgsComposerTableColumn for specified index
      * @param index a QModelIndex

diff --git a/python/core/composer/qgscomposerattributetablev2.sip b/python/core/composer/qgscomposerattributetablev2.sip
@@ -9,7 +9,7 @@ class QgsComposerAttributeTableCompareV2
   public:
 
     QgsComposerAttributeTableCompareV2();
-    
+
     bool operator()( const QgsComposerTableRow& m1, const QgsComposerTableRow& m2 );
 
     /**Sets column number to sort by
@@ -32,7 +32,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
 %End
 
   public:
-  
+
     /*! Specifies the content source for the attribute table
      */
     enum ContentSource
@@ -44,7 +44,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
 
     QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
     ~QgsComposerAttributeTableV2();
-    
+
     virtual QString displayName() const;
 
     /**Writes properties specific to attribute tables
@@ -74,14 +74,14 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see setSource
      */
     ContentSource source() const;
-    
+
     /**Returns the source layer for the table, considering the table source mode. Eg,
      * if the table is set to atlas feature mode, then the source layer will be the
      * atlas coverage layer. If the table is set to layer attributes mode, then
      * the source layer will be the user specified vector layer.
      * @returns actual source layer
      */
-    QgsVectorLayer* sourceLayer();    
+    QgsVectorLayer* sourceLayer();
 
     /**Sets the vector layer from which to display feature attributes
      * @param layer Vector layer for attribute table
@@ -94,7 +94,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see setVectorLayer
      */
     QgsVectorLayer* vectorLayer() const;
-    
+
     /**Sets the relation id from which to display child features
      * @param relationId id for relation to display child features from
      * @see relationId
@@ -109,7 +109,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see source
      * @note only used if table source is set to RelationChildren
      */
-    QString relationId() const; 
+    QString relationId() const;
 
     /**Resets the attribute table's columns to match the vector layer's fields
      * @see setVectorLayer
@@ -134,7 +134,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see displayOnlyVisibleFeatures
      */
     const QgsComposerMap* composerMap() const;
-    
+
     /**Sets the maximum number of features shown by the table. Changing this setting may result
      * in the attribute table changing its size to accommodate the new number of rows, and requires
      * the table to refetch features from its vector layer.
@@ -148,7 +148,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see setMaximumNumberOfFeatures
      */
     int maximumNumberOfFeatures() const;
-    
+
     /**Sets attribute table to only show unique rows.
      * @param uniqueOnly set to true to show only unique rows. Duplicate rows
      * will be stripped from the table.
@@ -162,7 +162,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see setUniqueRowsOnly
      */
     bool uniqueRowsOnly() const;
-    
+
     /**Sets attribute table to only show features which are visible in a composer map item. Changing
      * this setting forces the table to refetch features from its vector layer, and may result in
      * the table changing size to accommodate the new displayed feature attributes.
@@ -179,7 +179,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
      * @see setDisplayOnlyVisibleFeatures
      */
     bool displayOnlyVisibleFeatures() const;
-    
+
     /**Sets attribute table to only show features which intersect the current atlas
      * feature.
      * @param filterToAtlas set to true to show only features which intersect

diff --git a/python/core/composer/qgscomposerframe.sip b/python/core/composer/qgscomposerframe.sip
@@ -15,33 +15,33 @@ class QgsComposerFrame: QgsComposerItem
      * @see extent
     */
     void setContentSection( const QRectF& section );
-    
+
     /**Returns the parent multiframe for the frame.
      * @returns parent multiframe
      */
     QgsComposerMultiFrame* multiFrame() const;
-    
+
     //Overriden to allow multiframe to set display name
     virtual QString displayName() const;
-    
+
     //Overriden to handle fixed frame sizes set by multi frame
-    void setSceneRect( const QRectF& rectangle );   
-    
+    void setSceneRect( const QRectF& rectangle );
+
     void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );
     void beginItemCommand( const QString& text );
     void endItemCommand();
     bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
     int type() const;
-    
+
     /**Returns the visible portion of the multi frame's content which
      * is shown in this frame.
      * @returns extent of visible portion
      * @note added in QGIS 2.5
      * @see setContentSection
      */
     QRectF extent() const;
-    
+
     /**Returns whether the page should be hidden (ie, not included in composer exports) if this frame is empty
      * @returns true if page should be hidden if frame is empty
      * @note added in QGIS 2.5
@@ -55,7 +55,7 @@ class QgsComposerFrame: QgsComposerItem
      * @see hidePageIfEmpty
      */
     void setHidePageIfEmpty( const bool hidePageIfEmpty );
-    
+
     /**Returns whether the background and frame border should be hidden if this frame is empty
      * @returns true if background and border should be hidden if frame is empty
      * @note added in QGIS 2.5

diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -32,7 +32,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
   case QgsComposerItem::ComposerArrow:
     sipClass = sipClass_QgsComposerArrow;
     *sipCppRet = static_cast<QgsComposerArrow*>(sipCpp);
-    break; 
+    break;
   case QgsComposerItem::ComposerItemGroup:
     sipClass = sipClass_QgsComposerItemGroup;
     *sipCppRet = static_cast<QgsComposerItemGroup*>(sipCpp);
@@ -163,7 +163,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
 
     /** return correct graphics item type. Added in v1.7 */
     virtual int type() const;
-	
+
     /**Returns whether this item has been removed from the composition. Items removed
      * from the composition are not deleted so that they can be restored via an undo
      * command.
@@ -286,7 +286,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @see setFrameOutlineColor
      */
     virtual void setFrameEnabled( const bool drawFrame );
-    
+
     /**Sets frame outline color
      * @param color new color for outline frame
      * @note introduced in 2.6
@@ -590,7 +590,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @note added in version 2.5
     */
     virtual void setVisibility( const bool visible );
-    
+
     /**Returns whether the item should be excluded from composer exports and prints
      * @param valueType controls whether the returned value is the user specified vaule,
      * or the current evaluated value (which may be affected by data driven settings).
@@ -605,7 +605,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @note added in version 2.5
      * @see excludeFromExports
      */
-    virtual void setExcludeFromExports( const bool exclude );    
+    virtual void setExcludeFromExports( const bool exclude );
 
     /**Returns whether this item is part of a group
      * @returns true if item is in a group
@@ -772,7 +772,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
      * @note added in QGIS 2.5
     */
     QRectF evalItemRect( const QRectF &newRect, const bool resizeOnly = false );
-    
+
     /**Returns whether the item should be drawn in the current context
      * @returns true if item should be drawn
      * @note added in QGIS 2.5

diff --git a/python/core/composer/qgscomposermap.sip b/python/core/composer/qgscomposermap.sip
@@ -241,7 +241,7 @@ class QgsComposerMap : QgsComposerItem
      * @deprecated use grid()->setEnabled() or grids() instead
      */
     void setGridEnabled( bool enabled ) /Deprecated/;
-    
+
     /**
      * @deprecated use grid()->enabled() or grids() instead
      */
@@ -455,7 +455,7 @@ class QgsComposerMap : QgsComposerItem
      * @deprecated use grid()->framePenColor() or grids() instead
     */
     QColor gridFramePenColor() const /Deprecated/;
-    
+
     /**Sets first fill color for grid zebra frame
      * @note: this function was added in version 2.1
      * @deprecated use grid()->setFrameFillColor1() or grids() instead
@@ -479,7 +479,7 @@ class QgsComposerMap : QgsComposerItem
      * @deprecated use grid()->frameFillColor2() or grids() instead
     */
     QColor gridFrameFillColor2() const /Deprecated/;
-    
+
     /**Sets length of the cross segments (if grid style is cross)
      * @note this function was added in version 1.4
      * @deprecated use grid()->setCrossLength() or grids() instead
@@ -490,7 +490,7 @@ class QgsComposerMap : QgsComposerItem
      * @deprecated use grid()->crossLength() or grids() instead
      */
     double crossLength() /Deprecated/;
-    
+
     /**
      * @deprecated use grid()->setLineSymbol() or grids() instead
      */
@@ -500,7 +500,7 @@ class QgsComposerMap : QgsComposerItem
      * @deprecated use grid()->lineSymbol() or grids() instead
      */
     QgsLineSymbolV2* gridLineSymbol() /Deprecated/;
-    
+
     /** Returns the grid's blending mode
      * @deprecated use grid()->blendMode() or grids() instead
      */
@@ -510,7 +510,7 @@ class QgsComposerMap : QgsComposerItem
      * @deprecated use grid()->setBlendMode() or grids() instead
      */
     void setGridBlendMode( QPainter::CompositionMode blendMode ) /Deprecated/;
-    
+
     /**Returns the map item's grid stack, which is used to control how grids
      * are drawn over the map's contents.
      * @returns pointer to grid stack
@@ -525,7 +525,7 @@ class QgsComposerMap : QgsComposerItem
      * @note introduced in QGIS 2.5
      */
     QgsComposerMapGrid* grid();
-    
+
     /**Returns the map item's overview stack, which is used to control how over
      * are drawn over the map's contents.
      * @returns pointer to overview stack
@@ -543,7 +543,7 @@ class QgsComposerMap : QgsComposerItem
 
     /**In case of annotations, the bounding rectangle can be larger than the map item rectangle
     @note this function was added in version 1.4*/
-    
+
     QRectF boundingRect() const;
     /**Updates the bounding rect of this item. Call this function before doing any changes related to annotation out of the map rectangle
     @note this function was added in version 1.4*/
@@ -745,7 +745,7 @@ class QgsComposerMap : QgsComposerItem
 
     //overriden to show "Map 1" type names
     virtual QString displayName() const;
-    
+
     /**Returns extent that considers rotation and shift with mOffsetX / mOffsetY*/
     QPolygonF transformedMapPolygon() const;