Change QgsRectangle::combineExtentWith(const QgsRectangle*) into QgsRectangle::combineExtentWith(const QgsRectangle&)

manisandro · manisandro · commit d5512a931f98 · 2016-05-29T08:57:26.000+02:00
diff --git a/python/core/qgsrectangle.sip b/python/core/qgsrectangle.sip
@@ -74,7 +74,7 @@ class QgsRectangle
     //! return true when rectangle contains a point
     bool contains( const QgsPoint &p ) const;
     //! expand the rectangle so that covers both the original rectangle and the given rectangle
-    void combineExtentWith( const QgsRectangle *rect );
+    void combineExtentWith( const QgsRectangle& rect );
     //! expand the rectangle so that covers both the original rectangle and the given point
     void combineExtentWith( double x, double y );
     //! test if rectangle is empty.
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -3706,7 +3706,7 @@ QgsRectangle QgsDxfExport::dxfExtent() const
       else
       {
         QgsRectangle layerExtent = layerIt->first->extent();
-        extent.combineExtentWith( &layerExtent );
+        extent.combineExtentWith( layerExtent );
       }
     }
   }
diff --git a/src/core/geometry/qgscircularstringv2.cpp b/src/core/geometry/qgscircularstringv2.cpp
@@ -78,7 +78,7 @@ QgsRectangle QgsCircularStringV2::calculateBoundingBox() const
     else
     {
       QgsRectangle segmentBox = segmentBoundingBox( QgsPointV2( mX[i], mY[i] ), QgsPointV2( mX[i + 1], mY[i + 1] ), QgsPointV2( mX[i + 2], mY[i + 2] ) );
-      bbox.combineExtentWith( &segmentBox );
+      bbox.combineExtentWith( segmentBox );
     }
   }
 
diff --git a/src/core/geometry/qgscompoundcurvev2.cpp b/src/core/geometry/qgscompoundcurvev2.cpp
@@ -95,7 +95,7 @@ QgsRectangle QgsCompoundCurveV2::calculateBoundingBox() const
   for ( int i = 1; i < mCurves.size(); ++i )
   {
     QgsRectangle curveBox = mCurves.at( i )->boundingBox();
-    bbox.combineExtentWith( &curveBox );
+    bbox.combineExtentWith( curveBox );
   }
   return bbox;
 }
diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollectionv2.cpp
@@ -336,7 +336,7 @@ QgsRectangle QgsGeometryCollectionV2::calculateBoundingBox() const
   for ( int i = 1; i < mGeometries.size(); ++i )
   {
     QgsRectangle geomBox = mGeometries.at( i )->boundingBox();
-    bbox.combineExtentWith( &geomBox );
+    bbox.combineExtentWith( geomBox );
   }
   return bbox;
 }
diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp
@@ -194,14 +194,14 @@ bool QgsRectangle::contains( const QgsPoint &p ) const
          ymin <= p.y() && p.y() <= ymax;
 }
 
-void QgsRectangle::combineExtentWith( const QgsRectangle * rect )
+void QgsRectangle::combineExtentWith( const QgsRectangle &rect )
 {
 
-  xmin = (( xmin < rect->xMinimum() ) ? xmin : rect->xMinimum() );
-  xmax = (( xmax > rect->xMaximum() ) ? xmax : rect->xMaximum() );
+  xmin = (( xmin < rect.xMinimum() ) ? xmin : rect.xMinimum() );
+  xmax = (( xmax > rect.xMaximum() ) ? xmax : rect.xMaximum() );
 
-  ymin = (( ymin < rect->yMinimum() ) ? ymin : rect->yMinimum() );
-  ymax = (( ymax > rect->yMaximum() ) ? ymax : rect->yMaximum() );
+  ymin = (( ymin < rect.yMinimum() ) ? ymin : rect.yMinimum() );
+  ymax = (( ymax > rect.yMaximum() ) ? ymax : rect.yMaximum() );
 
 }
 
diff --git a/src/core/qgsrectangle.h b/src/core/qgsrectangle.h
@@ -97,7 +97,7 @@ class CORE_EXPORT QgsRectangle
     //! return true when rectangle contains a point
     bool contains( const QgsPoint &p ) const;
     //! expand the rectangle so that covers both the original rectangle and the given rectangle
-    void combineExtentWith( const QgsRectangle *rect );
+    void combineExtentWith( const QgsRectangle& rect );
     //! expand the rectangle so that covers both the original rectangle and the given point
     void combineExtentWith( double x, double y );
     //! test if rectangle is empty.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -716,7 +716,7 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()
       if ( !fet.constGeometry() || fet.constGeometry()->isEmpty() )
         continue;
       r = fet.constGeometry()->boundingBox();
-      retval.combineExtentWith( &r );
+      retval.combineExtentWith( r );
     }
   }
   else
@@ -731,7 +731,7 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()
         if ( fet.constGeometry() )
         {
           r = fet.constGeometry()->boundingBox();
-          retval.combineExtentWith( &r );
+          retval.combineExtentWith( r );
         }
       }
     }
@@ -999,7 +999,7 @@ QgsRectangle QgsVectorLayer::extent()
     if ( mDataProvider->featureCount() != 0 )
     {
       QgsRectangle r = mDataProvider->extent();
-      rect.combineExtentWith( &r );
+      rect.combineExtentWith( r );
     }
 
     if ( mEditBuffer )
@@ -1009,7 +1009,7 @@ QgsRectangle QgsVectorLayer::extent()
         if ( it->constGeometry() )
         {
           QgsRectangle r = it->constGeometry()->boundingBox();
-          rect.combineExtentWith( &r );
+          rect.combineExtentWith( r );
         }
       }
     }
@@ -1025,7 +1025,7 @@ QgsRectangle QgsVectorLayer::extent()
       if ( fet.constGeometry() && fet.constGeometry()->type() != QGis::UnknownGeometry )
       {
         QgsRectangle bb = fet.constGeometry()->boundingBox();
-        rect.combineExtentWith( &bb );
+        rect.combineExtentWith( bb );
       }
     }
   }
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -617,7 +617,7 @@ void QgsRelationReferenceWidget::highlightFeature( QgsFeature f, CanvasExtent ca
     QgsRectangle extent = mCanvas->extent();
     if ( !extent.contains( featBBox ) )
     {
-      extent.combineExtentWith( &featBBox );
+      extent.combineExtentWith( featBBox );
       extent.scale( 1.1 );
       mCanvas->setExtent( extent );
       mCanvas->refresh();
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -242,7 +242,7 @@ void QgsLayerTreeViewDefaultActions::zoomToLayers( QgsMapCanvas* canvas, const Q
     if ( canvas->hasCrsTransformEnabled() )
       layerExtent = canvas->mapSettings().layerExtentToOutputExtent( layer, layerExtent );
 
-    extent.combineExtentWith( &layerExtent );
+    extent.combineExtentWith( layerExtent );
   }
 
   if ( extent.isNull() )
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1166,7 +1166,7 @@ void QgsMapCanvas::zoomToFeatureIds( QgsVectorLayer* layer, const QgsFeatureIds&
       return;
     }
     QgsRectangle r = mapSettings().layerExtentToOutputExtent( layer, geom->boundingBox() );
-    rect.combineExtentWith( &r );
+    rect.combineExtentWith( r );
     featureCount++;
   }
 
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -558,7 +558,7 @@ void QgsRubberBand::updateRect()
       }
       else
       {
-        r.combineExtentWith( &rect );
+        r.combineExtentWith( rect );
       }
     }
   }
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -772,7 +772,7 @@ void GlobePlugin::refreshQGISMapLayer( QgsRectangle rect )
       rect = mLayerExtents.values().front();
       foreach ( const QgsRectangle& extent, mLayerExtents.values() )
       {
-        rect.combineExtentWith( &extent );
+        rect.combineExtentWith( extent );
       }
     }
     mOsgViewer->getDatabasePager()->clear();
@@ -903,7 +903,7 @@ void GlobePlugin::updateLayers()
     QgsRectangle fullExtent = mLayerExtents.isEmpty() ? QgsRectangle() : mLayerExtents.values().front();
     foreach ( const QgsRectangle& rect, mLayerExtents.values() )
     {
-      fullExtent.combineExtentWith( &rect );
+      fullExtent.combineExtentWith( rect );
     }
     mLayerExtents.clear();
 
@@ -958,7 +958,7 @@ void GlobePlugin::updateLayers()
         }
         else
         {
-          fullExtent.combineExtentWith( &extent );
+          fullExtent.combineExtentWith( extent );
         }
       }
     }
@@ -1034,7 +1034,7 @@ void GlobePlugin::layerChanged( QgsMapLayer* mapLayer )
       QgsRectangle updateExtent = layerExtent;
       if ( mLayerExtents.contains( mapLayer->id() ) )
       {
-        updateExtent.combineExtentWith( &mLayerExtents[mapLayer->id()] );
+        updateExtent.combineExtentWith( mLayerExtents[mapLayer->id()] );
       }
       mLayerExtents[mapLayer->id()] = layerExtent;
       refreshQGISMapLayer( updateExtent );
diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp
@@ -458,7 +458,7 @@ QgsRectangle QgsInterpolationDialog::boundingBoxOfLayers()
     }
     else
     {
-      combinedLayerExtent.combineExtentWith( &currentLayerExtent );
+      combinedLayerExtent.combineExtentWith( currentLayerExtent );
     }
   }
   return combinedLayerExtent;
diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
@@ -1171,7 +1171,7 @@ ErrorList topolTest::checkOverlapWithLayer( double tolerance, QgsVectorLayer* la
       {
         QgsRectangle r = bb;
         QgsRectangle r2 = g2->boundingBox();
-        r.combineExtentWith( &r2 );
+        r.combineExtentWith( r2 );
 
         QScopedPointer<QgsGeometry> conflictGeom( g1->intersection( g2 ) );
         // could this for some reason return NULL?
diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
@@ -474,7 +474,7 @@ void QgsDelimitedTextProvider::scanFile( bool buildIndexes )
                 mNumberFeatures++;
                 if ( geom->isMultipart() ) mWkbType = type;
                 QgsRectangle bbox( geom->boundingBox() );
-                mExtent.combineExtentWith( &bbox );
+                mExtent.combineExtentWith( bbox );
               }
               if ( buildSpatialIndex )
               {
@@ -797,7 +797,7 @@ void QgsDelimitedTextProvider::rescanFile()
       else
       {
         QgsRectangle bbox( f.constGeometry()->boundingBox() );
-        mExtent.combineExtentWith( &bbox );
+        mExtent.combineExtentWith( bbox );
       }
       if ( buildSpatialIndex ) mSpatialIndex->insertFeature( f );
     }
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -1256,7 +1256,7 @@ bool QgsWmsProvider::calculateExtent()
       }
       else
       {
-        mLayerExtent.combineExtentWith( &extent );
+        mLayerExtent.combineExtentWith( extent );
       }
 
       firstLayer = false;
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -725,7 +725,7 @@ void QgsServerProjectParser::combineExtentAndCrsOfGroupChildren( QDomElement& gr
       }
       else
       {
-        combinedBBox.combineExtentWith( &bbox );
+        combinedBBox.combineExtentWith( bbox );
       }
     }
 
diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp
@@ -1707,7 +1707,7 @@ void QgsWMSProjectParser::addOWSLayers( QDomDocument &doc,
       }
       else
       {
-        combinedBBox.combineExtentWith( &BBox );
+        combinedBBox.combineExtentWith( BBox );
       }
 
       addOWSLayerStyles( currentLayer, doc, layerElem );
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2260,7 +2260,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
         }
         else
         {
-          featureBBox->combineExtentWith( &box );
+          featureBBox->combineExtentWith( box );
         }
       }
     }
@@ -2600,7 +2600,7 @@ void QgsWMSServer::applyRequestedLayerFilters( const QStringList& layerList , QH
         }
         else
         {
-          filterExtent.combineExtentWith( &layerExtent );
+          filterExtent.combineExtentWith( layerExtent );
         }
       }
       mMapRenderer->setExtent( filterExtent );

Original file line number	Diff line number	Diff line change
`@@ -3706,7 +3706,7 @@ QgsRectangle QgsDxfExport::dxfExtent() const`
`3706`	`3706`	`else`
`3707`	`3707`	`{`
`3708`	`3708`	`QgsRectangle layerExtent = layerIt->first->extent();`
`3709`		`- extent.combineExtentWith( &layerExtent );`
	`3709`	`+ extent.combineExtentWith( layerExtent );`
`3710`	`3710`	`}`
`3711`	`3711`	`}`
`3712`	`3712`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ QgsRectangle QgsCircularStringV2::calculateBoundingBox() const`
`78`	`78`	`else`
`79`	`79`	`{`
`80`	`80`	`QgsRectangle segmentBox = segmentBoundingBox( QgsPointV2( mX[i], mY[i] ), QgsPointV2( mX[i + 1], mY[i + 1] ), QgsPointV2( mX[i + 2], mY[i + 2] ) );`
`81`		`- bbox.combineExtentWith( &segmentBox );`
	`81`	`+ bbox.combineExtentWith( segmentBox );`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ QgsRectangle QgsCompoundCurveV2::calculateBoundingBox() const`
`95`	`95`	`for ( int i = 1; i < mCurves.size(); ++i )`
`96`	`96`	`{`
`97`	`97`	`QgsRectangle curveBox = mCurves.at( i )->boundingBox();`
`98`		`- bbox.combineExtentWith( &curveBox );`
	`98`	`+ bbox.combineExtentWith( curveBox );`
`99`	`99`	`}`
`100`	`100`	`return bbox;`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ QgsRectangle QgsGeometryCollectionV2::calculateBoundingBox() const`
`336`	`336`	`for ( int i = 1; i < mGeometries.size(); ++i )`
`337`	`337`	`{`
`338`	`338`	`QgsRectangle geomBox = mGeometries.at( i )->boundingBox();`
`339`		`- bbox.combineExtentWith( &geomBox );`
	`339`	`+ bbox.combineExtentWith( geomBox );`
`340`	`340`	`}`
`341`	`341`	`return bbox;`
`342`	`342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,14 +194,14 @@ bool QgsRectangle::contains( const QgsPoint &p ) const`
`194`	`194`	`ymin <= p.y() && p.y() <= ymax;`
`195`	`195`	`}`
`196`	`196`
`197`		`-void QgsRectangle::combineExtentWith( const QgsRectangle * rect )`
	`197`	`+void QgsRectangle::combineExtentWith( const QgsRectangle &rect )`
`198`	`198`	`{`
`199`	`199`
`200`		`- xmin = (( xmin < rect->xMinimum() ) ? xmin : rect->xMinimum() );`
`201`		`- xmax = (( xmax > rect->xMaximum() ) ? xmax : rect->xMaximum() );`
	`200`	`+ xmin = (( xmin < rect.xMinimum() ) ? xmin : rect.xMinimum() );`
	`201`	`+ xmax = (( xmax > rect.xMaximum() ) ? xmax : rect.xMaximum() );`
`202`	`202`
`203`		`- ymin = (( ymin < rect->yMinimum() ) ? ymin : rect->yMinimum() );`
`204`		`- ymax = (( ymax > rect->yMaximum() ) ? ymax : rect->yMaximum() );`
	`203`	`+ ymin = (( ymin < rect.yMinimum() ) ? ymin : rect.yMinimum() );`
	`204`	`+ ymax = (( ymax > rect.yMaximum() ) ? ymax : rect.yMaximum() );`
`205`	`205`
`206`	`206`	`}`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()`
`716`	`716`	`if ( !fet.constGeometry() \|\| fet.constGeometry()->isEmpty() )`
`717`	`717`	`continue;`
`718`	`718`	`r = fet.constGeometry()->boundingBox();`
`719`		`- retval.combineExtentWith( &r );`
	`719`	`+ retval.combineExtentWith( r );`
`720`	`720`	`}`
`721`	`721`	`}`
`722`	`722`	`else`
`@@ -731,7 +731,7 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()`
`731`	`731`	`if ( fet.constGeometry() )`
`732`	`732`	`{`
`733`	`733`	`r = fet.constGeometry()->boundingBox();`
`734`		`- retval.combineExtentWith( &r );`
	`734`	`+ retval.combineExtentWith( r );`
`735`	`735`	`}`
`736`	`736`	`}`
`737`	`737`	`}`
`@@ -999,7 +999,7 @@ QgsRectangle QgsVectorLayer::extent()`
`999`	`999`	`if ( mDataProvider->featureCount() != 0 )`
`1000`	`1000`	`{`
`1001`	`1001`	`QgsRectangle r = mDataProvider->extent();`
`1002`		`- rect.combineExtentWith( &r );`
	`1002`	`+ rect.combineExtentWith( r );`
`1003`	`1003`	`}`
`1004`	`1004`
`1005`	`1005`	`if ( mEditBuffer )`
`@@ -1009,7 +1009,7 @@ QgsRectangle QgsVectorLayer::extent()`
`1009`	`1009`	`if ( it->constGeometry() )`
`1010`	`1010`	`{`
`1011`	`1011`	`QgsRectangle r = it->constGeometry()->boundingBox();`
`1012`		`- rect.combineExtentWith( &r );`
	`1012`	`+ rect.combineExtentWith( r );`
`1013`	`1013`	`}`
`1014`	`1014`	`}`
`1015`	`1015`	`}`
`@@ -1025,7 +1025,7 @@ QgsRectangle QgsVectorLayer::extent()`
`1025`	`1025`	`if ( fet.constGeometry() && fet.constGeometry()->type() != QGis::UnknownGeometry )`
`1026`	`1026`	`{`
`1027`	`1027`	`QgsRectangle bb = fet.constGeometry()->boundingBox();`
`1028`		`- rect.combineExtentWith( &bb );`
	`1028`	`+ rect.combineExtentWith( bb );`
`1029`	`1029`	`}`
`1030`	`1030`	`}`
`1031`	`1031`	`}`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ void QgsRelationReferenceWidget::highlightFeature( QgsFeature f, CanvasExtent ca`
`617`	`617`	`QgsRectangle extent = mCanvas->extent();`
`618`	`618`	`if ( !extent.contains( featBBox ) )`
`619`	`619`	`{`
`620`		`- extent.combineExtentWith( &featBBox );`
	`620`	`+ extent.combineExtentWith( featBBox );`
`621`	`621`	`extent.scale( 1.1 );`
`622`	`622`	`mCanvas->setExtent( extent );`
`623`	`623`	`mCanvas->refresh();`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ void QgsLayerTreeViewDefaultActions::zoomToLayers( QgsMapCanvas* canvas, const Q`
`242`	`242`	`if ( canvas->hasCrsTransformEnabled() )`
`243`	`243`	`layerExtent = canvas->mapSettings().layerExtentToOutputExtent( layer, layerExtent );`
`244`	`244`
`245`		`- extent.combineExtentWith( &layerExtent );`
	`245`	`+ extent.combineExtentWith( layerExtent );`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`if ( extent.isNull() )`
Original file line number	Diff line number	Diff line change
`@@ -1166,7 +1166,7 @@ void QgsMapCanvas::zoomToFeatureIds( QgsVectorLayer* layer, const QgsFeatureIds&`
`1166`	`1166`	`return;`
`1167`	`1167`	`}`
`1168`	`1168`	`QgsRectangle r = mapSettings().layerExtentToOutputExtent( layer, geom->boundingBox() );`
`1169`		`- rect.combineExtentWith( &r );`
	`1169`	`+ rect.combineExtentWith( r );`
`1170`	`1170`	`featureCount++;`
`1171`	`1171`	`}`
`1172`	`1172`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ void QgsRubberBand::updateRect()`
`558`	`558`	`}`
`559`	`559`	`else`
`560`	`560`	`{`
`561`		`- r.combineExtentWith( &rect );`
	`561`	`+ r.combineExtentWith( rect );`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`	`}`