From: Sergio Martins <iamsergio@gmail.com>
Date: Thu, 8 Mar 2012 20:41:12 +0000 (+0000)
Subject: Use QRect::united(), QRect::unite() is deprecated.
X-Git-Tag: qt-v5.0.0-alpha1~310
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62dfed9a7f2be68de2e12c6de370a3a68b1b3501;p=profile%2Fivi%2Fqtbase.git

Use QRect::united(), QRect::unite() is deprecated.

Change-Id: Ia7aac74596c2f251c96fecf157d2aa4a935cf602
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---

diff --git a/examples/draganddrop/puzzle/puzzlewidget.cpp b/examples/draganddrop/puzzle/puzzlewidget.cpp
index 1c5b0cc..2e39f84 100644
--- a/examples/draganddrop/puzzle/puzzlewidget.cpp
+++ b/examples/draganddrop/puzzle/puzzlewidget.cpp
@@ -78,7 +78,7 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
 
 void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
 {
-    QRect updateRect = highlightedRect.unite(targetSquare(event->pos()));
+    QRect updateRect = highlightedRect.united(targetSquare(event->pos()));
 
     if (event->mimeData()->hasFormat("image/x-puzzle-piece")
         && findPiece(targetSquare(event->pos())) == -1) {
diff --git a/examples/itemviews/puzzle/puzzlewidget.cpp b/examples/itemviews/puzzle/puzzlewidget.cpp
index a622050..96d8c60 100644
--- a/examples/itemviews/puzzle/puzzlewidget.cpp
+++ b/examples/itemviews/puzzle/puzzlewidget.cpp
@@ -78,7 +78,7 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
 
 void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
 {
-    QRect updateRect = highlightedRect.unite(targetSquare(event->pos()));
+    QRect updateRect = highlightedRect.united(targetSquare(event->pos()));
 
     if (event->mimeData()->hasFormat("image/x-puzzle-piece")
         && findPiece(targetSquare(event->pos())) == -1) {