Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
{Qgis,QGis} -> QGIS
  • Loading branch information
nirvn committed Jun 6, 2020
1 parent 341b3d8 commit 291ba7f
Show file tree
Hide file tree
Showing 26 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgis.sip.in
Expand Up @@ -22,7 +22,7 @@ int QgisEvent = QEvent::User + 1;
class Qgis
{
%Docstring
The Qgis class provides global constants for use throughout the application.
The QGIS class provides global constants for use throughout the application.
%End

%TypeHeaderCode
Expand Down
6 changes: 3 additions & 3 deletions python/gui/auto_generated/qgsmaptoolidentify.sip.in
Expand Up @@ -91,7 +91,7 @@ Performs the identification.
:param x: x coordinates of mouseEvent
:param y: y coordinates of mouseEvent
:param layerList: Performs the identification within the given list of layers. Default value is an empty list, i.e. uses all the layers.
:param mode: Identification mode. Can use Qgis default settings or a defined mode. Default mode is DefaultQgsSetting.
:param mode: Identification mode. Can use QGIS default settings or a defined mode. Default mode is DefaultQgsSetting.

:return: a list of IdentifyResult*
%End
Expand All @@ -104,7 +104,7 @@ this has been made private and two publics methods are offered

:param x: x coordinates of mouseEvent
:param y: y coordinates of mouseEvent
:param mode: Identification mode. Can use Qgis default settings or a defined mode.
:param mode: Identification mode. Can use QGIS default settings or a defined mode.
:param layerType: Only performs identification in a certain type of layers (raster, vector, mesh). Default value is AllLayers.

:return: a list of IdentifyResult
Expand Down Expand Up @@ -144,7 +144,7 @@ this has been made private and two publics methods are offered

:param x: x coordinates of mouseEvent
:param y: y coordinates of mouseEvent
:param mode: Identification mode. Can use Qgis default settings or a defined mode.
:param mode: Identification mode. Can use QGIS default settings or a defined mode.
:param layerList: Performs the identification within the given list of layers.
:param layerType: Only performs identification in a certain type of layers (raster, vector, mesh).

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/gpkg/plugin.py
Expand Up @@ -238,7 +238,7 @@ def __init__(self, row, db, schema=None):
GPKGTable.__init__(self, row[:-5], db, schema)
VectorTable.__init__(self, db, schema)
# GPKG does case-insensitive checks for table names, but the
# GPKG provider didn't do the same in Qgis < 1.9, so self.geomTableName
# GPKG provider didn't do the same in QGIS < 1.9, so self.geomTableName
# stores the table name like stored in the geometry_columns table
self.geomTableName, self.geomColumn, self.geomType, self.geomDim, self.srid = row[-5:]
self.extent = self.database().connector.getTableExtent((self.schemaName(), self.name), self.geomColumn, force=False)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/oracle/connector.py
Expand Up @@ -199,7 +199,7 @@ def hasRasterSupport(self):
return False

def hasCustomQuerySupport(self):
"""From Qgis v2.2 Oracle custom queries are supported."""
"""From QGIS v2.2 onwards Oracle custom queries are supported."""
return Qgis.QGIS_VERSION_INT >= 20200

def hasTableColumnEditingSupport(self):
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/oracle/info_model.py
Expand Up @@ -575,7 +575,7 @@ def spatialInfo(self):
(QApplication.translate("DBManagerPlugin", "Geometry:"),
self.table.geomType),
(QApplication.translate("DBManagerPlugin",
"Qgis Geometry type:"),
"QGIS Geometry type:"),
QgsWkbTypes.displayString(self.table.wkbType))
]

Expand Down
4 changes: 2 additions & 2 deletions python/plugins/db_manager/db_plugins/oracle/plugin.py
Expand Up @@ -394,8 +394,8 @@ def tableDataModel(self, parent):
return ORTableDataModel(self, parent)

def getValidQgisUniqueFields(self, onlyOne=False):
""" list of fields valid to load the table as layer in Qgis canvas.
Qgis automatically search for a valid unique field, so it's
""" list of fields valid to load the table as layer in QGIS canvas.
QGIS automatically search for a valid unique field, so it's
needed only for queries and views.
"""

Expand Down
4 changes: 2 additions & 2 deletions python/plugins/db_manager/db_plugins/plugin.py
Expand Up @@ -771,8 +771,8 @@ def toMapLayer(self, geometryType=None, crs=None):
return QgsVectorLayer(uri, self.name, provider)

def getValidQgisUniqueFields(self, onlyOne=False):
""" list of fields valid to load the table as layer in Qgis canvas.
Qgis automatically search for a valid unique field, so it's
""" list of fields valid to load the table as layer in QGIS canvas.
QGIS automatically search for a valid unique field, so it's
needed only for queries and views """

ret = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/spatialite/plugin.py
Expand Up @@ -221,7 +221,7 @@ def __init__(self, row, db, schema=None):
SLTable.__init__(self, row[:-5], db, schema)
VectorTable.__init__(self, db, schema)
# SpatiaLite does case-insensitive checks for table names, but the
# SL provider didn't do the same in Qgis < 1.9, so self.geomTableName
# SL provider didn't do the same in QGIS < 1.9, so self.geomTableName
# stores the table name like stored in the geometry_columns table
self.geomTableName, self.geomColumn, self.geomType, self.geomDim, self.srid = row[-5:]

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/vlayers/plugin.py
Expand Up @@ -159,7 +159,7 @@ def __init__(self, row, db, schema=None):
LTable.__init__(self, row[:-5], db, schema)
VectorTable.__init__(self, db, schema)
# SpatiaLite does case-insensitive checks for table names, but the
# SL provider didn't do the same in Qgis < 1.9, so self.geomTableName
# SL provider didn't do the same in QGIS < 1.9, so self.geomTableName
# stores the table name like stored in the geometry_columns table
self.geomTableName, self.geomColumn, self.geomType, self.geomDim, self.srid = row[
-5:]
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/otb/OtbChoiceWidget.py
Expand Up @@ -69,7 +69,7 @@ def __updateWrapper(self, name, visible):
if name in self.dialog.mainWidget().wrappers:
self.__setWrapperVisibility(self.dialog.mainWidget().wrappers[name], visible)

# Fur Qgis modeler
# For QGIS modeler
else:
try:
if name in self.dialog.widget.widget.wrappers:
Expand Down
2 changes: 1 addition & 1 deletion src/app/georeferencer/qgsgeorefmainwindow.cpp
Expand Up @@ -971,7 +971,7 @@ void QgsGeoreferencerMainWindow::createMapCanvas()
connect( mToolMovePoint, &QgsGeorefToolMovePoint::pointReleased,
this, &QgsGeoreferencerMainWindow::releasePoint );

// Point in Qgis Map
// Point in QGIS Map
mToolMovePointQgis = new QgsGeorefToolMovePoint( QgisApp::instance()->mapCanvas() );
mToolMovePointQgis->setAction( mActionMoveGCPPoint );
connect( mToolMovePointQgis, &QgsGeorefToolMovePoint::pointPressed,
Expand Down
2 changes: 1 addition & 1 deletion src/app/georeferencer/qgsmapcoordsdialog.cpp
Expand Up @@ -39,7 +39,7 @@ QgsMapCoordsDialog::QgsMapCoordsDialog( QgsMapCanvas *qgisCanvas, const QgsPoint
mPointFromCanvasPushButton->setCheckable( true );
buttonBox->addButton( mPointFromCanvasPushButton, QDialogButtonBox::ActionRole );

// User can input either DD or DMS coords (from QGis mapcanvas we take DD coords)
// User can input either DD or DMS coords (from QGIS mapcanvas we take DD coords)
QgsDMSAndDDValidator *validator = new QgsDMSAndDDValidator( this );
leXCoord->setValidator( validator );
leYCoord->setValidator( validator );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.h
Expand Up @@ -188,7 +188,7 @@ class QgsGeoreferencerMainWindow;

/**
* \class QgisApp
* \brief Main window for the Qgis application
* \brief Main window for the QGIS application
*/
class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisappstylesheet.h
Expand Up @@ -25,7 +25,7 @@

/**
* \class QgisAppStyleSheet
* \brief Adjustable stylesheet for the Qgis application
* \brief Adjustable stylesheet for the QGIS application
*/
class APP_EXPORT QgisAppStyleSheet: public QObject
{
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsclipboard.cpp
Expand Up @@ -51,12 +51,12 @@ void QgsClipboard::replaceWithCopyOf( QgsVectorLayer *src )
if ( !src )
return;

// Replace the QGis clipboard.
// Replace the QGIS clipboard.
mFeatureFields = src->fields();
mFeatureClipboard = src->selectedFeatures();
mCRS = src->crs();
mSrcLayer = src;
QgsDebugMsg( QStringLiteral( "replaced QGis clipboard." ) );
QgsDebugMsg( QStringLiteral( "replaced QGIS clipboard." ) );

setSystemClipboard();
mUseSystemClipboard = false;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgis.h
Expand Up @@ -40,7 +40,7 @@ int QgisEvent = QEvent::User + 1;

/**
* \ingroup core
* The Qgis class provides global constants for use throughout the application.
* The QGIS class provides global constants for use throughout the application.
*/
class CORE_EXPORT Qgis
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsactionmanager.h
Expand Up @@ -2,7 +2,7 @@
qgsactionmanager.h
These classes store and control the management and execution of actions
associated with a particular Qgis layer. Actions are defined to be
associated with a particular QGIS layer. Actions are defined to be
external programs that are run with user-specified inputs that can
depend on the contents of layer attributes.
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgsmaptoolidentify.h
Expand Up @@ -111,7 +111,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
\param x x coordinates of mouseEvent
\param y y coordinates of mouseEvent
\param layerList Performs the identification within the given list of layers. Default value is an empty list, i.e. uses all the layers.
\param mode Identification mode. Can use Qgis default settings or a defined mode. Default mode is DefaultQgsSetting.
\param mode Identification mode. Can use QGIS default settings or a defined mode. Default mode is DefaultQgsSetting.
\returns a list of IdentifyResult*/
QList<QgsMapToolIdentify::IdentifyResult> identify( int x, int y, const QList<QgsMapLayer *> &layerList = QList<QgsMapLayer *>(), IdentifyMode mode = DefaultQgsSetting );

Expand All @@ -121,7 +121,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
* this has been made private and two publics methods are offered
* \param x x coordinates of mouseEvent
* \param y y coordinates of mouseEvent
* \param mode Identification mode. Can use Qgis default settings or a defined mode.
* \param mode Identification mode. Can use QGIS default settings or a defined mode.
* \param layerType Only performs identification in a certain type of layers (raster, vector, mesh). Default value is AllLayers.
* \returns a list of IdentifyResult
*/
Expand Down Expand Up @@ -155,7 +155,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
* this has been made private and two publics methods are offered
* \param x x coordinates of mouseEvent
* \param y y coordinates of mouseEvent
* \param mode Identification mode. Can use Qgis default settings or a defined mode.
* \param mode Identification mode. Can use QGIS default settings or a defined mode.
* \param layerList Performs the identification within the given list of layers.
* \param layerType Only performs identification in a certain type of layers (raster, vector, mesh).
* \returns a list of IdentifyResult
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/qgisplugin.h
Expand Up @@ -16,15 +16,15 @@
/**
* QGIS - Plugin API
*
* \section about About QGis Plugins
* \section about About QGIS Plugins
* Plugins provide additional functionality to QGis. Plugins must
* implement several required methods in order to be registered with
* QGis. These methods include:
* name:
* - version
* - description
*
* All QGis plugins must inherit from the abstract base class QgisPlugin.
* All QGIS plugins must inherit from the abstract base class QgisPlugin.
* This list will grow as the API is expanded.
*
* In addition, a plugin must implement the classFactory and unload
Expand Down
2 changes: 1 addition & 1 deletion src/quickgui/plugin/qgsquickplugin.h
Expand Up @@ -21,7 +21,7 @@
/**
* \ingroup quick
*
* Qgis Qml Extension Plugin responsible for exposing C++ Qgis classes to QML
* QGIS Qml Extension Plugin responsible for exposing C++ QGIS classes to QML
*
* \since QGIS 3.2
*/
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsaccesscontrolfilter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
qgsaccesscontrolplugin.cpp
--------------------------
Access control interface for Qgis Server plugins
Access control interface for QGIS Server plugins
begin : 2015-05-19
copyright : (C) 2015 by Stéphane Brunner
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsaccesscontrolfilter.h
@@ -1,7 +1,7 @@
/***************************************************************************
qgsaccesscontrolfilter.h
------------------------
Access control interface for Qgis Server plugins
Access control interface for QGIS Server plugins
begin : 2015-05-19
copyright : (C) 2015 by Stéphane Brunner
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsfcgiserverresponse.cpp
Expand Up @@ -166,5 +166,5 @@ void QgsFcgiServerResponse::truncate()

void QgsFcgiServerResponse::setDefaultHeaders()
{
setHeader( QStringLiteral( "Server" ), QStringLiteral( " Qgis FCGI server - QGis version %1" ).arg( Qgis::version() ) );
setHeader( QStringLiteral( "Server" ), QStringLiteral( " QGIS FCGI server - QGIS version %1" ).arg( Qgis::version() ) );
}
2 changes: 1 addition & 1 deletion src/server/qgsservercachefilter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
qgsservercachefilter.cpp
------------------------
Cache interface for Qgis Server plugins
Cache interface for QGIS Server plugins
begin : 2018-07-05
copyright : (C) 2018 by René-Luc D'Hont
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsservercachefilter.h
@@ -1,7 +1,7 @@
/***************************************************************************
qgsservercachefilter.h
------------------------
Cache interface for Qgis Server plugins
Cache interface for QGIS Server plugins
begin : 2018-07-05
copyright : (C) 2018 by René-Luc D'Hont
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsserversettings.cpp
Expand Up @@ -332,7 +332,7 @@ void QgsServerSettings::logSummary() const
const QMetaEnum metaEnumSrc( QMetaEnum::fromType<QgsServerSettingsEnv::Source>() );
const QMetaEnum metaEnumEnv( QMetaEnum::fromType<QgsServerSettingsEnv::EnvVar>() );

QgsMessageLog::logMessage( "Qgis Server Settings: ", "Server", Qgis::Info );
QgsMessageLog::logMessage( "QGIS Server Settings: ", "Server", Qgis::Info );
for ( Setting s : mSettings )
{
const QString src = metaEnumSrc.valueToKey( s.src );
Expand Down

0 comments on commit 291ba7f

Please sign in to comment.