Skip to content
Permalink
Browse files

Use QRect::united instead of unite

The unite() method has been deprecated in favor of united(). In Qt 4,
united() just calls unite(); in Qt 5, it is completely removed.
  • Loading branch information
simonsonc committed May 3, 2014
1 parent 0c52039 commit 1dc8dd5d58e0bd7cd6f8ca7bb349d6a90d283663
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/core/composer/qgscomposerarrow.cpp
@@ -113,7 +113,7 @@ void QgsComposerArrow::setSceneRect( const QRectF& rectangle )
double margin = computeMarkerMargin();

// Ensure the rectangle is at least as large as needed to include the markers
QRectF rect = rectangle.unite( QRectF( rectangle.x(), rectangle.y(), 2. * margin, 2. * margin ) );
QRectF rect = rectangle.united( QRectF( rectangle.x(), rectangle.y(), 2. * margin, 2. * margin ) );

// Compute new start and stop positions
double x[2] = {rect.x(), rect.x() + rect.width()};

0 comments on commit 1dc8dd5

Please sign in to comment.
You can’t perform that action at this time.