[QGIS Commit] r12600 - in trunk/qgis: . doc python/core python/gui python/plugins/osm python/plugins/plugin_installer resources/context_help scripts src/analysis/interpolation src/app src/core src/core/raster src/core/renderer src/core/spatialite src/core/symbology src/designer src/gui src/helpviewer src/plugins/copyright_label src/plugins/dxf2shp_converter/dxflib/src src/plugins/grass src/plugins/grass/qtermwidget src/plugins/north_arrow src/plugins/scale_bar src/ui tests/src/core

svn_qgis at osgeo.org svn_qgis at osgeo.org
Wed Dec 23 11:14:25 EST 2009


Author: jef
Date: 2009-12-23 11:14:24 -0500 (Wed, 23 Dec 2009)
New Revision: 12600

Removed:
   trunk/qgis/src/plugins/copyright_label/pluginguibase.ui.h
   trunk/qgis/src/plugins/north_arrow/pluginguibase.ui.h
   trunk/qgis/src/plugins/scale_bar/pluginguibase.ui.h
Modified:
   trunk/qgis/ChangeLog
   trunk/qgis/INSTALL
   trunk/qgis/doc/INSTALL.t2t
   trunk/qgis/python/core/qgsrasterlayer.sip
   trunk/qgis/python/core/qgsrenderer.sip
   trunk/qgis/python/gui/qgsmapcanvas.sip
   trunk/qgis/python/plugins/osm/OsmUploadDlg.py
   trunk/qgis/python/plugins/plugin_installer/installer_gui.py
   trunk/qgis/resources/context_help/QgsPluginInstallerDialog-en_US
   trunk/qgis/resources/context_help/QgsVectorLayerProperties-en_US
   trunk/qgis/scripts/chkspelling.sh
   trunk/qgis/scripts/prepare-commit.sh
   trunk/qgis/scripts/spelling.dat
   trunk/qgis/src/analysis/interpolation/DualEdgeTriangulation.h
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/app/qgsoptions.h
   trunk/qgis/src/app/qgsprojectproperties.cpp
   trunk/qgis/src/app/qgsprojectproperties.h
   trunk/qgis/src/app/qgsrasterlayerproperties.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.h
   trunk/qgis/src/core/qgsapplication.cpp
   trunk/qgis/src/core/qgsattributeaction.h
   trunk/qgis/src/core/qgsrunprocess.cpp
   trunk/qgis/src/core/qgssearchstringparser.yy
   trunk/qgis/src/core/raster/qgsfreakoutshader.cpp
   trunk/qgis/src/core/raster/qgslinearminmaxenhancement.h
   trunk/qgis/src/core/raster/qgspseudocolorshader.cpp
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
   trunk/qgis/src/core/raster/qgsrasterlayer.h
   trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp
   trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
   trunk/qgis/src/core/renderer/qgsrenderer.h
   trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp
   trunk/qgis/src/core/spatialite/sqlite3.c
   trunk/qgis/src/core/symbology/qgssymbol.cpp
   trunk/qgis/src/designer/README.txt
   trunk/qgis/src/gui/qgsprojectionselector.cpp
   trunk/qgis/src/gui/qgsquickprint.cpp
   trunk/qgis/src/gui/qgsquickprint.h
   trunk/qgis/src/helpviewer/CMakeLists.txt
   trunk/qgis/src/plugins/copyright_label/plugin.cpp
   trunk/qgis/src/plugins/copyright_label/plugin.h
   trunk/qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
   trunk/qgis/src/plugins/grass/qgsgrassedit.h
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
   trunk/qgis/src/plugins/grass/qtermwidget/CharacterColor.h
   trunk/qgis/src/plugins/grass/qtermwidget/Screen.h
   trunk/qgis/src/plugins/grass/qtermwidget/Session.cpp
   trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp
   trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h
   trunk/qgis/src/plugins/grass/qtermwidget/TerminalDisplay.cpp
   trunk/qgis/src/plugins/scale_bar/plugin.cpp
   trunk/qgis/src/plugins/scale_bar/plugin.h
   trunk/qgis/src/plugins/scale_bar/plugingui.cpp
   trunk/qgis/src/plugins/scale_bar/plugingui.h
   trunk/qgis/src/plugins/scale_bar/pluginguibase.ui
   trunk/qgis/src/ui/qgsoptionsbase.ui
   trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
   trunk/qgis/tests/src/core/testqgsgeometry.cpp
Log:
another round of typo fixes (and use color instead of colour - like Qt; no string updates)

Modified: trunk/qgis/ChangeLog
===================================================================
--- trunk/qgis/ChangeLog	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/ChangeLog	2009-12-23 16:14:24 UTC (rev 12600)
@@ -909,7 +909,7 @@
 Tidied up the SPIT gui to match the plugin template.
 Fixed bug in scale bar which displayed the bar the wrong size!
 Fixed all the plugins so they do not do multiple refreshes on exit.
-Added colour selection for scale bar.
+Added color selection for scale bar.
 
 2004-06-09 [mcoletti] 0.3.0devel25
 Added support for a feature type name in QgsFeature.  The GDAL/OGR shape file
@@ -1474,7 +1474,7 @@
 **Symbol renderers for simple, graduated, and continuous symbols
 **Raster support for most GDAL formats
 **Raster implementation supports a variety of rendering settings including
-  semi transparent overlays, pallette inversion, flexible band to colour mapping
+  semi transparent overlays, pallette inversion, flexible band to color mapping
   in multiband images and creation of pseudocolor.
 **Change to a data provider architecture for vector layers. Addtional data
   types can be supported by writing a provider plugin

Modified: trunk/qgis/INSTALL
===================================================================
--- trunk/qgis/INSTALL	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/INSTALL	2009-12-23 16:14:24 UTC (rev 12600)
@@ -2266,7 +2266,7 @@
 http://msdn2.microsoft.com/en-us/express/aa975050.aspx
 
 The page is really confusing so don't feel bad if you cant actually find the 
-download at first! There are six coloured blocks on the page for the various  
+download at first! There are six colored blocks on the page for the various  
 studio family members (vb / c# / j# etc). Simply choose your language under 
 the 'select your language' combo under the yellow C++ block, and your download 
 will begin. Under internet explorer I had to disable popup blocking for the 
@@ -2275,7 +2275,7 @@
 Once the setup commences you will be prompted with various options. Here is what 
 I chose :
 
- * Send useage information to Microsoft   (No)
+ * Send usage information to Microsoft    (No)
  * Install options:
    * Graphical IDE                        (Yes)
    * Microsoft MSDN Express Edition       (No)

Modified: trunk/qgis/doc/INSTALL.t2t
===================================================================
--- trunk/qgis/doc/INSTALL.t2t	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/doc/INSTALL.t2t	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1999,7 +1999,7 @@
 http://msdn2.microsoft.com/en-us/express/aa975050.aspx
 
 The page is really confusing so don't feel bad if you cant actually find the 
-download at first! There are six coloured blocks on the page for the various  
+download at first! There are six colored blocks on the page for the various  
 studio family members (vb / c# / j# etc). Simply choose your language under 
 the 'select your language' combo under the yellow C++ block, and your download 
 will begin. Under internet explorer I had to disable popup blocking for the 
@@ -2008,7 +2008,7 @@
 Once the setup commences you will be prompted with various options. Here is what 
 I chose :
 
- * Send useage information to Microsoft   (No)
+ * Send usage information to Microsoft    (No)
  * Install options:
    * Graphical IDE                        (Yes)
    * Microsoft MSDN Express Edition       (No)

Modified: trunk/qgis/python/core/qgsrasterlayer.sip
===================================================================
--- trunk/qgis/python/core/qgsrasterlayer.sip	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/python/core/qgsrasterlayer.sip	2009-12-23 16:14:24 UTC (rev 12600)
@@ -305,7 +305,7 @@
 
     /** \brief Returns a string representation of drawing style
      *
-     * Implementaed mainly for serialisation / deserialisation of settings to xml.
+     * Implemented mainly for serialisation / deserialisation of settings to xml.
      * NOTE: May be deprecated in the future!. DrawingStyle drawingStyle() instead.
      * */
     QString drawingStyleAsString() const;

Modified: trunk/qgis/python/core/qgsrenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsrenderer.sip	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/python/core/qgsrenderer.sip	2009-12-23 16:14:24 UTC (rev 12600)
@@ -7,7 +7,7 @@
 %End
   
  public:
-    /** Default ctor sets up selection colour from project properties */
+    /** Default ctor sets up selection color from project properties */
     QgsRenderer();
     /** Virtual destructor because we have virtual methods... */
     virtual ~QgsRenderer();

Modified: trunk/qgis/python/gui/qgsmapcanvas.sip
===================================================================
--- trunk/qgis/python/gui/qgsmapcanvas.sip	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/python/gui/qgsmapcanvas.sip	2009-12-23 16:14:24 UTC (rev 12600)
@@ -122,7 +122,7 @@
     /** Updates the full extent */
     void updateFullExtent();
 
-    //! return the map layer at postion index in the layer stack
+    //! return the map layer at position index in the layer stack
     QgsMapLayer *layer(int index);
     
     //! return number of layers on the map

Modified: trunk/qgis/python/plugins/osm/OsmUploadDlg.py
===================================================================
--- trunk/qgis/python/plugins/osm/OsmUploadDlg.py	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/python/plugins/osm/OsmUploadDlg.py	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1481,7 +1481,7 @@
         We are really not interested in function parameters - we just cancel the connection.
         """
 
-        self.cancelUpload("Authentification failed. Please try again with correct login and password.")
+        self.cancelUpload("Authentication failed. Please try again with correct login and password.")
 
 
     def __setProxy(self):

Modified: trunk/qgis/python/plugins/plugin_installer/installer_gui.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2009-12-23 16:14:24 UTC (rev 12600)
@@ -500,7 +500,7 @@
           a.setToolTip(4,"")
         a.setText(5,repository)
         a.setToolTip(5,p["url"])
-        # set fonts and colours
+        # set fonts and colors
         for i in [0,1,2,3,4,5]:
           if p["error"]:
             a.setForeground(i,QBrush(QColor(Qt.red)))

Modified: trunk/qgis/resources/context_help/QgsPluginInstallerDialog-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsPluginInstallerDialog-en_US	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/resources/context_help/QgsPluginInstallerDialog-en_US	2009-12-23 16:14:24 UTC (rev 12600)
@@ -12,26 +12,26 @@
 <p align='justify'>
 The <label>Plugins</label> tab contains a list of all locally installed Python plugins, as well as plugins available in 
 remote repositories. Each plugin can be either:
-<ul>
-<li> not installed - this means the plugin is available in the repository, but is not installed yet. In 
-order to install it, select the plugin from the list and click the <label>Install plugin</label> button.</li>
-<li> new - this means that the plugin is newly available in the repository.</li>
-<li> installed - this indicates that the plugin is already installed. If it is also available in any repository 
+<dl>
+<dt>not installed</dt><dd>this means the plugin is available in the repository, but is not installed yet. In 
+order to install it, select the plugin from the list and click the <label>Install plugin</label> button.</dd>
+<dt>new</dt><dd>this means that the plugin is newly available in the repository.</dd>
+<dt>installed</dt><dd>this indicates that the plugin is already installed. If it is also available in any repository 
 the <label>Reinstall plugin</label> button will be enabled. If the available version is older than the installed 
-version, the <label>Downgrade plugin</label> button will appear instead.</li>
-<li> upgradeable - this means that the plugin is installed, but there is an updated version available. 
-In this case, the <label>Upgrade plugin</label> button will be enabled.</li>
-<li> invalid - this means that the plugin is installed, but is unavailable or broken. The reason will be 
-explained in the plugin description field.</li>
-</ul>
+version, the <label>Downgrade plugin</label> button will appear instead.</dd>
+<dt>upgradeable</dt><dd>this means that the plugin is installed, but there is an updated version available. 
+In this case, the <label>Upgrade plugin</label> button will be enabled.</dd>
+<dt>invalid</dt><dd>this means that the plugin is installed, but is unavailable or broken. The reason will be 
+explained in the plugin description field.</dd>
+</dl>
 </p>
 
 To install a plugin, select it from the list and click the <label>Install plugin</label> button. The plugin is installed in its own directory in:
 <table border=1>
-<tr><td>OS</td><td>system plugins</td><td>plugins installed by user</td></tr>
-<tr><td>Linux and other unices</td><td>./share/qgis/python/plugins</td><td>/home/$USERNAME/.qgis/python/plugins</td></tr>
-<tr><td>Mac OS X</td><td>./Contents/MacOS/share/qgis/python/plugins</td><td>/Users/$USERNAME/.qgis/python/plugins</td></tr>
-<tr><td>Windows</td><td>C:\Program Files\QGIS\python\plugins</td><td>C:\Documents and Settings\$USERNAME\.qgis\python\plugins</td></tr>
+<tr><th>OS</th><th>system plugins</th><th>plugins installed by user</th></tr>
+<tr><td>Linux and other unices</td><td>./share/qgis/python/plugins</td><td rowspan=2>$HOME/qgis/python/plugins</td></tr>
+<tr><td>Mac OS X</td><td>./Contents/MacOS/share/qgis/python/plugins</td></tr>
+<tr><td>Windows</td><td>(QGIS install directory)\python\plugins</td><td>%USERPROFILE%\.qgis\python\plugins</td></tr>
 </table>
 <br/>
 

Modified: trunk/qgis/resources/context_help/QgsVectorLayerProperties-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsVectorLayerProperties-en_US	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/resources/context_help/QgsVectorLayerProperties-en_US	2009-12-23 16:14:24 UTC (rev 12600)
@@ -20,7 +20,7 @@
 <ul>
 <li><label>Single symbol</label> - a single style is applied to every object in the layer.
 <li><label>Graduated symbol</label> - objects within the layer are displayed with different symbols classified by the values of a particular field.
-<li><label>Continuous color</label> - objects within the layer are displayed with a spread of colours classified by the numerical values within a specified field.
+<li><label>Continuous color</label> - objects within the layer are displayed with a spread of colors classified by the numerical values within a specified field.
 <li><label>Unique value</label> - objects are classified by the unique values within a specified field with each value having a different symbol.
 </ul>
 

Modified: trunk/qgis/scripts/chkspelling.sh
===================================================================
--- trunk/qgis/scripts/chkspelling.sh	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/scripts/chkspelling.sh	2009-12-23 16:14:24 UTC (rev 12600)
@@ -4,5 +4,5 @@
 RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
 EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat"
 
-egrep --color=always "$RE" -r .  | egrep -v "$EX"
-egrep --color=always "$RE" resources/context_help/*-en_US
+egrep --color=always "$RE" -ir .  | egrep -iv "$EX"
+egrep --color=always "$RE" -i resources/context_help/*-en_US

Modified: trunk/qgis/scripts/prepare-commit.sh
===================================================================
--- trunk/qgis/scripts/prepare-commit.sh	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/scripts/prepare-commit.sh	2009-12-23 16:14:24 UTC (rev 12600)
@@ -34,7 +34,12 @@
 # reformat
 for f in $MODIFIED; do
 	case "$f" in
-        *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
+	src/core/spatialite/*)
+                echo $f skipped
+		continue
+		;;
+
+        *.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
                 ;;
 
         *)

Modified: trunk/qgis/scripts/spelling.dat
===================================================================
--- trunk/qgis/scripts/spelling.dat	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/scripts/spelling.dat	2009-12-23 16:14:24 UTC (rev 12600)
@@ -428,3 +428,21 @@
 actully:actually
 disolve:dissolve
 furter:further
+instersction:intersection
+traslates:translates
+deimiter:delimiter
+analysies:analyses
+postion:position
+rigth:right
+syle:style
+manger:manager
+signto:sign to
+attemtps:attempts
+palletted:paletted
+statics:statistics
+useage:usage
+aribitary:arbitrary
+colour:color
+recommeneded:recommended
+implementaed:implemented
+containging:containing

Modified: trunk/qgis/src/analysis/interpolation/DualEdgeTriangulation.h
===================================================================
--- trunk/qgis/src/analysis/interpolation/DualEdgeTriangulation.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/analysis/interpolation/DualEdgeTriangulation.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -142,7 +142,7 @@
     unsigned int insertEdge( int dual, int next, int point, bool mbreak, bool forced );
     /**inserts a forced segment between the points with the numbers p1 and p2 into the triangulation and returns the number of a HalfEdge belonging to this forced edge or -100 in case of failure*/
     int insertForcedSegment( int p1, int p2, bool breakline );
-    /**Treshold for the leftOfTest to handle numerical instabilities*/
+    /**Threshold for the leftOfTest to handle numerical instabilities*/
     //const static double leftOfTresh=0.00001;
     /**Security to prevent endless loops in 'baseEdgeOfTriangle'. It there are more iteration then this number, the point will not be inserted*/
     const static int nBaseOfRuns = 300000;

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -425,7 +425,7 @@
   QgsProject::instance()->setBadLayerHandler( new QgsProjectBadLayerGuiHandler() );
 
 #if 0
-  // Set the background colour for toolbox and overview as they default to
+  // Set the background color for toolbox and overview as they default to
   // white instead of the window color
   QPalette myPalette = toolBox->palette();
   myPalette.setColor( QPalette::Button, myPalette.window().color() );
@@ -2667,9 +2667,9 @@
 
   QSettings settings;
 
-  //set the colour for selections
+  //set the color for selections
   //the default can be set in qgisoptions
-  //use project properties to override the colour on a per project basis
+  //use project properties to override the color on a per project basis
   int myRed = settings.value( "/qgis/default_selection_color_red", 255 ).toInt();
   int myGreen = settings.value( "/qgis/default_selection_color_green", 255 ).toInt();
   int myBlue = settings.value( "/qgis/default_selection_color_blue", 0 ).toInt();
@@ -2678,9 +2678,9 @@
   prj->writeEntry( "Gui", "/SelectionColorBluePart", myBlue );
   QgsRenderer::setSelectionColor( QColor( myRed, myGreen, myBlue ) );
 
-  //set the canvas to the default background colour
+  //set the canvas to the default background color
   //the default can be set in qgisoptions
-  //use project properties to override the colour on a per project basis
+  //use project properties to override the color on a per project basis
   myRed = settings.value( "/qgis/default_canvas_color_red", 255 ).toInt();
   myGreen = settings.value( "/qgis/default_canvas_color_green", 255 ).toInt();
   myBlue = settings.value( "/qgis/default_canvas_color_blue", 255 ).toInt();
@@ -2945,7 +2945,7 @@
   int  myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
   int  myBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorBluePart", 255 );
   QColor myColor = QColor( myRedInt, myGreenInt, myBlueInt );
-  mMapCanvas->setCanvasColor( myColor ); //this is fill colour before rendering starts
+  mMapCanvas->setCanvasColor( myColor ); //this is fill color before rendering starts
   QgsDebugMsg( "Canvas background color restored..." );
 
   mMapCanvas->updateScale();
@@ -5124,7 +5124,7 @@
   int  myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
   int  myBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorBluePart", 255 );
   QColor myColor = QColor( myRedInt, myGreenInt, myBlueInt );
-  mMapCanvas->setCanvasColor( myColor ); // this is fill colour before rendering onto canvas
+  mMapCanvas->setCanvasColor( myColor ); // this is fill color before rendering onto canvas
 
   // Set the window title.
   setTitleBarText_( *this );

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -181,11 +181,11 @@
   cbxIdentifyResultsDocked->setChecked( settings.value( "/qgis/dockIdentifyResults", false ).toBool() );
   cbxAddPostgisDC->setChecked( settings.value( "/qgis/addPostgisDC", false ).toBool() );
 
-  //set the colour for selections
+  //set the color for selections
   int myRed = settings.value( "/qgis/default_selection_color_red", 255 ).toInt();
   int myGreen = settings.value( "/qgis/default_selection_color_green", 255 ).toInt();
   int myBlue = settings.value( "/qgis/default_selection_color_blue", 0 ).toInt();
-  pbnSelectionColour->setColor( QColor( myRed, myGreen, myBlue ) );
+  pbnSelectionColor->setColor( QColor( myRed, myGreen, myBlue ) );
 
   //set the default color for canvas background
   myRed = settings.value( "/qgis/default_canvas_color_red", 255 ).toInt();
@@ -197,7 +197,7 @@
   myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
   myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();
   myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();
-  pbnMeasureColour->setColor( QColor( myRed, myGreen, myBlue ) );
+  pbnMeasureColor->setColor( QColor( myRed, myGreen, myBlue ) );
 
   capitaliseCheckBox->setChecked( settings.value( "qgis/capitaliseLayerName", QVariant( false ) ).toBool() );
 
@@ -228,7 +228,7 @@
   myRed = settings.value( "/qgis/digitizing/line_color_red", 255 ).toInt();
   myGreen = settings.value( "/qgis/digitizing/line_color_green", 0 ).toInt();
   myBlue = settings.value( "/qgis/digitizing/line_color_blue", 0 ).toInt();
-  mLineColourToolButton->setColor( QColor( myRed, myGreen, myBlue ) );
+  mLineColorToolButton->setColor( QColor( myRed, myGreen, myBlue ) );
 
   //default snap mode
   mDefaultSnapModeComboBox->insertItem( 0, tr( "To vertex" ), "to vertex" );
@@ -327,12 +327,12 @@
   settings.setValue( "/Windows/Options/row", listWidget->currentRow() );
 }
 
-void QgsOptions::on_pbnSelectionColour_clicked()
+void QgsOptions::on_pbnSelectionColor_clicked()
 {
-  QColor color = QColorDialog::getColor( pbnSelectionColour->color(), this );
+  QColor color = QColorDialog::getColor( pbnSelectionColor->color(), this );
   if ( color.isValid() )
   {
-    pbnSelectionColour->setColor( color );
+    pbnSelectionColor->setColor( color );
   }
 }
 
@@ -345,21 +345,21 @@
   }
 }
 
-void QgsOptions::on_pbnMeasureColour_clicked()
+void QgsOptions::on_pbnMeasureColor_clicked()
 {
-  QColor color = QColorDialog::getColor( pbnMeasureColour->color(), this );
+  QColor color = QColorDialog::getColor( pbnMeasureColor->color(), this );
   if ( color.isValid() )
   {
-    pbnMeasureColour->setColor( color );
+    pbnMeasureColor->setColor( color );
   }
 }
 
-void QgsOptions::on_mLineColourToolButton_clicked()
+void QgsOptions::on_mLineColorToolButton_clicked()
 {
-  QColor color = QColorDialog::getColor( mLineColourToolButton->color(), this );
+  QColor color = QColorDialog::getColor( mLineColorToolButton->color(), this );
   if ( color.isValid() )
   {
-    mLineColourToolButton->setColor( color );
+    mLineColorToolButton->setColor( color );
   }
 }
 
@@ -497,8 +497,8 @@
     settings.setValue( "/qgis/measure/displayunits", "meters" );
   }
   settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
-  //set the colour for selections
-  QColor myColor = pbnSelectionColour->color();
+  //set the color for selections
+  QColor myColor = pbnSelectionColor->color();
   settings.setValue( "/qgis/default_selection_color_red", myColor.red() );
   settings.setValue( "/qgis/default_selection_color_green", myColor.green() );
   settings.setValue( "/qgis/default_selection_color_blue", myColor.blue() );
@@ -510,7 +510,7 @@
   settings.setValue( "/qgis/default_canvas_color_blue", myColor.blue() );
 
   //set the default color for the measure tool
-  myColor = pbnMeasureColour->color();
+  myColor = pbnMeasureColor->color();
   settings.setValue( "/qgis/default_measure_color_red", myColor.red() );
   settings.setValue( "/qgis/default_measure_color_green", myColor.green() );
   settings.setValue( "/qgis/default_measure_color_blue", myColor.blue() );
@@ -520,7 +520,7 @@
 
   //digitizing
   settings.setValue( "/qgis/digitizing/line_width", mLineWidthSpinBox->value() );
-  QColor digitizingColor = mLineColourToolButton->color();
+  QColor digitizingColor = mLineColorToolButton->color();
   settings.setValue( "/qgis/digitizing/line_color_red", digitizingColor.red() );
   settings.setValue( "/qgis/digitizing/line_color_green", digitizingColor.green() );
   settings.setValue( "/qgis/digitizing/line_color_blue", digitizingColor.blue() );

Modified: trunk/qgis/src/app/qgsoptions.h
===================================================================
--- trunk/qgis/src/app/qgsoptions.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgsoptions.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -64,24 +64,24 @@
      */
     bool newVisible();
     /*!
-     * Slot to select the default map selection colour
+     * Slot to select the default map selection color
      */
-    void on_pbnSelectionColour_clicked();
+    void on_pbnSelectionColor_clicked();
 
     /*!
-     * Slot to select the default measure tool colour
+     * Slot to select the default measure tool color
      */
-    void on_pbnMeasureColour_clicked();
+    void on_pbnMeasureColor_clicked();
 
     /*!
-     * Slot to select the default map selection colour
+     * Slot to select the default map selection color
      */
     void on_pbnCanvasColor_clicked();
 
     /*!
-     * Slot to select the colour of the digitizing rubber band
+     * Slot to select the color of the digitizing rubber band
      */
-    void on_mLineColourToolButton_clicked();
+    void on_mLineColorToolButton_clicked();
 
     /**Add a new URL to exclude from Proxy*/
     void on_mAddUrlPushButton_clicked();

Modified: trunk/qgis/src/app/qgsprojectproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgsprojectproperties.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -89,19 +89,19 @@
   int dp = QgsProject::instance()->readNumEntry( "PositionPrecision", "/DecimalPlaces" );
   spinBoxDP->setValue( dp );
 
-  //get the colour selections and set the button colour accordingly
+  //get the color selections and set the button color accordingly
   int myRedInt = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorRedPart", 255 );
   int myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorGreenPart", 255 );
   int myBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/SelectionColorBluePart", 0 );
-  QColor myColour = QColor( myRedInt, myGreenInt, myBlueInt );
-  pbnSelectionColour->setColor( myColour );
+  QColor myColor = QColor( myRedInt, myGreenInt, myBlueInt );
+  pbnSelectionColor->setColor( myColor );
 
-  //get the colour for map canvas background and set button colour accordingly (default white)
+  //get the color for map canvas background and set button color accordingly (default white)
   myRedInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorRedPart", 255 );
   myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
   myBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorBluePart", 255 );
-  myColour = QColor( myRedInt, myGreenInt, myBlueInt );
-  pbnCanvasColor->setColor( myColour );
+  myColor = QColor( myRedInt, myGreenInt, myBlueInt );
+  pbnCanvasColor->setColor( myColor );
 
   //read the digitizing settings
   int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
@@ -390,18 +390,18 @@
 
   QgsProject::instance()->writeEntry( "Paths", "/Absolute", cbxAbsolutePath->currentIndex() == 0 );
 
-  //set the colour for selections
-  QColor myColour = pbnSelectionColour->color();
-  QgsProject::instance()->writeEntry( "Gui", "/SelectionColorRedPart", myColour.red() );
-  QgsProject::instance()->writeEntry( "Gui", "/SelectionColorGreenPart", myColour.green() );
-  QgsProject::instance()->writeEntry( "Gui", "/SelectionColorBluePart", myColour.blue() );
-  QgsRenderer::setSelectionColor( myColour );
+  //set the color for selections
+  QColor myColor = pbnSelectionColor->color();
+  QgsProject::instance()->writeEntry( "Gui", "/SelectionColorRedPart", myColor.red() );
+  QgsProject::instance()->writeEntry( "Gui", "/SelectionColorGreenPart", myColor.green() );
+  QgsProject::instance()->writeEntry( "Gui", "/SelectionColorBluePart", myColor.blue() );
+  QgsRenderer::setSelectionColor( myColor );
 
-  //set the colour for canvas
-  myColour = pbnCanvasColor->color();
-  QgsProject::instance()->writeEntry( "Gui", "/CanvasColorRedPart", myColour.red() );
-  QgsProject::instance()->writeEntry( "Gui", "/CanvasColorGreenPart", myColour.green() );
-  QgsProject::instance()->writeEntry( "Gui", "/CanvasColorBluePart", myColour.blue() );
+  //set the color for canvas
+  myColor = pbnCanvasColor->color();
+  QgsProject::instance()->writeEntry( "Gui", "/CanvasColorRedPart", myColor.red() );
+  QgsProject::instance()->writeEntry( "Gui", "/CanvasColorGreenPart", myColor.green() );
+  QgsProject::instance()->writeEntry( "Gui", "/CanvasColorBluePart", myColor.blue() );
 
   //write the digitizing settings
   int topologicalEditingEnabled = ( mEnableTopologicalEditingCheckBox->checkState() == Qt::Checked ) ? 1 : 0;
@@ -475,7 +475,7 @@
 
   QgsProject::instance()->writeEntry( "Identify", "/disabledLayers", noIdentifyLayerList );
 
-  //todo XXX set canvas colour
+  //todo XXX set canvas color
   emit refresh();
 }
 
@@ -489,12 +489,12 @@
   tabWidget->setCurrentIndex( 1 );
 }
 
-void QgsProjectProperties::on_pbnSelectionColour_clicked()
+void QgsProjectProperties::on_pbnSelectionColor_clicked()
 {
-  QColor color = QColorDialog::getColor( pbnSelectionColour->color(), this );
+  QColor color = QColorDialog::getColor( pbnSelectionColor->color(), this );
   if ( color.isValid() )
   {
-    pbnSelectionColour->setColor( color );
+    pbnSelectionColor->setColor( color );
   }
 }
 

Modified: trunk/qgis/src/app/qgsprojectproperties.h
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgsprojectproperties.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -76,12 +76,12 @@
     void showProjectionsTab();
 
     /*!
-     * Slot to select the map selection colour
+     * Slot to select the map selection color
      */
-    void on_pbnSelectionColour_clicked();
+    void on_pbnSelectionColor_clicked();
 
     /*!
-     * Slot to select the map selection colour
+     * Slot to select the map selection color
      */
     void on_pbnCanvasColor_clicked();
 

Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1468,7 +1468,7 @@
   //make sure the layer is redrawn
   mRasterLayer->triggerRepaint();
 
-  //Becuase Min Max values can be set during the redraw if a strech is requested we need to resync after apply
+  //Because Min Max values can be set during the redraw if a strech is requested we need to resync after apply
   if ( mRasterLayerIsGdal && QgsContrastEnhancement::NoEnhancement != mRasterLayer->contrastEnhancementAlgorithm() )
   {
     //set the stdDevs and min max values

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.h
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -160,7 +160,7 @@
     void loadRows();
     void setRow( int row, int idx, const QgsField &field );
 
-    /**Requests all overlay plugis from the plugin registry. Usefull for inserting their dialogs as new tabs*/
+    /**Requests all overlay plugis from the plugin registry. Useful for inserting their dialogs as new tabs*/
     QList<QgsVectorOverlayPlugin*> overlayPlugins() const;
 
     /**Buffer pixmap which takes the picture of renderers before they are assigned to the vector layer*/

Modified: trunk/qgis/src/core/qgsapplication.cpp
===================================================================
--- trunk/qgis/src/core/qgsapplication.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/qgsapplication.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -376,7 +376,7 @@
 {
   //
   // Make the style sheet desktop preferences aware by using qappliation
-  // palette as a basis for colours where appropriate
+  // palette as a basis for colors where appropriate
   //
   QColor myColor1 = palette().highlight().color();
   QColor myColor2 = myColor1;

Modified: trunk/qgis/src/core/qgsattributeaction.h
===================================================================
--- trunk/qgis/src/core/qgsattributeaction.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/qgsattributeaction.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -63,7 +63,7 @@
     //! Whether to capture output for display when this action is run
     bool capture() const { return mCaptureOutput; }
 
-    //! Wheter the action is runable on the current platform
+    //! Whether the action is runable on the current platform
     bool runable() const
     {
       return mType == Generic ||

Modified: trunk/qgis/src/core/qgsrunprocess.cpp
===================================================================
--- trunk/qgis/src/core/qgsrunprocess.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/qgsrunprocess.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -101,7 +101,7 @@
 {
   QString line( mProcess->readAllStandardError() );
 
-  // Add the new output to the dialog box, but colour it red
+  // Add the new output to the dialog box, but color it red
   mOutput->appendMessage( "<font color=red>" + line + "</font>" );
 }
 

Modified: trunk/qgis/src/core/qgssearchstringparser.yy
===================================================================
--- trunk/qgis/src/core/qgssearchstringparser.yy	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/qgssearchstringparser.yy	2009-12-23 16:14:24 UTC (rev 12600)
@@ -84,8 +84,8 @@
 //%error-verbose
 
 // operator precedence
-// all operators have left associativity, i.e. 1+2+3 traslates to (1+2)+3
-// the order of operators here determines their precendence
+// all operators have left associativity, i.e. 1+2+3 translates to (1+2)+3
+// the order of operators here determines their precedence
 
 %left OR
 %left AND
@@ -96,7 +96,7 @@
 %left '+' '-'
 %left '*' '/'
 %left '^'
-%left UMINUS  // fictious symbol (for unary minus)
+%left UMINUS  // fictitious symbol (for unary minus)
 
 
 %%

Modified: trunk/qgis/src/core/raster/qgsfreakoutshader.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsfreakoutshader.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/raster/qgsfreakoutshader.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -29,7 +29,7 @@
 
 void QgsFreakOutShader::setClassBreaks()
 {
-  //set up the three class breaks for pseudocolour mapping
+  //set up the three class breaks for pseudocolor mapping
   mBreakSize = mMinimumMaximumRange / 3;
   mClassBreakMin1 = mMinimumValue;
   mClassBreakMax1 = mClassBreakMin1 + mBreakSize;

Modified: trunk/qgis/src/core/raster/qgslinearminmaxenhancement.h
===================================================================
--- trunk/qgis/src/core/raster/qgslinearminmaxenhancement.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/raster/qgslinearminmaxenhancement.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -22,7 +22,7 @@
 #include "qgscontrastenhancementfunction.h"
 
 /** \ingroup core
-  * A colour enhancement function that performs a linear enhanceContrast between min and max.
+  * A color enhancement function that performs a linear enhanceContrast between min and max.
   */
 class CORE_EXPORT QgsLinearMinMaxEnhancement : public QgsContrastEnhancementFunction
 {

Modified: trunk/qgis/src/core/raster/qgspseudocolorshader.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgspseudocolorshader.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/raster/qgspseudocolorshader.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -79,7 +79,7 @@
 
 void QgsPseudoColorShader::setClassBreaks()
 {
-  //set up the three class breaks for pseudocolour mapping
+  //set up the three class breaks for pseudocolor mapping
   mBreakSize = mMinimumMaximumRange / 3;
   mClassBreakMin1 = mMinimumValue;
   mClassBreakMax1 = mClassBreakMin1 + mBreakSize;

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1417,7 +1417,7 @@
 {
   QgsDebugMsg( "entered. (renderContext)" );
 
-  //Dont waste time drawing if transparency is at 0 (completely transparent)
+  // Don't waste time drawing if transparency is at 0 (completely transparent)
   if ( mTransparencyLevel == 0 )
     return TRUE;
 
@@ -2097,7 +2097,7 @@
               mDrawingStyle == PalettedSingleBandPseudoColor || mDrawingStyle == SingleBandPseudoColor )
     {
 
-      //set up the three class breaks for pseudocolour mapping
+      //set up the three class breaks for pseudocolor mapping
       double myRangeSize = 90;  //hard coded for now
       double myBreakSize = myRangeSize / 3;
       double myClassBreakMin1 = 0;
@@ -2314,7 +2314,7 @@
   //these next two vars are not used anywhere so commented out for now
   //int myLongestLabelWidth =  myQFontMetrics.width(name());
   //const int myHorizontalLabelSpacing = 5;
-  const int myColourBarWidth = 10;
+  const int myColorBarWidth = 10;
   //
   // Get the adjusted matrix stats
   //
@@ -2353,7 +2353,7 @@
             mDrawingStyle == PalettedSingleBandPseudoColor || mDrawingStyle == SingleBandPseudoColor )
   {
 
-    //set up the three class breaks for pseudocolour mapping
+    //set up the three class breaks for pseudocolor mapping
     double myRangeSize = 90;  //hard coded for now
     double myBreakSize = myRangeSize / 3;
     double myClassBreakMin1 = 0;
@@ -2496,11 +2496,11 @@
   //hard coding thes values for now.
   if ( myLegendQPixmap.height() == 3 )
   {
-    myQWMatrix.scale( myColourBarWidth, 2 );
+    myQWMatrix.scale( myColorBarWidth, 2 );
   }
   else
   {
-    myQWMatrix.scale( myColourBarWidth, 2 );
+    myQWMatrix.scale( myColorBarWidth, 2 );
   }
   //apply the matrix
   QPixmap myQPixmap2 = myLegendQPixmap.transformed( myQWMatrix );
@@ -4773,7 +4773,7 @@
 }
 
 /**
- * This method is used to render a paletted raster layer as a colour image -- currently not supported
+ * This method is used to render a paletted raster layer as a color image -- currently not supported
  * @param theQPainter - pointer to the QPainter onto which the layer should be drawn.
  * @param theRasterViewPort - pointer to the ViewPort struct containing dimensions of viewable area and subset area to be extracted from data file.
  * @param theGdalBand - pointer to the GDALRasterBand which should be rendered.
@@ -5269,7 +5269,7 @@
   mHeight = GDALGetRasterYSize( mGdalDataset );
 
   //
-  // Determin the nodatavalue
+  // Determine the nodata value
   //
   mNoDataValue = -9999.0; //Standard default?
   mValidNoDataValue = false;

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.h
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -471,7 +471,7 @@
 
     /** \brief Returns a string representation of drawing style
      *
-     * Implementaed mainly for serialisation / deserialisation of settings to xml.
+     * Implemented mainly for serialisation / deserialisation of settings to xml.
      * NOTE: May be deprecated in the future!. DrawingStyle drawingStyle() instead.
      * */
     QString drawingStyleAsString() const;

Modified: trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -176,7 +176,7 @@
     }
     if ( selected )
     {
-      //for polygons we don't use selection colour for outline
+      //for polygons we don't use selection color for outline
       //otherwise adjacent features appear merged when selected
       if ( mGeometryType != QGis::Polygon )
       {

Modified: trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -202,7 +202,7 @@
         brush.setColor( mSelectionColor );
         p->setBrush( brush );
       }
-      else //don't draw outlines in selection colour for polys otherwise they appear merged
+      else //don't draw outlines in selection color for polys otherwise they appear merged
       {
         pen.setColor( mSelectionColor );
       }

Modified: trunk/qgis/src/core/renderer/qgsrenderer.h
===================================================================
--- trunk/qgis/src/core/renderer/qgsrenderer.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/renderer/qgsrenderer.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -40,7 +40,7 @@
 class CORE_EXPORT QgsRenderer
 {
   public:
-    /** Default ctor sets up selection colour from project properties */
+    /** Default ctor sets up selection color from project properties */
     QgsRenderer();
     /** Virtual destructor because we have virtual methods... */
     virtual ~QgsRenderer();

Modified: trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -175,7 +175,7 @@
         brush.setColor( mSelectionColor );
         p->setBrush( brush );
       }
-      else //don't draw outlines of polygons in selection colour otherwise they appear merged
+      else //don't draw outlines of polygons in selection color otherwise they appear merged
       {
         pen.setColor( mSelectionColor );
       }

Modified: trunk/qgis/src/core/spatialite/sqlite3.c
===================================================================
--- trunk/qgis/src/core/spatialite/sqlite3.c	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/spatialite/sqlite3.c	2009-12-23 16:14:24 UTC (rev 12600)
@@ -16860,7 +16860,7 @@
         }
         if( xtype==etGENERIC && precision>0 ) precision--;
 #if 0
-        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
+        /* Rounding works like BSD when the constant 0.4999 is used.  Weird! */
         for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
 #else
         /* It makes more sense to use 0.5 */

Modified: trunk/qgis/src/core/symbology/qgssymbol.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/core/symbology/qgssymbol.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -434,8 +434,8 @@
   QPen pen = mPen;
   pen.setColor( selectionColor );
   QBrush brush = mBrush;
-  // For symbols that have a different coloured border, the line
-  // below causes the fill colour to be wrong for the print
+  // For symbols that have a different colored border, the line
+  // below causes the fill color to be wrong for the print
   // composer. Not sure why...
   // brush.setColor ( selectionColor );
 

Modified: trunk/qgis/src/designer/README.txt
===================================================================
--- trunk/qgis/src/designer/README.txt	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/designer/README.txt	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1,4 +1,4 @@
-Notes on the useage of the QGIS custom designer plugins
+Notes on the usage of the QGIS custom designer plugins
 
                  Tim Sutton, 2006
 --------------------------------------------------------

Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -949,7 +949,7 @@
     }
     else
     {
-      // search ahead of the current postion
+      // search ahead of the current position
       mySql = "select srs_id from tbl_srs where description like '%" + mySearchString + "%'" +
               " and srs_id > " + QString::number( selectedCrsId() ) + " order by srs_id limit 1";
     }

Modified: trunk/qgis/src/gui/qgsquickprint.cpp
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/gui/qgsquickprint.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -97,7 +97,7 @@
 void QgsQuickPrint::setMapCanvas( QgsMapCanvas * thepMapCanvas )
 {
   mpMapRenderer = thepMapCanvas->mapRenderer();
-  mMapBackgroundColour = thepMapCanvas->canvasColor();
+  mMapBackgroundColor = thepMapCanvas->canvasColor();
 }
 void QgsQuickPrint::setMapRenderer( QgsMapRenderer * thepMapRenderer )
 {
@@ -105,7 +105,7 @@
 }
 void QgsQuickPrint::setMapBackgroundColor( QColor theColor )
 {
-  mMapBackgroundColour = theColor;
+  mMapBackgroundColor = theColor;
 }
 void QgsQuickPrint::setPageSize( QPrinter::PageSize theSize )
 {
@@ -247,9 +247,9 @@
 #endif
   QString myFontFamily = "Arial";
 
-  // Background colour for pixmaps
-  QColor myLegendBackgroundColour = Qt::white;
-  //QColor myMapBackgroundColour = "#98dbf9"; // nice blue colour
+  // Background color for pixmaps
+  QColor myLegendBackgroundColor = Qt::white;
+  //QColor myMapBackgroundColor = "#98dbf9"; // nice blue color
 
 
   //
@@ -780,7 +780,7 @@
 {
   //hard coding some options for now
   bool mySnappingFlag = true;
-  QColor mColour = Qt::black;
+  QColor mColor = Qt::black;
   // Hard coded sizes
   int myTextOffsetX = 0;
   int myTextOffsetY = 5;
@@ -905,7 +905,7 @@
   int myOriginY = myYMargin;
 
   //Set pen to draw with
-  QPen myForegroundPen( mColour, 2 );
+  QPen myForegroundPen( mColor, 2 );
   QPen myBackgroundPen( Qt::white, 3 );
 
   //Cast myScaleBarWidth to int for drawing

Modified: trunk/qgis/src/gui/qgsquickprint.h
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/gui/qgsquickprint.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -108,7 +108,7 @@
     QString mLogo1File;
     QString mLogo2File;
     QString mOutputFileName;
-    QColor mMapBackgroundColour;
+    QColor mMapBackgroundColor;
     QPrinter::PageSize mPageSize;
 };
 

Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt	2009-12-23 16:14:24 UTC (rev 12600)
@@ -54,7 +54,7 @@
 
 #QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
 
-ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
+ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_SOURCE_DIR}/../core
@@ -97,8 +97,8 @@
 ########################################################
 # Install
 
-IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
-  INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
-ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+IF (APPLE)
+  INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+ELSE (APPLE)
   INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
-ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+ENDIF (APPLE)

Modified: trunk/qgis/src/plugins/copyright_label/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/copyright_label/plugin.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/copyright_label/plugin.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -160,7 +160,7 @@
 
     QTextDocument text;
     text.setDefaultFont( mQFont );
-    // To set the text colour in a QTextDocument we use a CSS style
+    // To set the text color in a QTextDocument we use a CSS style
     QString style = "<style type=\"text/css\"> p {color: " +
                     mLabelQColor.name() + "}</style>";
     text.setHtml( style + "<p>" + mLabelQString + "</p>" );
@@ -234,7 +234,7 @@
   QgsProject::instance()->writeEntry( "CopyrightLabel", "/Label", mLabelQString );
   refreshCanvas();
 }
-//! change the copyright text colour
+//! change the copyright text color
 void QgsCopyrightLabelPlugin::setColor( QColor theQColor )
 {
   mLabelQColor = theQColor;

Modified: trunk/qgis/src/plugins/copyright_label/plugin.h
===================================================================
--- trunk/qgis/src/plugins/copyright_label/plugin.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/copyright_label/plugin.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -64,7 +64,7 @@
     void setFont( QFont );
     //! change the copyright text
     void setLabel( QString );
-    //! change the copyright font colour
+    //! change the copyright font color
     void setColor( QColor );
     //! set copyright label placement
     void setPlacement( int );
@@ -80,7 +80,7 @@
     QFont mQFont;
     //! This is the string that will be used for the copyright label
     QString mLabelQString;
-    //! This is the colour for the copyright label
+    //! This is the color for the copyright label
     QColor mLabelQColor;
     //! Placement of the copyright label - index and translated label names
     int mPlacementIndex;

Deleted: trunk/qgis/src/plugins/copyright_label/pluginguibase.ui.h
===================================================================
--- trunk/qgis/src/plugins/copyright_label/pluginguibase.ui.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/copyright_label/pluginguibase.ui.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1,70 +0,0 @@
-
-
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
-#include <qcolordialog.h>
-#include <qcolor.h>
-#include <qfontdialog.h>
-#include <qfont.h>
-
-void QgsCopyrightLabelPluginGuiBase::pbnOK_clicked()
-{
-
-}
-
-
-void QgsCopyrightLabelPluginGuiBase::pbnCancel_clicked()
-{
-
-}
-
-
-void QgsCopyrightLabelPluginGuiBase::btnFontColour_clicked()
-{
-  QColor myQColor = QColorDialog::getColor();
-  txtCopyrightText->setPaletteForegroundColor( myQColor );
-}
-
-
-void QgsCopyrightLabelPluginGuiBase::btnFontFace_clicked()
-{
-  bool ok;
-  QFont myFont = QFontDialog::getFont(
-                   &ok, QFont( "Helvetica", 10 ), this );
-  if ( ok )
-  {
-    // font is set to the font the user selected
-    txtCopyrightText->setCurrentFont( myFont );
-  }
-  else
-  {
-    // the user canceled the dialog; font is set to the initial
-    // value, in this case Helvetica [Cronyx], 10
-  }
-
-
-}
-
-
-void QgsCopyrightLabelPluginGuiBase::cboxEnabled_toggled( bool )
-{
-
-}
-
-
-void QgsCopyrightLabelPluginGuiBase::cboOrientation_textChanged( const QString & )
-{
-
-}
-
-
-void QgsCopyrightLabelPluginGuiBase::cboPlacement_highlighted( const QString & )
-{
-
-}

Modified: trunk/qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
===================================================================
--- trunk/qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -478,7 +478,7 @@
 #define SCALE_Z_CODE         43
 #define BULGE_CODE           42  // Used in PLINE verts for arcs
 #define ROTATION_CODE        50
-#define COLOUR_CODE          62  // What follows is a color int
+#define COLOR_CODE           62  // What follows is a color int
 #define LTYPE_CODE            6  // What follows is a linetype
 
 

Modified: trunk/qgis/src/plugins/grass/qgsgrassedit.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedit.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qgsgrassedit.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -217,7 +217,7 @@
     //! Window with attributes closed
     void attributesClosed();
 
-    //! Recieve key press from different widget
+    //! Receive key press from different widget
     void keyPress( QKeyEvent *e );
 
   signals:

Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1712,7 +1712,7 @@
         connect( b, SIGNAL( clicked() ), this, SLOT( removeLineEdit() ) );
         vl->addWidget( b, 0, Qt::AlignTop );
 
-        // Dont enable this, it makes the group box expanding
+        // Don't enable this, it makes the group box expanding
         // vl->addStretch();
       }
       else

Modified: trunk/qgis/src/plugins/grass/qtermwidget/CharacterColor.h
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/CharacterColor.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qtermwidget/CharacterColor.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -134,8 +134,8 @@
      3     - Index(256)  - u: 16..255  v:0        w:0
      4     - RGB         - u:  0..255  v:0..256   w:0..256
 
-     Default colour space has two separate colours, namely
-     default foreground and default background colour.
+     Default color space has two separate colors, namely
+     default foreground and default background color.
   */
 
 #define COLOR_SPACE_UNDEFINED   0

Modified: trunk/qgis/src/plugins/grass/qtermwidget/Screen.h
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/Screen.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qtermwidget/Screen.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -75,7 +75,7 @@
       The screen image has a selection associated with it, specified using
       setSelectionStart() and setSelectionEnd().  The selected text can be retrieved
       using selectedText().  When getImage() is used to retrieve the the visible image,
-      characters which are part of the selection have their colours inverted.
+      characters which are part of the selection have their colors inverted.
   */
   class Screen
   {

Modified: trunk/qgis/src/plugins/grass/qtermwidget/Session.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/Session.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qtermwidget/Session.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -342,7 +342,7 @@
   if ( what == 11 )
   {
     QString colorString = caption.section( ';', 0, 0 );
-    qDebug() << __FILE__ << __LINE__ << ": setting background colour to " << colorString;
+    qDebug() << __FILE__ << __LINE__ << ": setting background color to " << colorString;
     QColor backColor = QColor( colorString );
     if ( backColor.isValid() ) // change color via \033]11;Color\007
     {

Modified: trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -160,7 +160,7 @@
       if ( _lastRendition & RE_UNDERLINE )
         style.append( "font-decoration:underline;" );
 
-      //colours - a colour table must have been defined first
+      //colors - a color table must have been defined first
       if ( _colorTable )
       {
         style.append( QString( "color:%1;" ).arg( _lastForeColor.color( _colorTable ).name() ) );

Modified: trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -35,9 +35,9 @@
    * Base class for terminal character decoders
    *
    * The decoder converts lines of terminal characters which consist of a unicode character, foreground
-   * and background colours and other appearance-related properties into text strings.
+   * and background colors and other appearance-related properties into text strings.
    *
-   * Derived classes may produce either plain text with no other colour or appearance information, or
+   * Derived classes may produce either plain text with no other color or appearance information, or
    * they may produce text which incorporates these additional properties.
    */
   class TerminalCharacterDecoder
@@ -64,7 +64,7 @@
   };
 
   /**
-   * A terminal character decoder which produces plain text, ignoring colours and other appearance-related
+   * A terminal character decoder which produces plain text, ignoring colors and other appearance-related
    * properties of the original characters.
    */
   class PlainTextDecoder : public TerminalCharacterDecoder
@@ -109,7 +109,7 @@
       HTMLDecoder();
 
       /**
-       * Sets the colour table which the decoder uses to produce the HTML colour codes in its
+       * Sets the color table which the decoder uses to produce the HTML color codes in its
        * output
        */
       void setColorTable( const ColorEntry* table );

Modified: trunk/qgis/src/plugins/grass/qtermwidget/TerminalDisplay.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qtermwidget/TerminalDisplay.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/grass/qtermwidget/TerminalDisplay.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -592,7 +592,7 @@
 
         if ( !_cursorColor.isValid() )
         {
-          // invert the colour used to draw the text to ensure that the character at
+          // invert the color used to draw the text to ensure that the character at
           // the cursor position is readable
           invertCharacterColor = true;
         }
@@ -1214,7 +1214,7 @@
       // drawn on top of them
       else if ( spot->type() == Filter::HotSpot::Marker )
       {
-        //TODO - Do not use a hardcoded colour for this
+        //TODO - Do not use a hardcoded color for this
         painter.fillRect( r, QBrush( QColor( 255, 0, 0, 120 ) ) );
       }
     }

Deleted: trunk/qgis/src/plugins/north_arrow/pluginguibase.ui.h
===================================================================
--- trunk/qgis/src/plugins/north_arrow/pluginguibase.ui.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/north_arrow/pluginguibase.ui.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1,58 +0,0 @@
-
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
-
-
-
-void QgsNorthArrowPluginGuiBase::pbnOK_clicked()
-{
-
-}
-
-
-void QgsNorthArrowPluginGuiBase::pbnCancel_clicked()
-{
-
-}
-
-
-
-
-
-
-void QgsNorthArrowPluginGuiBase::sliderRotation_valueChanged( int )
-{
-
-}
-
-
-void QgsNorthArrowPluginGuiBase::sliderRotation_sliderMoved( int )
-{
-
-}
-
-
-void QgsNorthArrowPluginGuiBase::spinSize_valueChanged( int )
-{
-
-}
-
-
-void QgsNorthArrowPluginGuiBase::cboxShow_toggled( bool )
-{
-
-}
-
-
-void QgsNorthArrowPluginGuiBase::cboPlacement_textChanged( const QString & )
-{
-
-}
-
-

Modified: trunk/qgis/src/plugins/scale_bar/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/scale_bar/plugin.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/scale_bar/plugin.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -86,7 +86,7 @@
   mStyleIndex = 0;
   mEnabled = true;
   mSnapping = true;
-  mColour = Qt::black;
+  mColor = Qt::black;
 }
 
 QgsScaleBarPlugin::~QgsScaleBarPlugin()
@@ -129,7 +129,7 @@
   int myRedInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorRedPart", 0 );
   int myGreenInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorGreenPart", 0 );
   int myBlueInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorBluePart", 0 );
-  mColour = QColor( myRedInt, myGreenInt, myBlueInt );
+  mColor = QColor( myRedInt, myGreenInt, myBlueInt );
 }
 //method defined in interface
 void QgsScaleBarPlugin::help()
@@ -149,14 +149,14 @@
   myPluginGui->setEnabled( mEnabled );
   myPluginGui->setStyleLabels( mStyleLabels );
   myPluginGui->setStyle( mStyleIndex );
-  myPluginGui->setColour( mColour );
+  myPluginGui->setColor( mColor );
 
   connect( myPluginGui, SIGNAL( changePreferredSize( int ) ), this, SLOT( setPreferredSize( int ) ) );
   connect( myPluginGui, SIGNAL( changeSnapping( bool ) ), this, SLOT( setSnapping( bool ) ) );
   connect( myPluginGui, SIGNAL( changePlacement( int ) ), this, SLOT( setPlacement( int ) ) );
   connect( myPluginGui, SIGNAL( changeEnabled( bool ) ), this, SLOT( setEnabled( bool ) ) );
   connect( myPluginGui, SIGNAL( changeStyle( int ) ), this, SLOT( setStyle( int ) ) );
-  connect( myPluginGui, SIGNAL( changeColour( QColor ) ), this, SLOT( setColour( QColor ) ) );
+  connect( myPluginGui, SIGNAL( changeColor( QColor ) ), this, SLOT( setColor( QColor ) ) );
   connect( myPluginGui, SIGNAL( refreshCanvas() ), this, SLOT( refreshCanvas() ) );
   myPluginGui->show();
   //set the map units in the spin box
@@ -341,7 +341,7 @@
     }
 
     //Set pen to draw with
-    QPen myForegroundPen( mColour, 2 );
+    QPen myForegroundPen( mColor, 2 );
     QPen myBackgroundPen( Qt::white, 4 );
 
     //Cast myScaleBarWidth to int for drawing
@@ -433,7 +433,7 @@
         theQPainter->drawPolyline( myBoxArray );
         //now draw the bar itself in user selected color
         theQPainter->setPen( myForegroundPen );
-        theQPainter->setBrush( QBrush( mColour, Qt::SolidPattern ) );
+        theQPainter->setBrush( QBrush( mColor, Qt::SolidPattern ) );
         int midPointX = myScaleBarWidthInt / 2 + myOriginX;
         myBoxArray.putPoints( 0, 5,
                               myOriginX                    ,  myOriginY,
@@ -591,13 +591,13 @@
   mStyleIndex = styleIndex;
   QgsProject::instance()->writeEntry( "ScaleBar", "/Style", mStyleIndex );
 }
-//! set the scale bar colour
-void QgsScaleBarPlugin::setColour( QColor theQColor )
+//! set the scale bar color
+void QgsScaleBarPlugin::setColor( QColor theQColor )
 {
-  mColour = theQColor;
-  QgsProject::instance()->writeEntry( "ScaleBar", "/ColorRedPart", mColour.red() );
-  QgsProject::instance()->writeEntry( "ScaleBar", "/ColorGreenPart", mColour.green() );
-  QgsProject::instance()->writeEntry( "ScaleBar", "/ColorBluePart", mColour.blue() );
+  mColor = theQColor;
+  QgsProject::instance()->writeEntry( "ScaleBar", "/ColorRedPart", mColor.red() );
+  QgsProject::instance()->writeEntry( "ScaleBar", "/ColorGreenPart", mColor.green() );
+  QgsProject::instance()->writeEntry( "ScaleBar", "/ColorBluePart", mColor.blue() );
 }
 
 //! Set icons to the current theme

Modified: trunk/qgis/src/plugins/scale_bar/plugin.h
===================================================================
--- trunk/qgis/src/plugins/scale_bar/plugin.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/scale_bar/plugin.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -74,8 +74,8 @@
     void setEnabled( bool );
     //! set the scale bar style
     void setStyle( int );
-    //! set the scale bar colour
-    void setColour( QColor );
+    //! set the scale bar color
+    void setColor( QColor );
     //! update the plugins theme when the app tells us its theme is changed
     void setCurrentTheme( QString theThemeName );
 
@@ -96,8 +96,8 @@
     //! Style of scale bar. An index and the translated text
     int mStyleIndex;
     QStringList mStyleLabels;
-    //! The scale bar colour
-    QColor mColour;
+    //! The scale bar color
+    QColor mColor;
 
     //! Pointer to the QGIS interface object
     QgisInterface *qGisInterface;

Modified: trunk/qgis/src/plugins/scale_bar/plugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/scale_bar/plugingui.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/scale_bar/plugingui.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -37,17 +37,17 @@
   emit changeSnapping( chkSnapping->isChecked() );
   emit changeEnabled( chkEnable->isChecked() );
   emit changeStyle( cboStyle->currentIndex() );
-  emit changeColour( pbnChangeColour->color() );
+  emit changeColor( pbnChangeColor->color() );
   emit refreshCanvas();
   accept();
 }
 
-void QgsScaleBarPluginGui::on_pbnChangeColour_clicked()
+void QgsScaleBarPluginGui::on_pbnChangeColor_clicked()
 {
-  QColor colour = QColorDialog::getColor( pbnChangeColour->color(), this );
+  QColor color = QColorDialog::getColor( pbnChangeColor->color(), this );
 
-  if ( colour.isValid() )
-    setColour( colour );
+  if ( color.isValid() )
+    setColor( color );
 }
 
 void QgsScaleBarPluginGui::on_buttonBox_rejected()
@@ -91,7 +91,7 @@
   cboStyle->setCurrentIndex( styleIndex );
 }
 
-void QgsScaleBarPluginGui::setColour( QColor theQColor )
+void QgsScaleBarPluginGui::setColor( QColor theQColor )
 {
-  pbnChangeColour->setColor( theQColor );
+  pbnChangeColor->setColor( theQColor );
 }

Modified: trunk/qgis/src/plugins/scale_bar/plugingui.h
===================================================================
--- trunk/qgis/src/plugins/scale_bar/plugingui.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/scale_bar/plugingui.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -33,7 +33,7 @@
     void setEnabled( bool );
     void setStyleLabels( QStringList& );
     void setStyle( int );
-    void setColour( QColor );
+    void setColor( QColor );
 
     //accessor for getting a pointer to the size spin widget
     QSpinBox * getSpinSize();
@@ -42,7 +42,7 @@
     void on_buttonBox_accepted();
     void on_buttonBox_rejected();
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
-    void on_pbnChangeColour_clicked();
+    void on_pbnChangeColor_clicked();
 
   signals:
     void drawRasterLayer( QString );
@@ -52,7 +52,7 @@
     void changeSnapping( bool );
     void changeEnabled( bool );
     void changeStyle( int );
-    void changeColour( QColor );
+    void changeColor( QColor );
     void refreshCanvas();
 };
 

Modified: trunk/qgis/src/plugins/scale_bar/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/scale_bar/pluginguibase.ui	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/scale_bar/pluginguibase.ui	2009-12-23 16:14:24 UTC (rev 12600)
@@ -126,12 +126,12 @@
       <string>Colour of bar</string>
      </property>
      <property name="buddy">
-      <cstring>pbnChangeColour</cstring>
+      <cstring>pbnChangeColor</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QgsColorButton" name="pbnChangeColour">
+    <widget class="QgsColorButton" name="pbnChangeColor">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
        <horstretch>0</horstretch>
@@ -230,7 +230,7 @@
  <tabstops>
   <tabstop>cboPlacement</tabstop>
   <tabstop>cboStyle</tabstop>
-  <tabstop>pbnChangeColour</tabstop>
+  <tabstop>pbnChangeColor</tabstop>
   <tabstop>spnSize</tabstop>
   <tabstop>chkEnable</tabstop>
   <tabstop>chkSnapping</tabstop>

Deleted: trunk/qgis/src/plugins/scale_bar/pluginguibase.ui.h
===================================================================
--- trunk/qgis/src/plugins/scale_bar/pluginguibase.ui.h	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/plugins/scale_bar/pluginguibase.ui.h	2009-12-23 16:14:24 UTC (rev 12600)
@@ -1,81 +0,0 @@
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
-#include <qcolordialog.h>
-
-void QgsScaleBarPluginGuiBase::pbnOK_clicked()
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::pbnCancel_clicked()
-{
-
-}
-
-
-
-
-
-
-
-
-
-void QgsScaleBarPluginGuiBase::btnTopLeft_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnTopMiddle_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnTopRight_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnMiddleLeft_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnMiddleRight_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnBottomLeft_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnBottomMiddle_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::btnBottomRight_toggled( bool )
-{
-
-}
-
-
-void QgsScaleBarPluginGuiBase::pbnChangeColour_clicked()
-{
-  frameColour->setPaletteBackgroundColor( QColorDialog::getColor( QColor( Qt::black ), this ) );
-}

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2009-12-23 16:14:24 UTC (rev 12600)
@@ -70,7 +70,7 @@
            </widget>
           </item>
           <item row="0" column="3">
-           <widget class="QgsColorButton" name="pbnSelectionColour">
+           <widget class="QgsColorButton" name="pbnSelectionColor">
             <property name="minimumSize">
              <size>
               <width>100</width>
@@ -539,7 +539,7 @@
            </spacer>
           </item>
           <item row="1" column="1">
-           <widget class="QgsColorButton" name="pbnMeasureColour">
+           <widget class="QgsColorButton" name="pbnMeasureColor">
             <property name="minimumSize">
              <size>
               <width>100</width>
@@ -675,14 +675,14 @@
            </widget>
           </item>
           <item row="1" column="0">
-           <widget class="QLabel" name="mLineColourTextLabel">
+           <widget class="QLabel" name="mLineColorTextLabel">
             <property name="text">
              <string>Line colour</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QgsColorButton" name="mLineColourToolButton">
+           <widget class="QgsColorButton" name="mLineColorToolButton">
             <property name="minimumSize">
              <size>
               <width>100</width>
@@ -1403,7 +1403,7 @@
   <tabstop>stackedWidget</tabstop>
   <tabstop>chbAskToSaveProjectChanges</tabstop>
   <tabstop>chbWarnOldProjectVersion</tabstop>
-  <tabstop>pbnSelectionColour</tabstop>
+  <tabstop>pbnSelectionColor</tabstop>
   <tabstop>pbnCanvasColor</tabstop>
   <tabstop>cmbTheme</tabstop>
   <tabstop>capitaliseCheckBox</tabstop>
@@ -1423,14 +1423,14 @@
   <tabstop>cmbIdentifyMode</tabstop>
   <tabstop>spinBoxIdentifyValue</tabstop>
   <tabstop>cmbEllipsoid</tabstop>
-  <tabstop>pbnMeasureColour</tabstop>
+  <tabstop>pbnMeasureColor</tabstop>
   <tabstop>radMeters</tabstop>
   <tabstop>radFeet</tabstop>
   <tabstop>cmbWheelAction</tabstop>
   <tabstop>spinZoomFactor</tabstop>
   <tabstop>mOverlayAlgorithmComboBox</tabstop>
   <tabstop>mLineWidthSpinBox</tabstop>
-  <tabstop>mLineColourToolButton</tabstop>
+  <tabstop>mLineColorToolButton</tabstop>
   <tabstop>mDefaultSnapModeComboBox</tabstop>
   <tabstop>mDefaultSnappingToleranceSpinBox</tabstop>
   <tabstop>mDefaultSnappingToleranceComboBox</tabstop>

Modified: trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectpropertiesbase.ui	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/src/ui/qgsprojectpropertiesbase.ui	2009-12-23 16:14:24 UTC (rev 12600)
@@ -62,7 +62,7 @@
              <string>Selection color</string>
             </property>
             <property name="buddy">
-             <cstring>pbnSelectionColour</cstring>
+             <cstring>pbnSelectionColor</cstring>
             </property>
            </widget>
           </item>
@@ -83,7 +83,7 @@
            </spacer>
           </item>
           <item row="1" column="3">
-           <widget class="QgsColorButton" name="pbnSelectionColour">
+           <widget class="QgsColorButton" name="pbnSelectionColor">
             <property name="minimumSize">
              <size>
               <width>100</width>
@@ -401,7 +401,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>titleEdit</tabstop>
-  <tabstop>pbnSelectionColour</tabstop>
+  <tabstop>pbnSelectionColor</tabstop>
   <tabstop>pbnCanvasColor</tabstop>
   <tabstop>cbxAbsolutePath</tabstop>
   <tabstop>radMeters</tabstop>

Modified: trunk/qgis/tests/src/core/testqgsgeometry.cpp
===================================================================
--- trunk/qgis/tests/src/core/testqgsgeometry.cpp	2009-12-23 16:08:30 UTC (rev 12599)
+++ trunk/qgis/tests/src/core/testqgsgeometry.cpp	2009-12-23 16:14:24 UTC (rev 12600)
@@ -46,7 +46,7 @@
     void cleanupTestCase();// will be called after the last testfunction was executed.
     void init();// will be called before each testfunction is executed.
     void cleanup();// will be called after every testfunction.
-    
+
     void simplifyCheck1();
     void intersectionCheck1();
     void intersectionCheck2();
@@ -115,7 +115,7 @@
   mPointX = QgsPoint( 240.0, 200.0 );
   mPointY = QgsPoint( 240.0, 240.0 );
   mPointZ = QgsPoint( 200.0, 240.0 );
-  
+
   mWktLine = QString( "LINESTRING(117.623198 35.198654, 117.581274 35.198654, 117.078178 35.324427, 116.868555 35.534051, 116.617007 35.869448, 116.491233 35.953297, 116.155836 36.288694, 116.071987 36.372544, 115.443117 36.749865, 114.814247 37.043338, 114.311152 37.169112, 113.388810 37.378735, 113.095337 37.378735, 112.592241 37.378735, 111.753748 37.294886, 111.502201 37.252961, 111.082954 37.127187, 110.747557 37.127187, 110.160612 36.917564, 110.034838 36.833715, 109.741366 36.749865, 109.573667 36.666016, 109.238270 36.498317, 109.070571 36.414468, 108.819023 36.288694, 108.693250 36.246770, 108.483626 36.162920, 107.645134 35.911372, 106.597017 35.869448, 106.051997 35.701749, 105.800449 35.617900, 105.590826 35.575975, 105.297354 35.575975, 104.961956 35.575975, 104.710409 35.534051, 104.458861 35.492126, 103.871916 35.492126, 103.788066 35.492126, 103.326895 35.408277, 102.949574 35.408277, 102.488402 35.450201, 102.069156 35.450201, 101.482211 35.450201, 100.937191 35.659825, 100.308321 35.869448, 100.056773 36.037146, 99.050582 36.079071, 97.667069 35.743674, 97.163973 35.617900, 96.115857 35.534051, 95.612761 35.534051, 94.396947 35.911372, 93.684228 36.288694, 92.929584 36.833715, 92.258790 37.169112, 91.629920 37.504509, 90.414105 37.881831, 90.414105 37.881831, 90.246407 37.923755, 89.491763 37.839906, 89.156366 37.672207, 88.485572 37.504509, 87.814778 37.252961, 87.563230 37.169112, 87.143983 37.043338, 85.970093 36.875639, 85.802395 36.875639, 84.083484 36.959489, 84.041560 37.043338, 82.951519 37.546433, 82.699971 37.630283)" );
 
   mPolygonA.clear();
@@ -132,7 +132,7 @@
   // Polygon C should intersect no other polys
   mPolylineC << mPointW << mPointX << mPointY << mPointZ << mPointW;
   mPolygonC << mPolylineC;
-  
+
   mpPolylineGeometryD = QgsGeometry::fromWkt( mWktLine );
 
   //polygon: first item of the list is outer ring,
@@ -164,7 +164,7 @@
   QBrush myBrush( Qt::DiagCrossPattern );
 
 
-  //set the pen to a different colour -
+  //set the pen to a different color -
   //any test outs will be drawn in pen2
   mpPainter->setPen( mPen2 );
   mpPainter->setBrush( myBrush );
@@ -369,7 +369,7 @@
 //      qDebug( "\t\t\tPoint in ring %d : %s", k, myPoint.toString().toLocal8Bit().constData() );
 //      myPoints << QPointF( myPoint.x(), myPoint.y() );
 //    }
-   }
+  }
   mpPainter->drawPolyline( myPoints );
 }
 



More information about the QGIS-commit mailing list