From 0908daaa0ec55290bafa8b2bcbb635d02f9d65eb Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Thu, 6 Sep 2018 16:19:15 -0400 Subject: [PATCH] Misc. typos Found via `codespell -q 3 -I ../qgis-word-whitelist.txt --skip="*.ts,*.po,./scripts/spell_check"` --- scripts/context_help_id.py | 2 +- src/analysis/interpolation/DualEdgeTriangulation.cpp | 2 +- src/core/geometry/qgstriangle.h | 2 +- src/core/pal/pointset.cpp | 2 +- .../processing/models/qgsprocessingmodelalgorithm.cpp | 4 ++-- src/core/qgsdataitem.h | 2 +- src/core/qgsgmlschema.h | 2 +- src/core/qgslegendsettings.cpp | 2 +- src/core/qgstestutils.cpp | 2 +- src/core/qgsvectorlayer.h | 2 +- src/core/qgsvectorlayerdiagramprovider.h | 2 +- src/core/raster/qgsrasterpipe.h | 2 +- src/core/symbology/qgsstyle.h | 2 +- src/gui/auth/qgsauthsslconfigwidget.h | 2 +- src/gui/qgsattributedialog.h | 2 +- src/gui/qgsattributetypeloaddialog.h | 2 +- src/gui/qgsrasterformatsaveoptionswidget.h | 2 +- src/gui/qgsrasterlayersaveasdialog.cpp | 4 ++-- src/gui/qgsrelationeditorwidget.cpp | 2 +- src/gui/symbology/qgsrulebasedrendererwidget.h | 2 +- src/providers/grass/qgsgrassgislib.cpp | 2 +- src/providers/mssql/qgsmssqlsourceselect.cpp | 2 +- src/providers/wcs/qgswcsprovider.cpp | 2 +- src/server/qgsbufferserverresponse.h | 2 +- src/server/qgsserverresponse.h | 2 +- src/server/services/wfs/qgswfs.cpp | 4 ++-- src/server/services/wfs/qgswfsutils.cpp | 2 +- src/server/services/wfs/qgswfsutils.h | 2 +- src/server/services/wms/qgsmediancut.cpp | 2 +- src/server/services/wms/qgsmediancut.h | 2 +- src/server/services/wms/qgswms.cpp | 2 +- src/server/services/wms/qgswmsutils.cpp | 2 +- src/server/services/wms/qgswmsutils.h | 2 +- tests/src/core/testqgslayoutobject.cpp | 2 +- tests/src/core/testqgslayoutshapes.cpp | 4 ++-- tests/src/core/testqgslayoututils.cpp | 10 +++++----- tests/src/python/test_qgslayoutexporter.py | 2 +- tests/src/python/test_qgspallabeling_layout.py | 2 +- 38 files changed, 46 insertions(+), 46 deletions(-) diff --git a/scripts/context_help_id.py b/scripts/context_help_id.py index 771ab2b615d..82035f996bd 100755 --- a/scripts/context_help_id.py +++ b/scripts/context_help_id.py @@ -33,7 +33,7 @@ """ import hashlib import sys -# check to see if a class name was specified and if so, craete the context id +# check to see if a class name was specified and if so, create the context id if len(sys.argv) > 1: hash = hashlib.sha1() # set the hash to the name passed on the command line diff --git a/src/analysis/interpolation/DualEdgeTriangulation.cpp b/src/analysis/interpolation/DualEdgeTriangulation.cpp index 0cb060cf112..6756d07dc7c 100644 --- a/src/analysis/interpolation/DualEdgeTriangulation.cpp +++ b/src/analysis/interpolation/DualEdgeTriangulation.cpp @@ -1579,7 +1579,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles() el2 = mPointVector[p2]->z(); el3 = mPointVector[p3]->z(); - if ( el1 == el2 && el2 == el3 )//we found a horizonal triangle + if ( el1 == el2 && el2 == el3 )//we found a horizontal triangle { //swap edges if it is possible, if it would remove the horizontal triangle and if the minimum angle generated by the swap is high enough if ( swapPossible( ( uint )e1 ) && mPointVector[mHalfEdge[mHalfEdge[mHalfEdge[e1]->getDual()]->getNext()]->getPoint()]->z() != el1 && swapMinAngle( e1 ) > minangle ) diff --git a/src/core/geometry/qgstriangle.h b/src/core/geometry/qgstriangle.h index cbb329707fe..a182cef7a42 100644 --- a/src/core/geometry/qgstriangle.h +++ b/src/core/geometry/qgstriangle.h @@ -211,7 +211,7 @@ class CORE_EXPORT QgsTriangle : public QgsPolygon bool isRight( double angleTolerance = 0.0001 ) const; /** - * Is the triangle scalene (all sides have differen lengths)? + * Is the triangle scalene (all sides have different lengths)? * \param lengthTolerance The tolerance to use * \returns True or False. Always false for empty triangle. * * Example: diff --git a/src/core/pal/pointset.cpp b/src/core/pal/pointset.cpp index 203993db87e..9294bb75f48 100644 --- a/src/core/pal/pointset.cpp +++ b/src/core/pal/pointset.cpp @@ -499,7 +499,7 @@ void PointSet::splitPolygons( QLinkedList &shapes_toProcess, if ( shape->parent ) delete shape; } - // check for useless spliting + // check for useless splitting else if ( imax == imin || nbPtSh1 <= 2 || nbPtSh2 <= 2 || nbPtSh1 == nbp || nbPtSh2 == nbp ) { shapes_final.append( shape ); diff --git a/src/core/processing/models/qgsprocessingmodelalgorithm.cpp b/src/core/processing/models/qgsprocessingmodelalgorithm.cpp index 8f7dcbaf346..c1d77981a47 100644 --- a/src/core/processing/models/qgsprocessingmodelalgorithm.cpp +++ b/src/core/processing/models/qgsprocessingmodelalgorithm.cpp @@ -865,7 +865,7 @@ bool QgsProcessingModelAlgorithm::loadVariant( const QVariant &model ) for ( ; childIt != childMap.constEnd(); ++childIt ) { QgsProcessingModelChildAlgorithm child; - // we be leniant here - even if we couldn't load a parameter, don't interrupt the model loading + // we be lenient here - even if we couldn't load a parameter, don't interrupt the model loading // otherwise models may become unusable (e.g. due to removed plugins providing algs/parameters) // with no way for users to repair them if ( !child.loadVariant( childIt.value() ) ) @@ -893,7 +893,7 @@ bool QgsProcessingModelAlgorithm::loadVariant( const QVariant &model ) for ( ; paramDefIt != paramDefMap.constEnd(); ++paramDefIt ) { std::unique_ptr< QgsProcessingParameterDefinition > param( QgsProcessingParameters::parameterFromVariantMap( paramDefIt.value().toMap() ) ); - // we be leniant here - even if we couldn't load a parameter, don't interrupt the model loading + // we be lenient here - even if we couldn't load a parameter, don't interrupt the model loading // otherwise models may become unusable (e.g. due to removed plugins providing algs/parameters) // with no way for users to repair them if ( param ) diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h index bffea2b592a..f576f089ba1 100644 --- a/src/core/qgsdataitem.h +++ b/src/core/qgsdataitem.h @@ -326,7 +326,7 @@ class CORE_EXPORT QgsDataItem : public QObject QVector mChildren; // easier to have it always State mState; QString mName; - // Path is slash ('/') separated chain of item identifiers which are usually item names, but may be differen if it is + // Path is slash ('/') separated chain of item identifiers which are usually item names, but may be different if it is // necessary to distinguish paths of two providers to the same source (e.g GRASS location and standard directory have the same // name but different paths). Identifiers in path must not contain '/' characters. // The path is used to identify item in tree. diff --git a/src/core/qgsgmlschema.h b/src/core/qgsgmlschema.h index fc052b5b3bc..a034a1348a7 100644 --- a/src/core/qgsgmlschema.h +++ b/src/core/qgsgmlschema.h @@ -116,7 +116,7 @@ class CORE_EXPORT QgsGmlSchema : public QObject BoundingBox, FeatureMembers, // gml:featureMembers FeatureMember, // gml:featureMember - Feature, // feature element containint attrs and geo (inside gml:featureMember) + Feature, // feature element containing attrs and geo (inside gml:featureMember) Attribute, Geometry }; diff --git a/src/core/qgslegendsettings.cpp b/src/core/qgslegendsettings.cpp index 031f3384149..8c2147721d2 100644 --- a/src/core/qgslegendsettings.cpp +++ b/src/core/qgslegendsettings.cpp @@ -38,7 +38,7 @@ QgsLegendSettings::QgsLegendSettings() QStringList QgsLegendSettings::splitStringForWrapping( const QString &stringToSplt ) const { QStringList list; - // If the string contains nothing then just return the string without spliting. + // If the string contains nothing then just return the string without splitting. if ( wrapChar().count() == 0 ) list << stringToSplt; else diff --git a/src/core/qgstestutils.cpp b/src/core/qgstestutils.cpp index 28da5a9c9a0..620e595df09 100644 --- a/src/core/qgstestutils.cpp +++ b/src/core/qgstestutils.cpp @@ -40,7 +40,7 @@ bool QgsTestUtils::testProviderIteratorThreadSafety( QgsVectorDataProvider *prov jobs.append( qMakePair( provider, request ) ); } - //freaking hammmer the provider with a ton of concurrent requests. + //freaking hammer the provider with a ton of concurrent requests. //thread unsafe providers... you better be ready!!!! QtConcurrent::blockingMap( jobs, getFeaturesForProvider ); diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 184bcb647b5..615870c33a7 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -2258,7 +2258,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte void editCommandEnded(); /** - * Signal emitted, whan an edit command is destroyed + * Signal emitted, when an edit command is destroyed * \note This is not a rollback, it is only related to the current edit command. * See beforeRollBack() */ diff --git a/src/core/qgsvectorlayerdiagramprovider.h b/src/core/qgsvectorlayerdiagramprovider.h index 12a922fdf1b..03e071cfcb9 100644 --- a/src/core/qgsvectorlayerdiagramprovider.h +++ b/src/core/qgsvectorlayerdiagramprovider.h @@ -100,7 +100,7 @@ class CORE_EXPORT QgsVectorLayerDiagramProvider : public QgsAbstractLabelProvide protected: //! initialization method - called from constructors void init(); - //! helper method to register one diagram feautre + //! helper method to register one diagram feature QgsLabelFeature *registerDiagram( QgsFeature &feat, QgsRenderContext &context, const QgsGeometry &obstacleGeometry = QgsGeometry() ); protected: diff --git a/src/core/raster/qgsrasterpipe.h b/src/core/raster/qgsrasterpipe.h index 5c2680abcab..b8a2894f2c7 100644 --- a/src/core/raster/qgsrasterpipe.h +++ b/src/core/raster/qgsrasterpipe.h @@ -116,7 +116,7 @@ class CORE_EXPORT QgsRasterPipe * Returns true on success */ bool setOn( int idx, bool on ); - //! Test if interface at index may be swithed on/off + //! Test if interface at index may be switched on/off bool canSetOn( int idx, bool on ); // Getters for special types of interfaces diff --git a/src/core/symbology/qgsstyle.h b/src/core/symbology/qgsstyle.h index f9e91cc70dc..cb4a3d2aaf3 100644 --- a/src/core/symbology/qgsstyle.h +++ b/src/core/symbology/qgsstyle.h @@ -49,7 +49,7 @@ typedef QMap QgsSymbolGroupMap; * * The supported constraints are: * tag -> symbol has the tag matching the parameter - * !tag -> symbol doesnot have the tag matching the parameter + * !tag -> symbol doesn't have the tag matching the parameter * name -> symbol has a part of its name matching the parameter * !name -> symbol doesn't have any part of the name matching the parameter * diff --git a/src/gui/auth/qgsauthsslconfigwidget.h b/src/gui/auth/qgsauthsslconfigwidget.h index 52262b94e65..4a141450a9f 100644 --- a/src/gui/auth/qgsauthsslconfigwidget.h +++ b/src/gui/auth/qgsauthsslconfigwidget.h @@ -68,7 +68,7 @@ class GUI_EXPORT QgsAuthSslConfigWidget : public QWidget, private Ui::QgsAuthSsl //! Gets the host:port to associate with the server certificate const QString sslHost(); - //! Gets the SSL protocl used for connections + //! Gets the SSL protocol used for connections QSsl::SslProtocol sslProtocol(); //! Gets list of the SSL errors (as enums) to be ignored for connections diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h index d2a725bb542..b0625167f0b 100644 --- a/src/gui/qgsattributedialog.h +++ b/src/gui/qgsattributedialog.h @@ -88,7 +88,7 @@ class GUI_EXPORT QgsAttributeDialog : public QDialog void setEditCommandMessage( const QString &message ) { mAttributeForm->setEditCommandMessage( message ); } /** - * Intercept window activate/deactive events to show/hide the highlighted feature. + * Intercept window activate/deactivate events to show/hide the highlighted feature. * * \param e The event * diff --git a/src/gui/qgsattributetypeloaddialog.h b/src/gui/qgsattributetypeloaddialog.h index ee5fd068be0..5b926ccca66 100644 --- a/src/gui/qgsattributetypeloaddialog.h +++ b/src/gui/qgsattributetypeloaddialog.h @@ -54,7 +54,7 @@ class GUI_EXPORT QgsAttributeTypeLoadDialog: public QDialog, private Ui::QgsAttr /** * Returns the value map which is currently active. * - * \returns value map of vlues selected from layer + * \returns value map of values selected from layer */ QMap &valueMap(); diff --git a/src/gui/qgsrasterformatsaveoptionswidget.h b/src/gui/qgsrasterformatsaveoptionswidget.h index e5edfc1216b..d8f69a95bfd 100644 --- a/src/gui/qgsrasterformatsaveoptionswidget.h +++ b/src/gui/qgsrasterformatsaveoptionswidget.h @@ -100,7 +100,7 @@ class GUI_EXPORT QgsRasterFormatSaveOptionsWidget: public QWidget, private Ui::Q void apply(); /** - * Opens window with options desctiption for given provider + * Opens window with options description for given provider * and output format */ void helpOptions(); diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp index c68791b226f..3f6110acf8d 100644 --- a/src/gui/qgsrasterlayersaveasdialog.cpp +++ b/src/gui/qgsrasterlayersaveasdialog.cpp @@ -703,12 +703,12 @@ void QgsRasterLayerSaveAsDialog::mTileModeCheckBox_toggled( bool toggled ) // Disabled (Radim), auto enabling of pyramids was making impression that // we (programmers) know better what you (user) want to do, - // certainly auto expaning was bad experience + // certainly auto expanding was a bad experience //if ( ! mPyramidsGroupBox->isChecked() ) // mPyramidsGroupBox->setChecked( true ); - // Auto expanding mPyramidsGroupBox is bad - it auto crolls content of dialog + // Auto expanding mPyramidsGroupBox is bad - it auto scrolls content of dialog //if ( mPyramidsGroupBox->isCollapsed() ) // mPyramidsGroupBox->setCollapsed( false ); //mPyramidsOptionsWidget->checkAllLevels( true ); diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp index 3737af88dff..b3ca205f0d1 100644 --- a/src/gui/qgsrelationeditorwidget.cpp +++ b/src/gui/qgsrelationeditorwidget.cpp @@ -45,7 +45,7 @@ QgsRelationEditorWidget::QgsRelationEditorWidget( QWidget *parent ) // buttons QHBoxLayout *buttonLayout = new QHBoxLayout(); buttonLayout->setContentsMargins( 0, 0, 0, 0 ); - // toogle editing + // toggle editing mToggleEditingButton = new QToolButton( this ); mToggleEditingButton->setObjectName( QStringLiteral( "mToggleEditingButton" ) ); mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionToggleEditing.svg" ) ) ); diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.h b/src/gui/symbology/qgsrulebasedrendererwidget.h index d487a633a58..67222edbb19 100644 --- a/src/gui/symbology/qgsrulebasedrendererwidget.h +++ b/src/gui/symbology/qgsrulebasedrendererwidget.h @@ -27,7 +27,7 @@ class QgsSymbolSelectorWidget; #include -/* Features count fro rule */ +/* Features count for rule */ struct QgsRuleBasedRendererCount SIP_SKIP { int count; // number of features diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp index 33e5e658b3a..5192af1077b 100644 --- a/src/providers/grass/qgsgrassgislib.cpp +++ b/src/providers/grass/qgsgrassgislib.cpp @@ -224,7 +224,7 @@ int GRASS_LIB_EXPORT QgsGrassGisLib::G__gisinit( const char *version, const char } mDistanceArea.setSourceCrs( mCrs ); - // Read region fron environment variable + // Read region from environment variable // QGIS_GRASS_REGION=west,south,east,north,cols,rows #if 0 QString regionStr = getenv( "QGIS_GRASS_REGION" ); diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp index f6c8b7ca5a2..0570de61bc6 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.cpp +++ b/src/providers/mssql/qgsmssqlsourceselect.cpp @@ -620,7 +620,7 @@ void QgsMssqlSourceSelect::btnConnect_clicked() else { QApplication::restoreOverrideCursor(); - // Let user know we couldn't retieve tables from the MSSQL provider + // Let user know we couldn't retrieve tables from the MSSQL provider QMessageBox::warning( this, tr( "MSSQL Provider" ), q.lastError().text() ); return; diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp index 3bab989deda..416d367109e 100644 --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp @@ -63,7 +63,7 @@ static QString WCS_DESCRIPTION = QStringLiteral( "OGC Web Coverage Service versi static QString DEFAULT_LATLON_CRS = QStringLiteral( "CRS:84" ); -// TODO: colortable - use comon baseclass with gdal, mapserver does not support http://trac.osgeo.org/mapserver/ticket/1671 +// TODO: colortable - use common baseclass with gdal, mapserver does not support http://trac.osgeo.org/mapserver/ticket/1671 QgsWcsProvider::QgsWcsProvider( const QString &uri, const ProviderOptions &options ) : QgsRasterDataProvider( uri, options ) diff --git a/src/server/qgsbufferserverresponse.h b/src/server/qgsbufferserverresponse.h index 1480b972792..5e2d4b8b268 100644 --- a/src/server/qgsbufferserverresponse.h +++ b/src/server/qgsbufferserverresponse.h @@ -66,7 +66,7 @@ class SERVER_EXPORT QgsBufferServerResponse: public QgsServerResponse QMap headers() const override { return mHeaders; } /** - * Returns true if the headers have alredy been sent + * Returns true if the headers have already been sent */ bool headersSent() const override; diff --git a/src/server/qgsserverresponse.h b/src/server/qgsserverresponse.h index 932a85a2d89..37d6b4b1049 100644 --- a/src/server/qgsserverresponse.h +++ b/src/server/qgsserverresponse.h @@ -73,7 +73,7 @@ class SERVER_EXPORT QgsServerResponse virtual QMap headers() const = 0; /** - * Returns true if the headers have alredy been sent + * Returns true if the headers have already been sent */ virtual bool headersSent() const = 0; diff --git a/src/server/services/wfs/qgswfs.cpp b/src/server/services/wfs/qgswfs.cpp index e112a2583d0..0aaa37f05f2 100644 --- a/src/server/services/wfs/qgswfs.cpp +++ b/src/server/services/wfs/qgswfs.cpp @@ -2,8 +2,8 @@ qgswms.cpp ------------------------- begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) - (C) 2012 by René-Luc D'Hont ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) + (C) 2012 by René-Luc D'Hont ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2016 by David Marteau email : marco dot hugentobler at karto dot baug dot ethz dot ch diff --git a/src/server/services/wfs/qgswfsutils.cpp b/src/server/services/wfs/qgswfsutils.cpp index 00ac4c3063b..b42ecb2c7a8 100644 --- a/src/server/services/wfs/qgswfsutils.cpp +++ b/src/server/services/wfs/qgswfsutils.cpp @@ -2,7 +2,7 @@ qgsfssutils.cpp ------------------------- begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) (C) 2012 by René-Luc D'Hont ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2017 by David Marteau diff --git a/src/server/services/wfs/qgswfsutils.h b/src/server/services/wfs/qgswfsutils.h index ea7fc83fb56..a229d640494 100644 --- a/src/server/services/wfs/qgswfsutils.h +++ b/src/server/services/wfs/qgswfsutils.h @@ -4,7 +4,7 @@ Define WFS service utility functions ------------------------------------ begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswfshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswfshandler) (C) 2012 by René-Luc D'Hont ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswfshandler) (C) 2017 by David Marteau diff --git a/src/server/services/wms/qgsmediancut.cpp b/src/server/services/wms/qgsmediancut.cpp index 4b08a8bda94..6f4a2719685 100644 --- a/src/server/services/wms/qgsmediancut.cpp +++ b/src/server/services/wms/qgsmediancut.cpp @@ -2,7 +2,7 @@ qgsmediancut.cpp ------------------------- begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2016 by David Marteau email : marco dot hugentobler at karto dot baug dot ethz dot ch diff --git a/src/server/services/wms/qgsmediancut.h b/src/server/services/wms/qgsmediancut.h index b8c2aaac46c..0ecfd14a57f 100644 --- a/src/server/services/wms/qgsmediancut.h +++ b/src/server/services/wms/qgsmediancut.h @@ -4,7 +4,7 @@ Median cut color reduction implementation ----------------------------------------- begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2016 by David Marteau email : marco dot hugentobler at karto dot baug dot ethz dot ch diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp index d2780045e6e..aea27aad540 100644 --- a/src/server/services/wms/qgswms.cpp +++ b/src/server/services/wms/qgswms.cpp @@ -2,7 +2,7 @@ qgswms.cpp ------------------------- begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2016 by David Marteau email : marco dot hugentobler at karto dot baug dot ethz dot ch diff --git a/src/server/services/wms/qgswmsutils.cpp b/src/server/services/wms/qgswmsutils.cpp index baf49267ccc..a73c7bbe06f 100644 --- a/src/server/services/wms/qgswmsutils.cpp +++ b/src/server/services/wms/qgswmsutils.cpp @@ -2,7 +2,7 @@ qgswmsutils.cpp ------------------------- begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2016 by David Marteau email : marco dot hugentobler at karto dot baug dot ethz dot ch diff --git a/src/server/services/wms/qgswmsutils.h b/src/server/services/wms/qgswmsutils.h index 80a82e7f16c..0f602943706 100644 --- a/src/server/services/wms/qgswmsutils.h +++ b/src/server/services/wms/qgswmsutils.h @@ -4,7 +4,7 @@ Define WMS service utility functions ------------------------------------ begin : December 20 , 2016 - copyright : (C) 2007 by Marco Hugentobler ( parts fron qgswmshandler) + copyright : (C) 2007 by Marco Hugentobler ( parts from qgswmshandler) (C) 2014 by Alessandro Pasotti ( parts from qgswmshandler) (C) 2016 by David Marteau email : marco dot hugentobler at karto dot baug dot ethz dot ch diff --git a/tests/src/core/testqgslayoutobject.cpp b/tests/src/core/testqgslayoutobject.cpp index 1f55e17fd81..e57fe90ffe7 100644 --- a/tests/src/core/testqgslayoutobject.cpp +++ b/tests/src/core/testqgslayoutobject.cpp @@ -37,7 +37,7 @@ class TestQgsLayoutObject: public QObject void context(); void writeReadXml(); void writeRetrieveDDProperty(); //test writing and retrieving dd properties from xml - void writeRetrieveCustomProperties(); //test writing/retreiving custom properties from xml + void writeRetrieveCustomProperties(); //test writing/retrieving custom properties from xml private: diff --git a/tests/src/core/testqgslayoutshapes.cpp b/tests/src/core/testqgslayoutshapes.cpp index fc6afdae40e..d364d803013 100644 --- a/tests/src/core/testqgslayoutshapes.cpp +++ b/tests/src/core/testqgslayoutshapes.cpp @@ -43,10 +43,10 @@ class TestQgsLayoutShapes : public QObject void init();// will be called before each testfunction is executed. void cleanup();// will be called after every testfunction. void rectangle(); //test if rectangle shape is functioning - void triangle(); //test if triange shape is functioning + void triangle(); //test if triangle shape is functioning void ellipse(); //test if ellipse shape is functioning void roundedRectangle(); //test if rounded rectangle shape is functioning - void symbol(); //test is styling shapes via symbol is working + void symbol(); //test if styling shapes via symbol is working void readWriteXml(); void bounds(); void shapeRotation(); diff --git a/tests/src/core/testqgslayoututils.cpp b/tests/src/core/testqgslayoututils.cpp index 61e61a7f4a4..e93ed8f9e78 100644 --- a/tests/src/core/testqgslayoututils.cpp +++ b/tests/src/core/testqgslayoututils.cpp @@ -440,7 +440,7 @@ void TestQgsLayoutUtils::scaledFontPixelSize() void TestQgsLayoutUtils::fontAscentMM() { mTestFont.setPointSize( 12 ); - //platform specific font rendering differences mean these tests need to be very leniant + //platform specific font rendering differences mean these tests need to be very lenient QGSCOMPARENEAR( QgsLayoutUtils::fontAscentMM( mTestFont ), 3.9, 0.5 ); } @@ -453,14 +453,14 @@ void TestQgsLayoutUtils::fontDescentMM() void TestQgsLayoutUtils::fontHeightMM() { mTestFont.setPointSize( 12 ); - //platform specific font rendering differences mean these tests need to be very leniant + //platform specific font rendering differences mean these tests need to be very lenient QGSCOMPARENEAR( QgsLayoutUtils::fontHeightMM( mTestFont ), 4.9, 0.5 ); } void TestQgsLayoutUtils::fontHeightCharacterMM() { mTestFont.setPointSize( 12 ); - //platform specific font rendering differences mean these tests need to be very leniant + //platform specific font rendering differences mean these tests need to be very lenient QGSCOMPARENEAR( QgsLayoutUtils::fontHeightCharacterMM( mTestFont, QChar( 'a' ) ), 2.4, 0.15 ); QGSCOMPARENEAR( QgsLayoutUtils::fontHeightCharacterMM( mTestFont, QChar( 'l' ) ), 3.15, 0.16 ); QGSCOMPARENEAR( QgsLayoutUtils::fontHeightCharacterMM( mTestFont, QChar( 'g' ) ), 3.2, 0.11 ); @@ -469,7 +469,7 @@ void TestQgsLayoutUtils::fontHeightCharacterMM() void TestQgsLayoutUtils::textWidthMM() { - //platform specific font rendering differences mean this test needs to be very leniant + //platform specific font rendering differences mean this test needs to be very lenient mTestFont.setPointSize( 12 ); QGSCOMPARENEAR( QgsLayoutUtils::textWidthMM( mTestFont, QString( "test string" ) ), 20, 2 ); @@ -477,7 +477,7 @@ void TestQgsLayoutUtils::textWidthMM() void TestQgsLayoutUtils::textHeightMM() { - //platform specific font rendering differences mean this test needs to be very leniant + //platform specific font rendering differences mean this test needs to be very lenient mTestFont.setPointSize( 12 ); QGSCOMPARENEAR( QgsLayoutUtils::textHeightMM( mTestFont, QString( "test string" ) ), 3.9, 0.2 ); QGSCOMPARENEAR( QgsLayoutUtils::textHeightMM( mTestFont, QString( "test\nstring" ) ), 8.7, 0.2 ); diff --git a/tests/src/python/test_qgslayoutexporter.py b/tests/src/python/test_qgslayoutexporter.py index aafb108d88c..27fd59fdfa3 100644 --- a/tests/src/python/test_qgslayoutexporter.py +++ b/tests/src/python/test_qgslayoutexporter.py @@ -56,7 +56,7 @@ TEST_DATA_DIR = unitTestDataPath() # look for Poppler w/ Cairo, then muPDF # * Poppler w/ Cairo renders correctly # * Poppler w/o Cairo does not always correctly render vectors in PDF to image -# * muPDF renders correctly, but sightly shifts colors +# * muPDF renders correctly, but slightly shifts colors for util in [ 'pdftocairo', # 'mudraw', diff --git a/tests/src/python/test_qgspallabeling_layout.py b/tests/src/python/test_qgspallabeling_layout.py index 8f79da0dfc4..c3234ba73d8 100644 --- a/tests/src/python/test_qgspallabeling_layout.py +++ b/tests/src/python/test_qgspallabeling_layout.py @@ -55,7 +55,7 @@ from test_qgspallabeling_tests import ( # look for Poppler w/ Cairo, then muPDF # * Poppler w/ Cairo renders correctly # * Poppler w/o Cairo does not always correctly render vectors in PDF to image -# * muPDF renders correctly, but sightly shifts colors +# * muPDF renders correctly, but slightly shifts colors for util in [ 'pdftocairo', # 'mudraw',