Skip to content

Commit 66888fe

Browse files
authored
Merge pull request #4165 from 3nids/removethe
remove the-prefix from source code
2 parents 6ce8d94 + 7812d4f commit 66888fe

File tree

384 files changed

+3790
-3786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

384 files changed

+3790
-3786
lines changed

python/core/composer/qgscomposition.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,15 +326,15 @@ class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator
326326

327327
/** Returns a composer item given its text identifier.
328328
* Ids are not necessarely unique, but this function returns only one element.
329-
* @param theId - A QString representing the identifier of the item to retrieve.
329+
* @param id - A QString representing the identifier of the item to retrieve.
330330
* @return QgsComposerItem pointer or 0 pointer if no such item exists.
331331
*/
332-
const QgsComposerItem* getComposerItemById( const QString& theId ) const;
332+
const QgsComposerItem* getComposerItemById( const QString& id ) const;
333333

334334
/** Returns a composer item given its unique identifier.
335-
* @param theUuid A QString representing the UUID of the item to
335+
* @param uuid A QString representing the UUID of the item to
336336
*/
337-
const QgsComposerItem* getComposerItemByUuid( const QString& theUuid ) const;
337+
const QgsComposerItem* getComposerItemByUuid( const QString& uuid ) const;
338338

339339
int printResolution() const;
340340
void setPrintResolution( const int dpi );

python/core/qgsapplication.sip

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
104104
* based on the supplied theme name exists. If it does not the theme name will
105105
* be reverted to 'default'.
106106
*/
107-
static void setThemeName( const QString &theThemeName );
107+
static void setThemeName( const QString &themeName );
108108

109109
/** Set the active theme to the specified theme.
110110
* The theme name should be a single word e.g. 'default','classic'.
@@ -218,11 +218,11 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
218218

219219
//! Helper to get a theme icon. It will fall back to the
220220
//! default theme if the active theme does not have the required icon.
221-
static QIcon getThemeIcon( const QString &theName );
221+
static QIcon getThemeIcon( const QString &name );
222222

223223
//! Helper to get a theme icon as a pixmap. It will fall back to the
224224
//! default theme if the active theme does not have the required icon.
225-
static QPixmap getThemePixmap( const QString &theName );
225+
static QPixmap getThemePixmap( const QString &name );
226226

227227
//! Returns the path to user's style.
228228
static QString userStylePath();
@@ -275,19 +275,19 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
275275
static QString libexecPath();
276276

277277
//! Alters prefix path - used by 3rd party apps
278-
static void setPrefixPath( const QString &thePrefixPath, bool useDefaultPaths = false );
278+
static void setPrefixPath( const QString &prefixPath, bool useDefaultPaths = false );
279279

280280
//! Alters plugin path - used by 3rd party apps
281-
static void setPluginPath( const QString &thePluginPath );
281+
static void setPluginPath( const QString &pluginPath );
282282

283283
//! Alters pkg data path - used by 3rd party apps
284-
static void setPkgDataPath( const QString &thePkgDataPath );
284+
static void setPkgDataPath( const QString &pkgDataPath );
285285

286286
//! Alters default svg paths - used by 3rd party apps.
287287
static void setDefaultSvgPaths( const QStringList& pathList );
288288

289289
//! Alters authentication data base directory path - used by 3rd party apps
290-
static void setAuthDatabaseDirPath( const QString& theAuthDbDirPath );
290+
static void setAuthDatabaseDirPath( const QString& authDbDirPath );
291291

292292
//! loads providers
293293
static void initQgis();
@@ -352,13 +352,13 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
352352
* and then calls GDALDriverManager::AutoSkipDrivers() to unregister it. The
353353
* driver name should be the short format of the Gdal driver name e.g. GTIFF.
354354
*/
355-
static void skipGdalDriver( const QString& theDriver );
355+
static void skipGdalDriver( const QString& driver );
356356

357357
/** Sets the GDAL_SKIP environment variable to exclude the specified driver
358358
* and then calls GDALDriverManager::AutoSkipDrivers() to unregister it. The
359359
* driver name should be the short format of the Gdal driver name e.g. GTIFF.
360360
*/
361-
static void restoreGdalDriver( const QString& theDriver );
361+
static void restoreGdalDriver( const QString& driver );
362362

363363
/** Returns the list of gdal drivers that should be skipped (based on
364364
* GDAL_SKIP environment variable)

python/core/qgscoordinatereferencesystem.sip

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -168,20 +168,20 @@ class QgsCoordinateReferenceSystem
168168
* - "WKT:<wkt>" - handled with createFromWkt()
169169
*
170170
* If no prefix is specified, WKT definition is assumed.
171-
* @param theDefinition A String containing a coordinate reference system definition.
171+
* @param definition A String containing a coordinate reference system definition.
172172
* @see createFromString()
173173
*/
174174
// TODO QGIS 3: remove "POSTGIS" and "INTERNAL", allow PROJ4 without the prefix
175-
explicit QgsCoordinateReferenceSystem( const QString& theDefinition );
175+
explicit QgsCoordinateReferenceSystem( const QString& definition );
176176

177177
/** Constructor a CRS object using a postgis SRID, an EPSG code or an internal QGIS CRS ID.
178178
* @note We encourage you to use EPSG code, WKT or Proj4 to describe CRS's in your code
179179
* wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile.
180-
* @param theId The ID valid for the chosen CRS ID type
181-
* @param theType One of the types described in CrsType
180+
* @param id The ID valid for the chosen CRS ID type
181+
* @param type One of the types described in CrsType
182182
*/
183-
// TODO QGIS 3: remove theType and always use EPSG code
184-
QgsCoordinateReferenceSystem( const long theId, CrsType theType = PostgisCrsId );
183+
// TODO QGIS 3: remove type and always use EPSG code
184+
QgsCoordinateReferenceSystem( const long id, CrsType type = PostgisCrsId );
185185

186186
static QList< long > validSrsIds();
187187

@@ -234,8 +234,8 @@ class QgsCoordinateReferenceSystem
234234
* wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile.
235235
* @return True on success else false
236236
*/
237-
// TODO QGIS 3: remove theType and always use EPSG code, rename to createFromEpsg
238-
bool createFromId( const long theId, CrsType theType = PostgisCrsId );
237+
// TODO QGIS 3: remove type and always use EPSG code, rename to createFromEpsg
238+
bool createFromId( const long id, CrsType type = PostgisCrsId );
239239

240240
/**
241241
* Sets this CRS to the given OGC WMS-format Coordinate Reference Systems.
@@ -247,14 +247,14 @@ class QgsCoordinateReferenceSystem
247247
* @return True on success else false
248248
*/
249249
// TODO QGIS 3: remove "QGIS" and "CUSTOM", only support "USER" (also returned by authid())
250-
bool createFromOgcWmsCrs( const QString& theCrs );
250+
bool createFromOgcWmsCrs( const QString& crs );
251251

252252
/** Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
253-
* @param theSrid The postgis SRID for the desired spatial reference system.
253+
* @param srid The postgis SRID for the desired spatial reference system.
254254
* @return True on success else false
255255
*/
256256
// TODO QGIS 3: remove unless really necessary - let's use EPSG codes instead
257-
bool createFromSrid( const long theSrid );
257+
bool createFromSrid( const long srid );
258258

259259
/** Sets this CRS using a WKT definition.
260260
*
@@ -264,20 +264,20 @@ class QgsCoordinateReferenceSystem
264264
* set up the object.
265265
* @note Some members may be left blank if no match can be found in CRS database.
266266
* @note this method uses an internal cache. Call invalidateCache() to clear the cache.
267-
* @param theWkt The WKT for the desired spatial reference system.
267+
* @param wkt The WKT for the desired spatial reference system.
268268
* @return True on success else false
269269
*/
270-
bool createFromWkt( const QString &theWkt );
270+
bool createFromWkt( const QString &wkt );
271271

272272
/** Sets this CRS by lookup of internal QGIS CRS ID in the CRS database.
273273
*
274274
* If the srsid is < USER_CRS_START_ID, system CRS database is used, otherwise
275275
* user's local CRS database from home directory is used.
276276
* @note this method uses an internal cache. Call invalidateCache() to clear the cache.
277-
* @param theSrsId The internal QGIS CRS ID for the desired spatial reference system.
277+
* @param srsId The internal QGIS CRS ID for the desired spatial reference system.
278278
* @return True on success else false
279279
*/
280-
bool createFromSrsId( const long theSrsId );
280+
bool createFromSrsId( const long srsId );
281281

282282
/** Sets this CRS by passing it a PROJ.4 style formatted string.
283283
*
@@ -297,10 +297,10 @@ class QgsCoordinateReferenceSystem
297297
*
298298
* @note Some members may be left blank if no match can be found in CRS database.
299299
* @note this method uses an internal cache. Call invalidateCache() to clear the cache.
300-
* @param theProjString A proj4 format string
300+
* @param projString A proj4 format string
301301
* @return True on success else false
302302
*/
303-
bool createFromProj4( const QString &theProjString );
303+
bool createFromProj4( const QString &projString );
304304

305305
/** Set up this CRS from a string definition.
306306
*
@@ -312,10 +312,10 @@ class QgsCoordinateReferenceSystem
312312
* - "WKT:<wkt>" - handled with createFromWkt()
313313
*
314314
* If no prefix is specified, WKT definition is assumed.
315-
* @param theDefinition A String containing a coordinate reference system definition.
315+
* @param definition A String containing a coordinate reference system definition.
316316
* @return True on success else false
317317
*/
318-
bool createFromString( const QString &theDefinition );
318+
bool createFromString( const QString &definition );
319319

320320
/** Set up this CRS from various text formats.
321321
*
@@ -328,11 +328,11 @@ class QgsCoordinateReferenceSystem
328328
* ( http://www.gdal.org/ogr/classOGRSpatialReference.html#aec3c6a49533fe457ddc763d699ff8796 )
329329
* @note this function generates a WKT string using OSRSetFromUserInput() and
330330
* passes it to createFromWkt() function.
331-
* @param theDefinition A String containing a coordinate reference system definition.
331+
* @param definition A String containing a coordinate reference system definition.
332332
* @return True on success else false
333333
*/
334334
// TODO QGIS3: rename to createFromStringOGR so it is clear it's similar to createFromString, just different backend
335-
bool createFromUserInput( const QString &theDefinition );
335+
bool createFromUserInput( const QString &definition );
336336

337337
/** Make sure that ESRI WKT import is done properly.
338338
* This is required for proper shapefile CRS import when using gdal>= 1.9.
@@ -372,24 +372,24 @@ class QgsCoordinateReferenceSystem
372372
*
373373
* Internally it will use authid() for comparison.
374374
*/
375-
bool operator==( const QgsCoordinateReferenceSystem &theSrs ) const;
375+
bool operator==( const QgsCoordinateReferenceSystem &srs ) const;
376376
/** Overloaded != operator used to compare to CRS's.
377377
*
378378
* Returns opposite bool value to operator ==
379379
*/
380-
bool operator!=( const QgsCoordinateReferenceSystem &theSrs ) const;
380+
bool operator!=( const QgsCoordinateReferenceSystem &srs ) const;
381381

382382
/** Restores state from the given DOM node.
383-
* @param theNode The node from which state will be restored
383+
* @param node The node from which state will be restored
384384
* @return bool True on success, False on failure
385385
*/
386-
bool readXml( const QDomNode & theNode );
386+
bool readXml( const QDomNode & node );
387387
/** Stores state to the given Dom node in the given document.
388-
* @param theNode The node in which state will be restored
389-
* @param theDoc The document in which state will be stored
388+
* @param node The node in which state will be restored
389+
* @param doc The document in which state will be stored
390390
* @return bool True on success, False on failure
391391
*/
392-
bool writeXml( QDomNode & theNode, QDomDocument & theDoc ) const;
392+
bool writeXml( QDomNode & node, QDomDocument & doc ) const;
393393

394394

395395
/** Sets custom function to force valid CRS

python/core/qgscredentials.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsCredentials
4646
virtual bool requestMasterPassword( QString &password /In,Out/, bool stored = false ) = 0;
4747

4848
//! register instance
49-
void setInstance( QgsCredentials *theInstance );
49+
void setInstance( QgsCredentials *instance );
5050

5151
private:
5252
QgsCredentials( const QgsCredentials& );

python/core/qgsdataprovider.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ class QgsDataProvider : QObject
329329
protected:
330330

331331
/** Add error message */
332-
void appendError( const QgsErrorMessage & theMessage );
332+
void appendError( const QgsErrorMessage & message );
333333

334334
/** Set error message */
335-
void setError( const QgsError & theError );
335+
void setError( const QgsError & error );
336336
};

python/core/qgsdatasourceuri.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ class QgsDataSourceUri
118118
QString geometryColumn() const;
119119

120120
//! set use Estimated Metadata
121-
void setUseEstimatedMetadata( bool theFlag );
121+
void setUseEstimatedMetadata( bool flag );
122122

123123
//! Returns true if estimated metadata are used
124124
bool useEstimatedMetadata() const;
125125

126126
//! Set to true to disable selection by id
127-
void disableSelectAtId( bool theFlag );
127+
void disableSelectAtId( bool flag );
128128
//! Returns whether the selection by id is disabled
129129
bool selectAtIdDisabled() const;
130130

python/core/qgsdatumtransformstore.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class QgsDatumTransformStore
3030

3131
void readXml( const QDomNode& parentNode );
3232

33-
void writeXml( QDomNode& parentNode, QDomDocument& theDoc ) const;
33+
void writeXml( QDomNode& parentNode, QDomDocument& doc ) const;
3434

3535
struct Entry
3636
{

python/core/qgserror.sip

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ class QgsErrorMessage
1414
QgsErrorMessage();
1515

1616
/** Constructor.
17-
* @param theMessage error message string
18-
* @param theTag error label, for example GDAL, GDAL Provider, Raster layer
19-
* @param theFile the file where error was created
20-
* @param theFunction the function where error was created
21-
* @param theLine the line where error was created
17+
* @param message error message string
18+
* @param tag error label, for example GDAL, GDAL Provider, Raster layer
19+
* @param file the file where error was created
20+
* @param function the function where error was created
21+
* @param line the line where error was created
2222
*/
23-
QgsErrorMessage( const QString & theMessage, const QString & theTag = QString::null, const QString & theFile = QString::null, const QString & theFunction = QString::null, int theLine = 0 );
23+
QgsErrorMessage( const QString & message, const QString & tag = QString::null, const QString & file = QString::null, const QString & function = QString::null, int line = 0 );
2424

2525
QString message() const;
2626
QString tag() const;
@@ -44,32 +44,32 @@ class QgsError
4444
QgsError();
4545

4646
/** Constructor with single message.
47-
* @param theMessage error message
48-
* @param theTag short description, e.g. GDAL, Provider, Layer
47+
* @param message error message
48+
* @param tag short description, e.g. GDAL, Provider, Layer
4949
*/
50-
QgsError( const QString & theMessage, const QString & theTag );
50+
QgsError( const QString & message, const QString & tag );
5151

5252
/** Append new error message.
53-
* @param theMessage error message string
54-
* @param theTag error label, for example GDAL, GDAL Provider, Raster layer
53+
* @param message error message string
54+
* @param tag error label, for example GDAL, GDAL Provider, Raster layer
5555
*/
56-
void append( const QString & theMessage, const QString & theTag );
56+
void append( const QString & message, const QString & tag );
5757

5858
/** Append new error message.
59-
* @param theMessage error message
59+
* @param message error message
6060
*/
61-
void append( const QgsErrorMessage & theMessage );
61+
void append( const QgsErrorMessage & message );
6262

6363
/** Test if any error is set.
6464
* @return true if contains error
6565
*/
6666
bool isEmpty() const;
6767

6868
/** Full error messages description
69-
* @param theFormat output format
69+
* @param format output format
7070
* @return error report
7171
*/
72-
QString message( QgsErrorMessage::Format theFormat = QgsErrorMessage::Html ) const;
72+
QString message( QgsErrorMessage::Format format = QgsErrorMessage::Html ) const;
7373

7474
/** Short error description, usually the first error in chain, the real error.
7575
* @return error description

python/core/qgsfeaturestore.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QgsFeatureStore
3232
QgsFeatureList& features();
3333

3434
/** Set map of optional parameters */
35-
void setParams( const QMap<QString, QVariant> &theParams );
35+
void setParams( const QMap<QString, QVariant> &params );
3636

3737
/** Get map of optional parameters */
3838
QMap<QString, QVariant> params() const;

python/core/qgslogger.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class QgsLogger
4848
static int debugLevel();
4949

5050
/** Logs the message passed in to the logfile defined in QGIS_LOG_FILE if any. **/
51-
static void logMessageToFile( const QString& theMessage );
51+
static void logMessageToFile( const QString& message );
5252

5353
/** Reads the environment variable QGIS_LOG_FILE. Returns NULL if the variable is not set,
5454
* otherwise returns a file name for writing log messages to.*/

0 commit comments

Comments
 (0)