Skip to content

Commit 66888fe

Browse files
authoredFeb 21, 2017
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)

0 commit comments

Comments
 (0)
Please sign in to comment.