Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 8, 2016
1 parent ffa2bc4 commit 1e9124d
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposerattributetable.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerattributetablev2.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/context_help/HeatmapGui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposerattributetable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerattributetablev2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/symbology-ng/qgsstylev2managerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ void QgsStyleV2ManagerDialog::groupSelectedSymbols()
QgsStyleV2::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyleV2::SymbolEntity : QgsStyleV2::ColorrampEntity;
if ( currentItemType() > 3 )
{
QgsDebugMsg( "unknow entity type" );
QgsDebugMsg( "unknown entity type" );
return;
}
int groupId = selectedItem->data().toInt();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/gdal/qgsgdalprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,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 );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/virtual/qgsvirtuallayersourceselectbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ In particular, saving a virtual layer with embedded layers to a QLR file can be
<item>
<widget class="QgsCodeEditorSQL" name="mQueryEdit" native="true">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the SQL query editor. You can edit here an SQL query refering to any existing vector layers or embedded layers.&lt;/p&gt;&lt;p&gt;Virtual layers rely on SQLite and Spatialite. Any functions from SQLite or Spatialite can then be used in the query. To add or access geometries of a table, you can use &quot;tablename.geometry&quot;, regardless of original geometry column's name.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Special comments:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Because it is not always possible to autodetect the data type of each column in a query, special comments can be used in the query to force a specific type.&lt;/p&gt;&lt;p&gt;Special comments must be placed on the right of a column name and have the form &lt;tt&gt;/*:type*/&lt;/tt&gt; where type can be any of &lt;span style=&quot; font-style:italic;&quot;&gt;int&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;real&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;text&lt;/span&gt;. They can also be used to specify the type and SRID of the geometry column with the following syntax: &lt;tt&gt;/*:gtype:srid*/&lt;/tt&gt; where &lt;span style=&quot; font-style:italic;&quot;&gt;gtype&lt;/span&gt; can be &lt;span style=&quot; font-style:italic;&quot;&gt;point&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;linestring&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;polygon&lt;/span&gt; (with an optional &lt;span style=&quot; font-style:italic;&quot;&gt;multi&lt;/span&gt; prefix) and &lt;span style=&quot; font-style:italic;&quot;&gt;srid&lt;/span&gt; is an integer identifier.&lt;/p&gt;&lt;p&gt;Example:&lt;/p&gt;&lt;p&gt;&lt;tt&gt;SELECT id + 1 as id /*:int*/, ST_Centroid(geometry) as geom /*:point:4326*/ FROM tab&lt;/tt&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the SQL query editor. You can edit here an SQL query referring to any existing vector layers or embedded layers.&lt;/p&gt;&lt;p&gt;Virtual layers rely on SQLite and Spatialite. Any functions from SQLite or Spatialite can then be used in the query. To add or access geometries of a table, you can use &quot;tablename.geometry&quot;, regardless of original geometry column's name.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Special comments:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Because it is not always possible to autodetect the data type of each column in a query, special comments can be used in the query to force a specific type.&lt;/p&gt;&lt;p&gt;Special comments must be placed on the right of a column name and have the form &lt;tt&gt;/*:type*/&lt;/tt&gt; where type can be any of &lt;span style=&quot; font-style:italic;&quot;&gt;int&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;real&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;text&lt;/span&gt;. They can also be used to specify the type and SRID of the geometry column with the following syntax: &lt;tt&gt;/*:gtype:srid*/&lt;/tt&gt; where &lt;span style=&quot; font-style:italic;&quot;&gt;gtype&lt;/span&gt; can be &lt;span style=&quot; font-style:italic;&quot;&gt;point&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;linestring&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;polygon&lt;/span&gt; (with an optional &lt;span style=&quot; font-style:italic;&quot;&gt;multi&lt;/span&gt; prefix) and &lt;span style=&quot; font-style:italic;&quot;&gt;srid&lt;/span&gt; is an integer identifier.&lt;/p&gt;&lt;p&gt;Example:&lt;/p&gt;&lt;p&gt;&lt;tt&gt;SELECT id + 1 as id /*:int*/, ST_Centroid(geometry) as geom /*:point:4326*/ FROM tab&lt;/tt&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsgraduatedsymbolrendererv2widget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Positive is number of decimal places
Negative rounds to powers of 10</string>
</property>
<property name="prefix">
<string>Precison </string>
<string>Precision </string>
</property>
<property name="minimum">
<number>0</number>
Expand Down

0 comments on commit 1e9124d

Please sign in to comment.