diff --git a/python/console/console_editor.py b/python/console/console_editor.py index cf769b992ee4..1e74bd9cecb4 100644 --- a/python/console/console_editor.py +++ b/python/console/console_editor.py @@ -258,12 +258,12 @@ def setLexers(self): self.lexer.setPaper(paperColor, style) self.api = QsciAPIs(self.lexer) - chekBoxAPI = self.settings.value("pythonConsole/preloadAPI", True, type=bool) - chekBoxPreparedAPI = self.settings.value("pythonConsole/usePreparedAPIFile", False, type=bool) - if chekBoxAPI: + checkBoxAPI = self.settings.value("pythonConsole/preloadAPI", True, type=bool) + checkBoxPreparedAPI = self.settings.value("pythonConsole/usePreparedAPIFile", False, type=bool) + if checkBoxAPI: pap = os.path.join(QgsApplication.pkgDataPath(), "python", "qsci_apis", "pyqgis.pap") self.api.loadPrepared(pap) - elif chekBoxPreparedAPI: + elif checkBoxPreparedAPI: self.api.loadPrepared(self.settings.value("pythonConsole/preparedAPIFile")) else: apiPath = self.settings.value("pythonConsole/userAPI", []) diff --git a/python/console/console_sci.py b/python/console/console_sci.py index 05db133f45ca..f9ba4769f802 100644 --- a/python/console/console_sci.py +++ b/python/console/console_sci.py @@ -210,12 +210,12 @@ def setLexers(self): self.lexer.setPaper(paperColor, style) self.api = QsciAPIs(self.lexer) - chekBoxAPI = self.settings.value("pythonConsole/preloadAPI", True, type=bool) - chekBoxPreparedAPI = self.settings.value("pythonConsole/usePreparedAPIFile", False, type=bool) - if chekBoxAPI: + checkBoxAPI = self.settings.value("pythonConsole/preloadAPI", True, type=bool) + checkBoxPreparedAPI = self.settings.value("pythonConsole/usePreparedAPIFile", False, type=bool) + if checkBoxAPI: pap = os.path.join(QgsApplication.pkgDataPath(), "python", "qsci_apis", "pyqgis.pap") self.api.loadPrepared(pap) - elif chekBoxPreparedAPI: + elif checkBoxPreparedAPI: self.api.loadPrepared(self.settings.value("pythonConsole/preparedAPIFile")) else: apiPath = self.settings.value("pythonConsole/userAPI", []) diff --git a/python/core/raster/qgsrasterblock.sip b/python/core/raster/qgsrasterblock.sip index 56e655929cfc..6e0520a6a3d4 100644 --- a/python/core/raster/qgsrasterblock.sip +++ b/python/core/raster/qgsrasterblock.sip @@ -274,7 +274,7 @@ class QgsRasterBlock QString toString() const; - /** \brief For theExtent and theWidht, theHeight find rectangle covered by subextent. + /** \brief For theExtent and theWidth, theHeight find rectangle covered by subextent. * The output rect has x oriented from left to right and y from top to bottom * (upper-left to lower-right orientation). * @param theExtent extent, usually the larger diff --git a/python/plugins/MetaSearch/dialogs/maindialog.py b/python/plugins/MetaSearch/dialogs/maindialog.py index 0483c200f8d1..b9fd92ed7e82 100644 --- a/python/plugins/MetaSearch/dialogs/maindialog.py +++ b/python/plugins/MetaSearch/dialogs/maindialog.py @@ -155,11 +155,11 @@ def manageGui(self): self.reset_buttons() # get preferred connection save strategy from settings and set it - save_strat = self.settings.value('/MetaSearch/ows_save_strategy', - 'title_ask') - if save_strat == 'temp_name': + save_strategy = self.settings.value('/MetaSearch/ows_save_strategy', + 'title_ask') + if save_strategy == 'temp_name': self.radioTempName.setChecked(True) - elif save_strat == 'title_no_ask': + elif save_strategy == 'title_no_ask': self.radioTitleNoAsk.setChecked(True) else: self.radioTitleAsk.setChecked(True) diff --git a/python/plugins/processing/algs/qgis/CheckValidity.py b/python/plugins/processing/algs/qgis/CheckValidity.py index cbf7f894ffe9..cfb7f65991e7 100644 --- a/python/plugins/processing/algs/qgis/CheckValidity.py +++ b/python/plugins/processing/algs/qgis/CheckValidity.py @@ -100,31 +100,31 @@ def doCheck(self, feedback): settings = QSettings() method = int(settings.value(settings_method_key, 1)) - valid_ouput = self.getOutputFromName(self.VALID_OUTPUT) + valid_output = self.getOutputFromName(self.VALID_OUTPUT) valid_fields = layer.fields() - valid_writer = valid_ouput.getVectorWriter( + valid_writer = valid_output.getVectorWriter( valid_fields, layer.wkbType(), layer.crs()) valid_count = 0 - invalid_ouput = self.getOutputFromName(self.INVALID_OUTPUT) + invalid_output = self.getOutputFromName(self.INVALID_OUTPUT) invalid_fields = layer.fields().toList() + [ QgsField(name='_errors', type=QVariant.String, len=255)] - invalid_writer = invalid_ouput.getVectorWriter( + invalid_writer = invalid_output.getVectorWriter( invalid_fields, layer.wkbType(), layer.crs()) invalid_count = 0 - error_ouput = self.getOutputFromName(self.ERROR_OUTPUT) + error_output = self.getOutputFromName(self.ERROR_OUTPUT) error_fields = [ QgsField(name='message', type=QVariant.String, len=255)] - error_writer = error_ouput.getVectorWriter( + error_writer = error_output.getVectorWriter( error_fields, QgsWkbTypes.Point, layer.crs()) @@ -179,8 +179,8 @@ def doCheck(self, feedback): del error_writer if valid_count == 0: - valid_ouput.open = False + valid_output.open = False if invalid_count == 0: - invalid_ouput.open = False + invalid_output.open = False if error_count == 0: - error_ouput.open = False + error_output.open = False diff --git a/python/server/qgsserverprojectparser.sip b/python/server/qgsserverprojectparser.sip index 24aab70f50a0..b923ab11f21c 100644 --- a/python/server/qgsserverprojectparser.sip +++ b/python/server/qgsserverprojectparser.sip @@ -102,7 +102,7 @@ class QgsServerProjectParser void addJoinLayersForElement( const QDomElement& layerElem ) const; void addValueRelationLayersForLayer( const QgsVectorLayer *vl ) const; - /** Add layers which are necessary for the evaluation of the expression function 'getFeature( layer, attributField, value)'*/ + /** Add layers which are necessary for the evaluation of the expression function 'getFeature( layer, attributeField, value)'*/ void addGetFeatureLayers( const QDomElement& layerElem ) const; /** Returns the text of the element for a layer element diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh index b7ecef910b5b..9f7ca8a1729a 100755 --- a/scripts/prepare-commit.sh +++ b/scripts/prepare-commit.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ########################################################################### # prepare-commit.sh # --------------------- diff --git a/scripts/spell_check/.agignore b/scripts/spell_check/.agignore index 47f9ae11ab0e..f59eed0dd66e 100644 --- a/scripts/spell_check/.agignore +++ b/scripts/spell_check/.agignore @@ -38,6 +38,7 @@ Exception_to_GPL_for_Qt.txt images/svg/symbol/blue-marker.svg images/svg/symbol/red-marker.svg images/themes/default/propertyicons/diagram.svg + images/themes/default/propertyicons/general.svg images/themes/default/svgbase/hammer.svg LexerR.py diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat index 947fabaf6411..eea46d0b51b3 100644 --- a/scripts/spell_check/spelling.dat +++ b/scripts/spell_check/spelling.dat @@ -796,6 +796,7 @@ atttribute:attribute atttributes:attributes audeince:audience auromated:automated +australia:Australia austrailia:Australia austrailian:Australian autenticate:authenticate @@ -1229,6 +1230,7 @@ chcek:check chceked:checked chceking:checking chceks:checks +checkk:check checksuming:checksumming cheif:chief cheifs:chiefs @@ -1806,6 +1808,7 @@ could't:couldn't coult:could councellor:councillor councellors:councillors +cound:could counries:countries countains:contains countires:countries @@ -6377,7 +6380,7 @@ specif:specify speciman:specimen spectauclar:spectacular spectaulars:spectaculars -spects:aspects +spects:aspects:* spectum:spectrum speficied:specified spefic:specific:* diff --git a/src/core/raster/qgsrasterblock.h b/src/core/raster/qgsrasterblock.h index 3d1e66af1e42..2dba3294c7f4 100644 --- a/src/core/raster/qgsrasterblock.h +++ b/src/core/raster/qgsrasterblock.h @@ -350,7 +350,7 @@ class CORE_EXPORT QgsRasterBlock QString toString() const; - /** \brief For theExtent and theWidht, theHeight find rectangle covered by subextent. + /** \brief For theExtent and theWidth, theHeight find rectangle covered by subextent. * The output rect has x oriented from left to right and y from top to bottom * (upper-left to lower-right orientation). * @param theExtent extent, usually the larger diff --git a/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp index 22ee18eca23d..7664e56fb39f 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp +++ b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp @@ -941,7 +941,7 @@ QgsCategorizedSymbolRenderer* QgsCategorizedSymbolRenderer::convertFromRenderer( } // If not one of the specifically handled renderers, then just grab the symbol from the renderer - // Could have applied this to specific renderer types (singleSymbol, graduatedSymbo) + // Could have applied this to specific renderer types (singleSymboll, graduatedSymbol) if ( !r ) { diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp index a29b61469f2d..3a2f9497a1d4 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp +++ b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp @@ -1615,7 +1615,7 @@ QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::convertFromRenderer( con } // If not one of the specifically handled renderers, then just grab the symbol from the renderer - // Could have applied this to specific renderer types (singleSymbol, graduatedSymbo) + // Could have applied this to specific renderer types (singleSymboll, graduatedSymbol) if ( !r ) { diff --git a/src/gui/raster/qgsrendererrasterpropertieswidget.cpp b/src/gui/raster/qgsrendererrasterpropertieswidget.cpp index 4fd6d62d57c2..386caea05ab4 100644 --- a/src/gui/raster/qgsrendererrasterpropertieswidget.cpp +++ b/src/gui/raster/qgsrendererrasterpropertieswidget.cpp @@ -108,7 +108,7 @@ QgsRendererRasterPropertiesWidget::QgsRendererRasterPropertiesWidget( QgsMapLaye // this is not a problem - nobody is listening to our signals yet syncToLayer( mRasterLayer ); - connect( mRasterLayer, SIGNAL( styleChanged() ), this, SLOT( refreshAfterSyleChanged() ) ); + connect( mRasterLayer, SIGNAL( styleChanged() ), this, SLOT( refreshAfterStyleChanged() ) ); } void QgsRendererRasterPropertiesWidget::setMapCanvas( QgsMapCanvas *canvas ) @@ -390,7 +390,7 @@ void QgsRendererRasterPropertiesWidget::setRendererWidget( const QString &render } -void QgsRendererRasterPropertiesWidget::refreshAfterSyleChanged() +void QgsRendererRasterPropertiesWidget::refreshAfterStyleChanged() { if ( mRendererWidget ) { diff --git a/src/gui/raster/qgsrendererrasterpropertieswidget.h b/src/gui/raster/qgsrendererrasterpropertieswidget.h index 49e2d1d98174..24d2b17bcf5c 100644 --- a/src/gui/raster/qgsrendererrasterpropertieswidget.h +++ b/src/gui/raster/qgsrendererrasterpropertieswidget.h @@ -80,7 +80,7 @@ class GUI_EXPORT QgsRendererRasterPropertiesWidget : public QgsMapLayerConfigWid //! Enable or disable colorize controls depending on checkbox void toggleColorizeControls( bool colorizeEnabled ); - void refreshAfterSyleChanged(); + void refreshAfterStyleChanged(); private: void setRendererWidget( const QString& rendererName ); diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp index cd09d919729f..3c61cb43f32d 100644 --- a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp +++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp @@ -124,7 +124,7 @@ void QgsGeometryCheckerSetupTab::validateInput() nApplicable += factory->checkApplicability( ui, layer->geometryType() ); } } - bool outputOk = ui.radioButtonOuputModifyInput->isChecked() || !ui.lineEditOutput->text().isEmpty(); + bool outputOk = ui.radioButtonOutputModifyInput->isChecked() || !ui.lineEditOutput->text().isEmpty(); mRunButton->setEnabled( layer && nApplicable > 0 && outputOk ); } diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.ui b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.ui index 5a0eb04730f4..73b6f87e5533 100644 --- a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.ui +++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.ui @@ -615,7 +615,7 @@ 2 - + &Modify input layer @@ -754,7 +754,7 @@ checkBoxGaps doubleSpinBoxGapArea spinBoxTolerance - radioButtonOuputModifyInput + radioButtonOutputModifyInput radioButtonOutputNew lineEditOutput pushButtonOutputBrowse diff --git a/src/plugins/globe/qgsglobeplugindialog.ui b/src/plugins/globe/qgsglobeplugindialog.ui index 5454ca32fbeb..7d20b23e14ba 100644 --- a/src/plugins/globe/qgsglobeplugindialog.ui +++ b/src/plugins/globe/qgsglobeplugindialog.ui @@ -600,7 +600,7 @@ - + Sensitivity diff --git a/src/server/qgsserverexception.h b/src/server/qgsserverexception.h index 68b789c353bd..e26a4bbcd6c2 100644 --- a/src/server/qgsserverexception.h +++ b/src/server/qgsserverexception.h @@ -82,7 +82,7 @@ class SERVER_EXPORT QgsOgcServiceException : public QgsServerException //!return exception version QString version() const { return mVersion; } - //! Overrided from QgsServerException + //! Overridden from QgsServerException virtual QByteArray formatResponse( QString& responseFormat ) const override; private: diff --git a/src/server/qgsserverprojectparser.h b/src/server/qgsserverprojectparser.h index 25096834886a..6bb5c73659de 100644 --- a/src/server/qgsserverprojectparser.h +++ b/src/server/qgsserverprojectparser.h @@ -116,7 +116,7 @@ class SERVER_EXPORT QgsServerProjectParser void addJoinLayersForElement( const QDomElement& layerElem ) const; void addValueRelationLayersForLayer( const QgsVectorLayer *vl ) const; - //! Add layers which are necessary for the evaluation of the expression function 'getFeature( layer, attributField, value)' + //! Add layers which are necessary for the evaluation of the expression function 'getFeature( layer, attributeField, value)' void addGetFeatureLayers( const QDomElement& layerElem ) const; /** Returns the text of the element for a layer element diff --git a/tests/src/core/testqgsfields.cpp b/tests/src/core/testqgsfields.cpp index 6c5248b96ba8..4fee24649af3 100644 --- a/tests/src/core/testqgsfields.cpp +++ b/tests/src/core/testqgsfields.cpp @@ -353,9 +353,9 @@ void TestQgsFields::indexFromName() QCOMPARE( fields.lookupField( QString( "teStFiEld2" ) ), 1 ); //test that fieldNameIndex prefers exact case matches over case insensitive matches - QgsField sameNameDifferentCase( QStringLiteral( "teStFielD" ) ); + QgsField sameNameDifferentCase( QStringLiteral( "teStFielD" ) ); //#spellok fields.append( sameNameDifferentCase ); - QCOMPARE( fields.lookupField( QString( "teStFielD" ) ), 3 ); + QCOMPARE( fields.lookupField( QString( "teStFielD" ) ), 3 ); //#spellok //test that the alias is only matched with fieldNameIndex QCOMPARE( fields.indexFromName( "testfieldAlias" ), -1 ); diff --git a/tests/src/python/qgis_local_server.py b/tests/src/python/qgis_local_server.py index 11116ffdf2af..5964211cb0e1 100644 --- a/tests/src/python/qgis_local_server.py +++ b/tests/src/python/qgis_local_server.py @@ -494,13 +494,13 @@ def get_map(self, params, browser=False): else: raise ServerProcessError( 'Web/FCGI Process Request HTTPError', - 'Cound not connect to process: ' + str(resp.code), + 'Could not connect to process: ' + str(resp.code), resp.message ) except urllib.error.URLError as resp: raise ServerProcessError( 'Web/FCGI Process Request URLError', - 'Cound not connect to process', + 'Could not connect to process', resp.reason ) else: @@ -511,7 +511,7 @@ def get_map(self, params, browser=False): if resp is not None: raise ServerProcessError( 'Web/FCGI Process Request Error', - 'Cound not connect to process: ' + str(resp.code) + 'Could not connect to process: ' + str(resp.code) ) if (tmp_png is not None