From b0b1714e98bac74b5153d08276ec010d65fe84ce Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 25 Sep 2017 16:08:57 +1000 Subject: [PATCH] Fix build --- python/core/symbology/qgsgraduatedsymbolrenderer.sip | 2 +- src/core/auth/qgsauthmethodregistry.cpp | 2 +- src/core/symbology/qgsgraduatedsymbolrenderer.cpp | 2 +- src/core/symbology/qgsgraduatedsymbolrenderer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/core/symbology/qgsgraduatedsymbolrenderer.sip b/python/core/symbology/qgsgraduatedsymbolrenderer.sip index aa26d2dc4d6..d1a299e3450 100644 --- a/python/core/symbology/qgsgraduatedsymbolrenderer.sip +++ b/python/core/symbology/qgsgraduatedsymbolrenderer.sip @@ -75,7 +75,7 @@ class QgsRendererRange void swap( QgsRendererRange &other ); }; -typedef QVector QgsRangeList; +typedef QList QgsRangeList; class QgsRendererRangeLabelFormat diff --git a/src/core/auth/qgsauthmethodregistry.cpp b/src/core/auth/qgsauthmethodregistry.cpp index b368a135752..e60a30355ad 100644 --- a/src/core/auth/qgsauthmethodregistry.cpp +++ b/src/core/auth/qgsauthmethodregistry.cpp @@ -78,7 +78,7 @@ QgsAuthMethodRegistry::QgsAuthMethodRegistry( const QString &pluginPath ) } // auth method file regex pattern, only files matching the pattern are loaded if the variable is defined - QString filePattern = getenv( QStringLiteral( "QGIS_AUTHMETHOD_FILE" ) ); + QString filePattern = getenv( "QGIS_AUTHMETHOD_FILE" ); QRegExp fileRegexp; if ( !filePattern.isEmpty() ) { diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology/qgsgraduatedsymbolrenderer.cpp index ecc2f45d790..a00021b3bac 100644 --- a/src/core/symbology/qgsgraduatedsymbolrenderer.cpp +++ b/src/core/symbology/qgsgraduatedsymbolrenderer.cpp @@ -1390,7 +1390,7 @@ void QgsGraduatedSymbolRenderer::addClass( double lower, double upper ) void QgsGraduatedSymbolRenderer::addBreak( double breakValue, bool updateSymbols ) { - QMutableVectorIterator< QgsRendererRange > it( mRanges ); + QMutableListIterator< QgsRendererRange > it( mRanges ); while ( it.hasNext() ) { QgsRendererRange range = it.next(); diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.h b/src/core/symbology/qgsgraduatedsymbolrenderer.h index 149656aaa29..4af3dbf8904 100644 --- a/src/core/symbology/qgsgraduatedsymbolrenderer.h +++ b/src/core/symbology/qgsgraduatedsymbolrenderer.h @@ -78,7 +78,7 @@ class CORE_EXPORT QgsRendererRange void swap( QgsRendererRange &other ); }; -typedef QVector QgsRangeList; +typedef QList QgsRangeList; /** \ingroup core