Fix build

nyalldawson · nyalldawson · commit b0b1714e98ba · 2017-09-25T17:12:04.000+10:00
diff --git a/python/core/symbology/qgsgraduatedsymbolrenderer.sip b/python/core/symbology/qgsgraduatedsymbolrenderer.sip
@@ -75,7 +75,7 @@ class QgsRendererRange
     void swap( QgsRendererRange &other );
 };
 
-typedef QVector<QgsRendererRange> QgsRangeList;
+typedef QList<QgsRendererRange> QgsRangeList;
 
 
 class QgsRendererRangeLabelFormat
diff --git 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
@@ -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
@@ -78,7 +78,7 @@ class CORE_EXPORT QgsRendererRange
     void swap( QgsRendererRange &other );
 };
 
-typedef QVector<QgsRendererRange> QgsRangeList;
+typedef QList<QgsRendererRange> QgsRangeList;
 
 
 /** \ingroup core

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ QgsAuthMethodRegistry::QgsAuthMethodRegistry( const QString &pluginPath )`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// auth method file regex pattern, only files matching the pattern are loaded if the variable is defined`
`81`		`- QString filePattern = getenv( QStringLiteral( "QGIS_AUTHMETHOD_FILE" ) );`
	`81`	`+ QString filePattern = getenv( "QGIS_AUTHMETHOD_FILE" );`
`82`	`82`	`QRegExp fileRegexp;`
`83`	`83`	`if ( !filePattern.isEmpty() )`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1390,7 +1390,7 @@ void QgsGraduatedSymbolRenderer::addClass( double lower, double upper )`
`1390`	`1390`
`1391`	`1391`	`void QgsGraduatedSymbolRenderer::addBreak( double breakValue, bool updateSymbols )`
`1392`	`1392`	`{`
`1393`		`- QMutableVectorIterator< QgsRendererRange > it( mRanges );`
	`1393`	`+ QMutableListIterator< QgsRendererRange > it( mRanges );`
`1394`	`1394`	`while ( it.hasNext() )`
`1395`	`1395`	`{`
`1396`	`1396`	`QgsRendererRange range = it.next();`