indentation update and typo fixes

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 Updated: Thursday November 13, 2014
-Last Change : Thursday October 23, 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

doc/news.html

@@ -77,7 +77,7 @@ label{  background-color: #FFFFCC;
 <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 @@ label{  background-color: #FFFFCC;
 </DIV>
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Thursday October 23, 2014
+Last Updated: Thursday November 13, 2014
-Last Change : Thursday October 23, 2014
+Last Change : Thursday November 13, 2014
 </P>
 
 <A NAME="toc1"></A>
@@ -140,7 +140,7 @@ This is a minor release increment with the following new features:
 <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

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

python/core/qgsmaptopixel.sip

@@ -34,7 +34,7 @@ class QgsMapToPixel
      * @return QgsPoint in device coordinates
     */
     QgsPoint transform( double x, double y ) const;
-    /*! Tranform device coordinates to map (world)  coordinates
+    /*! Transform device coordinates to map (world) coordinates
     * @param x x coordinate of point to be converted to map cooordinates
     * @param y y coordinate of point to be converted to map cooordinates
     * @return QgsPoint in map coordinates
@@ -54,11 +54,10 @@ class QgsMapToPixel
 
     QgsPoint toMapCoordinates( int x, int y ) const;
 
-    /*! Transform device coordinates to map (world) coordinates
+    /*! Transform device coordinates to map (world) coordinates */
-      @note: this method was added in version 1.6*/
     QgsPoint toMapCoordinatesF( double x, double y ) const;
 
-    /*! Tranform device coordinates to map (world)  coordinates
+    /*! Transform device coordinates to map (world) coordinates
      * @param p Point to be converted to map cooordinates
      * @return QgsPoint in map coorndiates
      */

python/gui/qgscolorwidgets.sip

@@ -138,7 +138,6 @@ class QgsColorWidget : QWidget
 
     //Reimplemented to accept dropped colors
     void dropEvent( QDropEvent *e );
-
 };
 
 

scripts/astyle.sh

@@ -69,11 +69,11 @@ for f in "$@"; do
                 cmd="$ASTYLE $ARTISTIC_STYLE_OPTIONS"
                 ;;
 
-        *.ui|*.qgm|*.txt|*.t2t|*.sip|resources/context_help/*)
+        *.ui|*.qgm|*.txt|*.t2t|resources/context_help/*)
                 cmd=:
                 ;;
 
-        *.py)
+        *.py|*.sip)
                 cmd="perl -i.prepare -pe 's/[\r\t ]+$//;'"
                 ;;
 

src/core/qgsbrowsermodel.h

@@ -124,7 +124,7 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
     bool fetching( QgsDataItem *item ) const;
 
   signals:
-    /** Emited when item children fetch was finished */
+    /** Emitted when item children fetch was finished */
     void fetchFinished( const QModelIndex & index );
 
   public slots:

src/core/qgsmaptopixel.h

@@ -56,7 +56,7 @@ class CORE_EXPORT QgsMapToPixel
      * @return QgsPoint in device coordinates
     */
     QgsPoint transform( double x, double y ) const;
-    /*! Tranform device coordinates to map (world)  coordinates
+    /*! Transform device coordinates to map (world) coordinates
     * @param x x coordinate of point to be converted to map cooordinates
     * @param y y coordinate of point to be converted to map cooordinates
     * @return QgsPoint in map coordinates
@@ -87,7 +87,7 @@ class CORE_EXPORT QgsMapToPixel
     /*! Transform device coordinates to map (world) coordinates */
     QgsPoint toMapCoordinatesF( double x, double y ) const;
 
-    /*! Tranform device coordinates to map (world)  coordinates
+    /*! Transform device coordinates to map (world) coordinates
      * @param p Point to be converted to map cooordinates
      * @return QgsPoint in map coorndiates
      */

src/gui/qgscolorwidgets.h

@@ -27,7 +27,7 @@ class QToolButton;
  * \class QgsColorWidget
  * A base class for interactive color widgets. Widgets can either allow setting a single component of
  * a color (eg the red or green components), or an entire color. The QgsColorWidget also keeps track of
- * any explicitly set hue for the color, so that this information is not lost when the widget is
+ * any explicitely set hue for the color, so that this information is not lost when the widget is
  * set to a color with an ambiguous hue (eg black or white shades).
  * \note Added in version 2.5
  */

src/mapserver/qgshttprequesthandler.cpp

@@ -32,8 +32,8 @@
 #include <QUrl>
 #include <fcgi_stdio.h>
 
-QgsHttpRequestHandler::QgsHttpRequestHandler():
+QgsHttpRequestHandler::QgsHttpRequestHandler()
-  QgsRequestHandler()
+    : QgsRequestHandler()
 {
   mException = NULL;
   mHeadersSent = FALSE;

tests/src/core/testqgscomposerlabel.cpp

@@ -179,7 +179,7 @@ void TestQgsComposerLabel::page_evaluation()
 void TestQgsComposerLabel::marginMethods()
 {
   QgsComposerLabel label( mComposition );
-  //test setting margins seperately
+  //test setting margins separately
   label.setMarginX( 3.0 );
   label.setMarginY( 4.0 );
   QCOMPARE( label.marginX(), 3.0 );