Skip to content

Commit af55c02

Browse files
nyalldawsonnyalldawson
committed
Followup 4166a3, don't use QStringLiteral in definitions
Causes linker errors in some random cases
1 parent 794c8f3 commit af55c02

File tree

66 files changed

+102
-144
lines changed

Some content is hidden

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

66 files changed

+102
-144
lines changed

‎src/analysis/network/qgsgraphbuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ANALYSIS_EXPORT QgsGraphBuilder : public QgsGraphBuilderInterface
3939
/**
4040
* default constructor
4141
*/
42-
QgsGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool otfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = QStringLiteral( "WGS84" ) );
42+
QgsGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool otfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" );
4343

4444
~QgsGraphBuilder();
4545

‎src/analysis/network/qgsgraphbuilderintr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
4141
* @param topologyTolerance sqrt distance between source point as one graph vertex
4242
* @param ellipsoidID ellipsoid for edge measurement
4343
*/
44-
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = QStringLiteral( "WGS84" ) )
44+
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" )
4545
: mCrs( crs )
4646
, mCtfEnabled( ctfEnabled )
4747
, mTopologyTolerance( topologyTolerance )

‎src/analysis/vector/qgszonalstatistics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ANALYSIS_EXPORT QgsZonalStatistics
5555
/**
5656
* Constructor for QgsZonalStatistics.
5757
*/
58-
QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = QLatin1String( "" ), int rasterBand = 1,
58+
QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = "", int rasterBand = 1,
5959
Statistics stats = Statistics( Count | Sum | Mean ) );
6060

6161
/** Starts the calculation

‎src/app/pluginmanager/qgspluginsortfilterproxymodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class QgsPluginSortFilterProxyModel : public QSortFilterProxyModel
4949
void setAcceptedStatuses( const QStringList& statuses );
5050

5151
//! (Re)configire the spacer filter
52-
void setAcceptedSpacers( const QString& spacers = QStringLiteral( "" ) );
52+
void setAcceptedSpacers( const QString& spacers = "" );
5353

5454
//! Return number of item with status filter matching (no other filters are considered)
5555
int countWithCurrentStatus();

‎src/app/qgisapp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
230230
void addUserInputWidget( QWidget* widget );
231231

232232
//! Set theme (icons)
233-
void setTheme( const QString& themeName = QStringLiteral( "default" ) );
233+
void setTheme( const QString& themeName = "default" );
234234

235235
void setIconSizes( int size );
236236

‎src/app/qgspluginregistry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class APP_EXPORT QgsPluginRegistry
104104

105105
//! Check current QGIS version against requested minimal and optionally maximal QGIS version
106106
//! if maxVersion not specified, the default value is assumed: floor(minVersion) + 0.99.99
107-
bool checkQgisVersion( const QString& minVersion, const QString& maxVersion = QLatin1String( "" ) ) const;
107+
bool checkQgisVersion( const QString& minVersion, const QString& maxVersion = "" ) const;
108108

109109
private:
110110
static QgsPluginRegistry* _instance;

‎src/core/composer/qgscomposerlegenditem.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,7 @@ class CORE_EXPORT QgsComposerLayerItem : public QgsComposerLegendItem
157157
void setShowFeatureCount( bool show ) { mShowFeatureCount = show; }
158158
bool showFeatureCount() const { return mShowFeatureCount; }
159159

160-
/**
161-
* Sets the legend layer item to the appropriate default style for the specified legend rule.
162-
*/
163-
void setDefaultStyle( double scaleDenominator = -1, const QString& rule = QLatin1String( "" ) );
160+
void setDefaultStyle( double scaleDenominator = -1, const QString& rule = "" );
164161

165162
private:
166163
QString mLayerID;

‎src/core/geometry/qgsabstractgeometry.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class CORE_EXPORT QgsAbstractGeometry
168168
* @see asGML3
169169
* @see asJSON
170170
*/
171-
virtual QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const = 0;
171+
virtual QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const = 0;
172172

173173
/** Returns a GML3 representation of the geometry.
174174
* @param doc DOM document
@@ -179,7 +179,7 @@ class CORE_EXPORT QgsAbstractGeometry
179179
* @see asGML2
180180
* @see asJSON
181181
*/
182-
virtual QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const = 0;
182+
virtual QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const = 0;
183183

184184
/** Returns a GeoJSON representation of the geometry.
185185
* @param precision number of decimal places for coordinates

‎src/core/geometry/qgscircularstring.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
4747
int wkbSize() const override;
4848
unsigned char* asWkb( int& binarySize ) const override;
4949
QString asWkt( int precision = 17 ) const override;
50-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
51-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
50+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
51+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
5252
QString asJSON( int precision = 17 ) const override;
5353

5454
int numPoints() const override;

‎src/core/geometry/qgscompoundcurve.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
4848
int wkbSize() const override;
4949
unsigned char* asWkb( int& binarySize ) const override;
5050
QString asWkt( int precision = 17 ) const override;
51-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
52-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
51+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
52+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
5353
QString asJSON( int precision = 17 ) const override;
5454

5555
//curve interface

‎src/core/geometry/qgscurvepolygon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
4747
int wkbSize() const override;
4848
unsigned char* asWkb( int& binarySize ) const override;
4949
QString asWkt( int precision = 17 ) const override;
50-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
51-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
50+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
51+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
5252
QString asJSON( int precision = 17 ) const override;
5353

5454
//surface interface

‎src/core/geometry/qgsgeometrycollection.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class CORE_EXPORT QgsGeometryCollection: public QgsAbstractGeometry
8484
int wkbSize() const override;
8585
unsigned char* asWkb( int& binarySize ) const override;
8686
QString asWkt( int precision = 17 ) const override;
87-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
88-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
87+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
88+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
8989
QString asJSON( int precision = 17 ) const override;
9090

9191
virtual QgsRectangle boundingBox() const override;

‎src/core/geometry/qgsgeometryutils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class CORE_EXPORT QgsGeometryUtils
240240
* @param defaultType default geometry type for childen
241241
* @returns list of WKT child block strings, eg List("TYPE1 (contents1)", "TYPE2 (TYPE3 (contents3), TYPE4 (contents4))")
242242
*/
243-
static QStringList wktGetChildBlocks( const QString& wkt , const QString &defaultType = QLatin1String( "" ) );
243+
static QStringList wktGetChildBlocks( const QString& wkt , const QString &defaultType = "" );
244244

245245
enum componentType
246246
{

‎src/core/geometry/qgslinestring.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ class CORE_EXPORT QgsLineString: public QgsCurve
133133
int wkbSize() const override;
134134
unsigned char* asWkb( int& binarySize ) const override;
135135
QString asWkt( int precision = 17 ) const override;
136-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
137-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
136+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
137+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
138138
QString asJSON( int precision = 17 ) const override;
139139

140140
//curve interface

‎src/core/geometry/qgsmulticurve.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection
3636
// inherited: int wkbSize() const;
3737
// inherited: unsigned char* asWkb( int& binarySize ) const;
3838
// inherited: QString asWkt( int precision = 17 ) const;
39-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
40-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
39+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
40+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
4141
QString asJSON( int precision = 17 ) const override;
4242

4343
/** Adds a geometry and takes ownership. Returns true in case of success*/

‎src/core/geometry/qgsmultilinestring.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve
3636
// inherited: int wkbSize() const;
3737
// inherited: unsigned char* asWkb( int& binarySize ) const;
3838
// inherited: QString asWkt( int precision = 17 ) const;
39-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
40-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
39+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
40+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
4141
QString asJSON( int precision = 17 ) const override;
4242

4343
/** Adds a geometry and takes ownership. Returns true in case of success*/

‎src/core/geometry/qgsmultipoint.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollection
3636
// inherited: int wkbSize() const;
3737
// inherited: unsigned char* asWkb( int& binarySize ) const;
3838
// inherited: QString asWkt( int precision = 17 ) const;
39-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
40-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
39+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
40+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
4141
QString asJSON( int precision = 17 ) const override;
4242

4343

‎src/core/geometry/qgsmultipolygon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurface
3636
// inherited: int wkbSize() const;
3737
// inherited: unsigned char* asWkb( int& binarySize ) const;
3838
// inherited: QString asWkt( int precision = 17 ) const;
39-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
40-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
39+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
40+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
4141
QString asJSON( int precision = 17 ) const override;
4242

4343
/** Adds a geometry and takes ownership. Returns true in case of success*/

‎src/core/geometry/qgsmultisurface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class CORE_EXPORT QgsMultiSurface: public QgsGeometryCollection
3636
// inherited: int wkbSize() const;
3737
// inherited: unsigned char* asWkb( int& binarySize ) const;
3838
// inherited: QString asWkt( int precision = 17 ) const;
39-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
40-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
39+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
40+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
4141
QString asJSON( int precision = 17 ) const override;
4242

4343

‎src/core/geometry/qgspointv2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ class CORE_EXPORT QgsPointV2: public QgsAbstractGeometry
162162
int wkbSize() const override;
163163
unsigned char* asWkb( int& binarySize ) const override;
164164
QString asWkt( int precision = 17 ) const override;
165-
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
166-
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = QStringLiteral( "gml" ) ) const override;
165+
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
166+
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
167167
QString asJSON( int precision = 17 ) const override;
168168
void draw( QPainter& p ) const override;
169169
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,

‎src/core/qgsapplication.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ class CORE_EXPORT QgsApplication : public QApplication
3838
static const char* QGIS_ORGANIZATION_NAME;
3939
static const char* QGIS_ORGANIZATION_DOMAIN;
4040
static const char* QGIS_APPLICATION_NAME;
41-
42-
/**
43-
* Constructor for QgsApplication.
44-
*/
45-
QgsApplication( int & argc, char ** argv, bool GUIenabled, const QString& customConfigPath = QString(), const QString& platformName = QStringLiteral( "desktop" ) );
41+
QgsApplication( int & argc, char ** argv, bool GUIenabled, const QString& customConfigPath = QString(), const QString& platformName = "desktop" );
4642
virtual ~QgsApplication();
4743

4844
/** This method initialises paths etc for QGIS. Called by the ctor or call it manually

‎src/core/qgscolorramp.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,10 +553,7 @@ class CORE_EXPORT QgsCptCityColorRamp : public QgsGradientColorRamp
553553
void setSchemeName( const QString& schemeName ) { mSchemeName = schemeName; mFileLoaded = false; }
554554
void setVariantName( const QString& variantName ) { mVariantName = variantName; mFileLoaded = false; }
555555
void setVariantList( const QStringList& variantList ) { mVariantList = variantList; }
556-
/**
557-
* Sets the name for the color ramp, based on a scheme, variant and list of variants.
558-
*/
559-
void setName( const QString& schemeName, const QString& variantName = QLatin1String( "" ), const QStringList& variantList = QStringList() )
556+
void setName( const QString& schemeName, const QString& variantName = "", const QStringList& variantList = QStringList() )
560557
{ mSchemeName = schemeName; mVariantName = variantName; mVariantList = variantList; mFileLoaded = false; }
561558

562559
void loadPalette() { loadFile(); }

‎src/core/qgsdataprovider.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
7474
CustomData = 3000 //!< Custom properties for 3rd party providers or very provider-specific properties which are not expected to be of interest for other providers can be added starting from this value up.
7575
};
7676

77-
/**
78-
* Constructor for QgsDataProvider.
79-
*/
80-
QgsDataProvider( QString const & uri = QLatin1String( "" ) )
77+
QgsDataProvider( QString const & uri = "" )
8178
: mDataSourceURI( uri )
8279
{}
8380

‎src/core/qgsfontutils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class CORE_EXPORT QgsFontUtils
8282
* @returns QFont
8383
* @note Added in QGIS 2.1
8484
*/
85-
static QFont getStandardTestFont( const QString& style = QStringLiteral( "Roman" ), int pointsize = 12 );
85+
static QFont getStandardTestFont( const QString& style = "Roman", int pointsize = 12 );
8686

8787
/** Returns a DOM element containing the properties of the font.
8888
* @param font font

‎src/core/qgsmaplayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
790790
/** Read custom properties from project file.
791791
@param layerNode note to read from
792792
@param keyStartsWith reads only properties starting with the specified string (or all if the string is empty)*/
793-
void readCustomProperties( const QDomNode& layerNode, const QString& keyStartsWith = QLatin1String( "" ) );
793+
void readCustomProperties( const QDomNode& layerNode, const QString& keyStartsWith = "" );
794794

795795
/** Write custom properties to project file. */
796796
void writeCustomProperties( QDomNode & layerNode, QDomDocument & doc ) const;

‎src/core/qgsprojectversion.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ class CORE_EXPORT QgsProjectVersion
3838
, mSub( 0 )
3939
{}
4040
~QgsProjectVersion() {}
41-
42-
/**
43-
* Constructor for QgsProjectVersion which accepts a major, minor and sub version number and a release name.
44-
*/
45-
QgsProjectVersion( int major, int minor, int sub, const QString& name = QLatin1String( "" ) );
41+
QgsProjectVersion( int major, int minor, int sub, const QString& name = "" );
4642
QgsProjectVersion( const QString& string );
4743
int majorVersion() { return mMajor;}
4844
int minorVersion() { return mMinor;}

‎src/core/qgsrenderchecker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class CORE_EXPORT QgsRenderChecker
124124
* @param theRenderedImageFile to optionally override the output filename
125125
* @note: make sure to call setExpectedImage and setRenderedImage first.
126126
*/
127-
bool compareImages( const QString& theTestName, unsigned int theMismatchCount = 0, const QString& theRenderedImageFile = QLatin1String( "" ) );
127+
bool compareImages( const QString& theTestName, unsigned int theMismatchCount = 0, const QString& theRenderedImageFile = "" );
128128
/** Get a list of all the anomalies. An anomaly is a rendered difference
129129
* file where there is some red pixel content (indicating a render check
130130
* mismatch), but where the output was still acceptible. If the render

0 commit comments

Comments
 (0)