fix typos

qgis · Oct 8, 2016 · f4a7cdd · f4a7cdd
1 parent 9ad0482
commit f4a7cdd
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/python/core/composer/qgscomposerattributetable.sip b/python/core/composer/qgscomposerattributetable.sip
@@ -164,15 +164,15 @@ class QgsComposerAttributeTable : QgsComposerTable
     void setFeatureFilter( const QString& expression );
 
     /** Returns the attributes fields which are shown by the table.
-     * @returns a QSet of integers refering to the attributes in the vector layer. If
+     * @returns a QSet of integers referring to the attributes in the vector layer. If
      * result is an empty QSet than all feature attributes will be shown.
      * @see setDisplayAttributes
      * @deprecated use QgsComposerTable::columns() instead
      */
     QSet<int> displayAttributes() const /Deprecated/;
 
     /** Sets the attributes to display in the table.
-     * @param attr QSet of integer values refering to the attributes from the vector layer to show.
+     * @param attr QSet of integer values referring to the attributes from the vector layer to show.
      * Set to an empty QSet to show all feature attributes.
      * @param refresh set to true to force the table to refetch features from its vector layer
      * and immediately update the display of the table. This may result in the table changing size

diff --git a/python/core/composer/qgscomposerattributetablev2.sip b/python/core/composer/qgscomposerattributetablev2.sip
@@ -231,7 +231,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
     void setFeatureFilter( const QString& expression );
 
     /** Sets the attributes to display in the table.
-     * @param attr QSet of integer values refering to the attributes from the vector layer to show.
+     * @param attr QSet of integer values referring to the attributes from the vector layer to show.
      * Set to an empty QSet to show all feature attributes.
      * @param refresh set to true to force the table to refetch features from its vector layer
      * and immediately update the display of the table. This may result in the table changing size

diff --git a/resources/context_help/HeatmapGui b/resources/context_help/HeatmapGui
@@ -26,7 +26,7 @@ clustering of points.</p>
 
 <h4>Rows and Columns</h4>
 <p>Used to change the dimensions of the output raster file. These values are also linked to the <b>Cell size X</b> and <b>Cell size Y</b> values. 
-Increasing the number of rows or colums will decrease the cell size and increase the file size of the output file. The values in Rows and Columns
+Increasing the number of rows or columns will decrease the cell size and increase the file size of the output file. The values in Rows and Columns
 are also linked, so doubling the number of rows will automatically double the number of columns and the cell sizes will also be halved. The geographical area of the output raster will remain the same!</p>
 
 <h4>Cell size X and Y</h4>

diff --git a/src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp b/src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
@@ -186,7 +186,7 @@ const QwtTextLabel *QwtPolarPlot::titleLabel() const
 
   \param legend Legend
   \param pos The legend's position. For top/left position the number
-             of colums will be limited to 1, otherwise it will be set to
+             of columns will be limited to 1, otherwise it will be set to
              unlimited.
 
   \param ratio Ratio between legend and the bounding rect

diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
@@ -167,7 +167,7 @@ const QwtTextLabel *QwtPolarPlot::titleLabel() const
 
   \param legend Legend
   \param pos The legend's position. For top/left position the number
-             of colums will be limited to 1, otherwise it will be set to
+             of columns will be limited to 1, otherwise it will be set to
              unlimited.
 
   \param ratio Ratio between legend and the bounding rect

diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp b/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
@@ -171,7 +171,7 @@ const QwtTextLabel *QwtPolarPlot::titleLabel() const
 
   \param legend Legend
   \param pos The legend's position. For top/left position the number
-             of colums will be limited to 1, otherwise it will be set to
+             of columns will be limited to 1, otherwise it will be set to
              unlimited.
 
   \param ratio Ratio between legend and the bounding rect

diff --git a/src/core/composer/qgscomposerattributetable.h b/src/core/composer/qgscomposerattributetable.h
@@ -187,15 +187,15 @@ class CORE_EXPORT QgsComposerAttributeTable: public QgsComposerTable
     void setFeatureFilter( const QString& expression );
 
     /** Returns the attributes fields which are shown by the table.
-     * @returns a QSet of integers refering to the attributes in the vector layer. If
+     * @returns a QSet of integers referring to the attributes in the vector layer. If
      * result is an empty QSet than all feature attributes will be shown.
      * @see setDisplayAttributes
      * @deprecated use QgsComposerTable::columns() instead
      */
     Q_DECL_DEPRECATED QSet<int> displayAttributes() const;
 
     /** Sets the attributes to display in the table.
-     * @param attr QSet of integer values refering to the attributes from the vector layer to show.
+     * @param attr QSet of integer values referring to the attributes from the vector layer to show.
      * Set to an empty QSet to show all feature attributes.
      * @param refresh set to true to force the table to refetch features from its vector layer
      * and immediately update the display of the table. This may result in the table changing size

diff --git a/src/core/composer/qgscomposerattributetablev2.h b/src/core/composer/qgscomposerattributetablev2.h
@@ -257,7 +257,7 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
     void setFeatureFilter( const QString& expression );
 
     /** Sets the attributes to display in the table.
-     * @param attr QSet of integer values refering to the attributes from the vector layer to show.
+     * @param attr QSet of integer values referring to the attributes from the vector layer to show.
      * Set to an empty QSet to show all feature attributes.
      * @param refresh set to true to force the table to refetch features from its vector layer
      * and immediately update the display of the table. This may result in the table changing size

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1039,7 +1039,7 @@ void QgsRasterLayer::setDrawingStyle( QString const & theDrawingStyleQString )
   {
     QgsDebugMsgLevel( "Setting drawingStyle to SingleBandColorDataStyle " + QString::number( QgsRaster::SingleBandColorDataStyle ), 4 );
     drawingStyle = QgsRaster::SingleBandColorDataStyle;
-    QgsDebugMsgLevel( "Setted drawingStyle to " + QString::number( drawingStyle ), 4 );
+    QgsDebugMsgLevel( "drawingStyle set to " + QString::number( drawingStyle ), 4 );
   }
   else
   {

diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
@@ -697,7 +697,7 @@ struct DXFLIB_EXPORT DL_InsertData {
     double sz;
     /*! Rotation angle in degrees. */
     double angle;
-    /*! Number of colums if we insert an array of the block or 1. */
+    /*! Number of columns if we insert an array of the block or 1. */
     int cols;
     /*! Number of rows if we insert an array of the block or 1. */
     int rows;

diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -606,7 +606,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle  const & theExtent,
   char *tmpBlock = ( char * )qgsMalloc( dataSize * tmpWidth * tmpHeight );
   if ( ! tmpBlock )
   {
-    QgsDebugMsg( QString( "Coudn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );
+    QgsDebugMsg( QString( "Couldn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );
     return;
   }
   GDALRasterBandH gdalBand = GDALGetRasterBand( mGdalDataset, theBandNo );