From f6c0d8dd63c2ff2df782989340a597e961738470 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 25 Jan 2016 12:36:06 +1100 Subject: [PATCH] Use QVector instead of QList in some private contexts --- src/analysis/raster/qgsrelief.cpp | 2 +- src/app/qgsdecorationgrid.cpp | 2 +- src/core/composer/qgscomposerattributetable.cpp | 4 ++-- src/core/composer/qgscomposerattributetablev2.cpp | 4 ++-- src/core/composer/qgscomposermapgrid.cpp | 4 ++-- src/core/geometry/qgsgeometryutils.cpp | 3 ++- src/core/qgscrscache.cpp | 6 +++--- src/core/qgsvectorlayer.cpp | 1 - src/core/raster/qgsrasterprojector.cpp | 2 -- src/gui/qgsmapcanvassnapper.cpp | 10 +++++----- .../raster/qgssinglebandpseudocolorrendererwidget.cpp | 4 ++-- src/plugins/interpolation/qgsinterpolationdialog.cpp | 1 - src/plugins/roadgraph/shortestpathwidget.cpp | 4 ++-- src/providers/virtual/qgsvirtuallayerprovider.cpp | 3 +-- src/server/qgsmslayercache.cpp | 4 ++-- src/server/qgswmsserver.cpp | 4 ++-- tests/src/core/testqgsrasterlayer.cpp | 4 ++-- tests/src/core/testqgssymbolv2.cpp | 4 ++-- 18 files changed, 31 insertions(+), 35 deletions(-) diff --git a/src/analysis/raster/qgsrelief.cpp b/src/analysis/raster/qgsrelief.cpp index eca450d439d7..296f82d91f68 100644 --- a/src/analysis/raster/qgsrelief.cpp +++ b/src/analysis/raster/qgsrelief.cpp @@ -665,7 +665,7 @@ QList< QgsRelief::ReliefColor > QgsRelief::calculateOptimizedReliefClasses() } //set colors according to optimised class breaks - QList colorList; + QVector colorList; colorList.push_back( QColor( 7, 165, 144 ) ); colorList.push_back( QColor( 12, 221, 162 ) ); colorList.push_back( QColor( 33, 252, 183 ) ); diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp index 6ad25494ebe9..7dd4f1cc34dd 100644 --- a/src/app/qgsdecorationgrid.cpp +++ b/src/app/qgsdecorationgrid.cpp @@ -535,7 +535,7 @@ bool clipByRect( QLineF& line, const QPolygonF& rect ) borderLines << QLineF( rect.at( 2 ), rect.at( 3 ) ); borderLines << QLineF( rect.at( 3 ), rect.at( 0 ) ); - QList intersectionList; + QVector intersectionList; QVector::const_iterator it = borderLines.constBegin(); for ( ; it != borderLines.constEnd(); ++it ) { diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp index 6e3bfb6c641b..b0403a225da9 100644 --- a/src/core/composer/qgscomposerattributetable.cpp +++ b/src/core/composer/qgscomposerattributetable.cpp @@ -534,7 +534,7 @@ static bool columnsBySortRank( QPair a, QPair > QgsComposerAttributeTable::sortAttributes() const { //generate list of all sorted columns - QList< QPair > sortedColumns; + QVector< QPair > sortedColumns; QList::const_iterator columnIt = mColumns.constBegin(); int idx = 0; for ( ; columnIt != mColumns.constEnd(); ++columnIt ) @@ -551,7 +551,7 @@ QList > QgsComposerAttributeTable::sortAttributes() const //generate list of column index, bool for sort direction (to match 2.0 api) QList > attributesBySortRank; - QList< QPair >::const_iterator sortedColumnIt = sortedColumns.constBegin(); + QVector< QPair >::const_iterator sortedColumnIt = sortedColumns.constBegin(); for ( ; sortedColumnIt != sortedColumns.constEnd(); ++sortedColumnIt ) { diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp index b4e5332cfc6f..bd381f3acf17 100644 --- a/src/core/composer/qgscomposerattributetablev2.cpp +++ b/src/core/composer/qgscomposerattributetablev2.cpp @@ -645,7 +645,7 @@ static bool columnsBySortRank( QPair a, QPair > QgsComposerAttributeTableV2::sortAttributes() const { //generate list of all sorted columns - QList< QPair > sortedColumns; + QVector< QPair > sortedColumns; QList::const_iterator columnIt = mColumns.constBegin(); int idx = 0; for ( ; columnIt != mColumns.constEnd(); ++columnIt ) @@ -662,7 +662,7 @@ QList > QgsComposerAttributeTableV2::sortAttributes() const //generate list of column index, bool for sort direction (to match 2.0 api) QList > attributesBySortRank; - QList< QPair >::const_iterator sortedColumnIt = sortedColumns.constBegin(); + QVector< QPair >::const_iterator sortedColumnIt = sortedColumns.constBegin(); for ( ; sortedColumnIt != sortedColumns.constEnd(); ++sortedColumnIt ) { diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp index e6e395ddcd87..51c6f5ac60e7 100644 --- a/src/core/composer/qgscomposermapgrid.cpp +++ b/src/core/composer/qgscomposermapgrid.cpp @@ -1610,7 +1610,7 @@ int QgsComposerMapGrid::xGridLines( QList< QPair< double, QLineF > >& lines ) co borderLines << QLineF( mapPolygon.at( 2 ), mapPolygon.at( 3 ) ); borderLines << QLineF( mapPolygon.at( 3 ), mapPolygon.at( 0 ) ); - QList intersectionList; //intersects between border lines and grid lines + QVector intersectionList; //intersects between border lines and grid lines while ( currentLevel <= mapBoundingRect.bottom() && gridLineCount < MAX_GRID_LINES ) { @@ -1694,7 +1694,7 @@ int QgsComposerMapGrid::yGridLines( QList< QPair< double, QLineF > >& lines ) co borderLines << QLineF( mapPolygon.at( 2 ), mapPolygon.at( 3 ) ); borderLines << QLineF( mapPolygon.at( 3 ), mapPolygon.at( 0 ) ); - QList intersectionList; //intersects between border lines and grid lines + QVector intersectionList; //intersects between border lines and grid lines while ( currentLevel <= mapBoundingRect.right() && gridLineCount < MAX_GRID_LINES ) { diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp index b80c08566a66..3499e3be19fb 100644 --- a/src/core/geometry/qgsgeometryutils.cpp +++ b/src/core/geometry/qgsgeometryutils.cpp @@ -16,6 +16,7 @@ email : marco.hugentobler at sourcepole dot com #include "qgsgeometryutils.h" #include "qgswkbptr.h" #include +#include QgsPointV2 QgsGeometryUtils::closestVertex( const QgsAbstractGeometryV2& geom, const QgsPointV2& pt, QgsVertexId& id ) { @@ -431,7 +432,7 @@ bool QgsGeometryUtils::segmentMidPoint( const QgsPointV2& p1, const QgsPointV2& double midDy = midPoint.y() - p1.y(); //get the four possible midpoints - QList possibleMidPoints; + QVector possibleMidPoints; possibleMidPoints.append( pointOnLineWithDistance( midPoint, QgsPointV2( midPoint.x() - midDy, midPoint.y() + midDx ), dist ) ); possibleMidPoints.append( pointOnLineWithDistance( midPoint, QgsPointV2( midPoint.x() - midDy, midPoint.y() + midDx ), 2 * radius - dist ) ); possibleMidPoints.append( pointOnLineWithDistance( midPoint, QgsPointV2( midPoint.x() + midDy, midPoint.y() - midDx ), dist ) ); diff --git a/src/core/qgscrscache.cpp b/src/core/qgscrscache.cpp index f49bc712dd88..5d71955aa37e 100644 --- a/src/core/qgscrscache.cpp +++ b/src/core/qgscrscache.cpp @@ -17,7 +17,7 @@ #include "qgscrscache.h" #include "qgscoordinatetransform.h" - +#include QgsCoordinateTransformCache* QgsCoordinateTransformCache::instance() { @@ -69,7 +69,7 @@ void QgsCoordinateTransformCache::invalidateCrs( const QString& crsAuthId ) { //get keys to remove first QHash< QPair< QString, QString >, QgsCoordinateTransform* >::const_iterator it = mTransforms.constBegin(); - QList< QPair< QString, QString > > updateList; + QVector< QPair< QString, QString > > updateList; for ( ; it != mTransforms.constEnd(); ++it ) { @@ -80,7 +80,7 @@ void QgsCoordinateTransformCache::invalidateCrs( const QString& crsAuthId ) } //and remove after - QList< QPair< QString, QString > >::const_iterator updateIt = updateList.constBegin(); + QVector< QPair< QString, QString > >::const_iterator updateIt = updateList.constBegin(); for ( ; updateIt != updateList.constEnd(); ++updateIt ) { mTransforms.remove( *updateIt ); diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 9a624adec20f..a46bc77d3c84 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -2432,7 +2432,6 @@ int QgsVectorLayer::snapWithContext( const QgsPoint& startPoint, double snapping return 1; } - QList featureList; QgsRectangle searchRect( startPoint.x() - snappingTolerance, startPoint.y() - snappingTolerance, startPoint.x() + snappingTolerance, startPoint.y() + snappingTolerance ); double sqrSnappingTolerance = snappingTolerance * snappingTolerance; diff --git a/src/core/raster/qgsrasterprojector.cpp b/src/core/raster/qgsrasterprojector.cpp index 20312377f76f..58488d941c81 100644 --- a/src/core/raster/qgsrasterprojector.cpp +++ b/src/core/raster/qgsrasterprojector.cpp @@ -712,8 +712,6 @@ void QgsRasterProjector::insertCols( const QgsCoordinateTransform* ct ) { for ( int r = 0; r < mCPRows; r++ ) { - QList myRow; - QList myLegalRow; for ( int c = 0; c < mCPCols - 1; c++ ) { mCPMatrix[r].insert( 1 + c*2, QgsPoint() ); diff --git a/src/gui/qgsmapcanvassnapper.cpp b/src/gui/qgsmapcanvassnapper.cpp index bee5c5bc0f9b..f01d922704e9 100644 --- a/src/gui/qgsmapcanvassnapper.cpp +++ b/src/gui/qgsmapcanvassnapper.cpp @@ -279,8 +279,8 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QgsPoint& point, QList segments; - QList points; + QVector segments; + QVector points; for ( QList::const_iterator it = results.constBegin(); it != results.constEnd(); ++it ) @@ -297,12 +297,12 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QgsPoint& point, QList myResults; - for ( QList::const_iterator oSegIt = segments.constBegin(); + for ( QVector::const_iterator oSegIt = segments.constBegin(); oSegIt != segments.constEnd(); ++oSegIt ) { @@ -314,7 +314,7 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QgsPoint& point, QList::iterator iSegIt = segments.begin(); + for ( QVector::iterator iSegIt = segments.begin(); iSegIt != segments.end(); ++iSegIt ) { diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp index 7d30f4405958..af701adf5536 100644 --- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp +++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp @@ -240,7 +240,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked() int numberOfEntries = 0; QList entryValues; - QList entryColors; + QVector entryColors; double min = lineEditValue( mMinLineEdit ); double max = lineEditValue( mMaxLineEdit ); @@ -333,7 +333,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked() mColormapTreeWidget->clear(); QList::const_iterator value_it = entryValues.begin(); - QList::const_iterator color_it = entryColors.begin(); + QVector::const_iterator color_it = entryColors.begin(); for ( ; value_it != entryValues.end(); ++value_it, ++color_it ) { diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp index 3fe3f592c8a4..7639d023456b 100644 --- a/src/plugins/interpolation/qgsinterpolationdialog.cpp +++ b/src/plugins/interpolation/qgsinterpolationdialog.cpp @@ -435,7 +435,6 @@ void QgsInterpolationDialog::on_mBBoxToCurrentExtent_clicked() QgsRectangle QgsInterpolationDialog::boundingBoxOfLayers() { int nLayers = mLayersTreeWidget->topLevelItemCount(); - QList< QgsInterpolator::LayerData > inputLayerList; QgsRectangle combinedLayerExtent; for ( int i = 0; i < nLayers; ++i ) diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp index b3d1cb78f849..3b6ac1069d20 100644 --- a/src/plugins/roadgraph/shortestpathwidget.cpp +++ b/src/plugins/roadgraph/shortestpathwidget.cpp @@ -337,7 +337,7 @@ void RgShortestPathWidget::findingPath() int startVertexIdx = path->findVertex( p1 ); int stopVertexIdx = path->findVertex( p2 ); - QList< QgsPoint > p; + QVector< QgsPoint > p; while ( startVertexIdx != stopVertexIdx ) { if ( stopVertexIdx < 0 ) @@ -356,7 +356,7 @@ void RgShortestPathWidget::findingPath() stopVertexIdx = e.outVertex(); } p.push_front( p1 ); - QList< QgsPoint>::iterator it; + QVector< QgsPoint>::iterator it; for ( it = p.begin(); it != p.end(); ++it ) { mrbPath->addPoint( *it ); diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp index 3b38a3b9a59a..d5e2abe6d03a 100644 --- a/src/providers/virtual/qgsvirtuallayerprovider.cpp +++ b/src/providers/virtual/qgsvirtuallayerprovider.cpp @@ -217,8 +217,7 @@ bool QgsVirtualLayerProvider::createIt() } - QList fields, gFields; - QMap refTables; + QVector gFields; if ( !mDefinition.query().isEmpty() ) { diff --git a/src/server/qgsmslayercache.cpp b/src/server/qgsmslayercache.cpp index 2b8235dfab8d..363f747c07d9 100644 --- a/src/server/qgsmslayercache.cpp +++ b/src/server/qgsmslayercache.cpp @@ -122,8 +122,8 @@ QgsMapLayer* QgsMSLayerCache::searchLayer( const QString& url, const QString& la void QgsMSLayerCache::removeProjectFileLayers( const QString& project ) { QgsMessageLog::logMessage( "Removing cache entries for project file: " + project, "Server", QgsMessageLog::INFO ); - QList< QPair< QString, QString > > removeEntries; - QList< QgsMSLayerCacheEntry > removeEntriesValues; + QVector< QPair< QString, QString > > removeEntries; + QVector< QgsMSLayerCacheEntry > removeEntriesValues; QHash, QgsMSLayerCacheEntry>::iterator entryIt = mEntries.begin(); for ( ; entryIt != mEntries.end(); ++entryIt ) diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp index 06740a2abd08..3c8bc0838db5 100644 --- a/src/server/qgswmsserver.cpp +++ b/src/server/qgswmsserver.cpp @@ -2828,7 +2828,7 @@ void QgsWMSServer::applyOpacities( const QStringList& layerList, QList< QPair< Q QStringList opacityList = opIt.value().split( "," ); //collect leaf layers and their opacity - QList< QPair< QgsMapLayer*, int > > layerOpacityList; + QVector< QPair< QgsMapLayer*, int > > layerOpacityList; QStringList::const_iterator oIt = opacityList.constBegin(); QStringList::const_iterator lIt = layerList.constBegin(); for ( ; oIt != opacityList.constEnd() && lIt != layerList.constEnd(); ++oIt, ++lIt ) @@ -2847,7 +2847,7 @@ void QgsWMSServer::applyOpacities( const QStringList& layerList, QList< QPair< Q } } - QList< QPair< QgsMapLayer*, int > >::const_iterator lOpIt = layerOpacityList.constBegin(); + QVector< QPair< QgsMapLayer*, int > >::const_iterator lOpIt = layerOpacityList.constBegin(); for ( ; lOpIt != layerOpacityList.constEnd(); ++lOpIt ) { //vector or raster? diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp index 139590f943ee..85f4b248c1d8 100644 --- a/tests/src/core/testqgsrasterlayer.cpp +++ b/tests/src/core/testqgsrasterlayer.cpp @@ -230,7 +230,7 @@ void TestQgsRasterLayer::populateColorRampShader( QgsColorRampShader* colorRampS QgsRasterBandStats myRasterBandStats = mpRasterLayer->dataProvider()->bandStatistics( bandNr ); QList entryValues; - QList entryColors; + QVector entryColors; double currentValue = myRasterBandStats.minimumValue; double intervalDiff; if ( numberOfEntries > 1 ) @@ -255,7 +255,7 @@ void TestQgsRasterLayer::populateColorRampShader( QgsColorRampShader* colorRampS //items to imitate old pseudo color renderer QList colorRampItems; QList::const_iterator value_it = entryValues.begin(); - QList::const_iterator color_it = entryColors.begin(); + QVector::const_iterator color_it = entryColors.begin(); for ( ; value_it != entryValues.end(); ++value_it, ++color_it ) { colorRampItems.append( QgsColorRampShader::ColorRampItem( *value_it, *color_it ) ); diff --git a/tests/src/core/testqgssymbolv2.cpp b/tests/src/core/testqgssymbolv2.cpp index 7e0569f881c2..4014dc3a459b 100644 --- a/tests/src/core/testqgssymbolv2.cpp +++ b/tests/src/core/testqgssymbolv2.cpp @@ -385,7 +385,7 @@ void TestQgsSymbolV2::testParseColorList() ++i; } - QList< QPair< QString, QList > > colorListTests; + QVector< QPair< QString, QList > > colorListTests; QList list1; list1 << QColor( QString( "blue" ) ) << QColor( QString( "red" ) ) << QColor( QString( "green" ) ); colorListTests.append( qMakePair( QString( "blue red green" ), list1 ) ); @@ -406,7 +406,7 @@ void TestQgsSymbolV2::testParseColorList() colorListTests.append( qMakePair( QString( "rgb(255,0,0)\nrgb(0,255,0)\nrgb(0,0,255)" ), list3 ) ); colorListTests.append( qMakePair( QString( "rgb(255,0,0)\nrgb(0,255,0) rgb(0,0,255)" ), list3 ) ); - QList< QPair< QString, QList > >::const_iterator it = colorListTests.constBegin(); + QVector< QPair< QString, QList > >::const_iterator it = colorListTests.constBegin(); while ( it != colorListTests.constEnd() ) { QgsDebugMsg( "color list string: " + ( *it ).first );