Skip to content

Commit

Permalink
Use QRect::united instead of unite
Browse files Browse the repository at this point in the history
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 1dc8dd5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerarrow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()};
Expand Down

0 comments on commit 1dc8dd5

Please sign in to comment.