Remove usage of deprecated QRect::unite
authorOlivier Goffart <ogoffart@woboq.com>
Sun, 26 Feb 2012 10:00:44 +0000 (11:00 +0100)
committerQt by Nokia <qt-info@nokia.com>
Sun, 26 Feb 2012 10:39:40 +0000 (11:39 +0100)
Change-Id: I1920da995fde6ff2a8b2e3facddeee6e3c17b44c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
src/widgets/itemviews/qcolumnview.cpp
src/widgets/widgets/qworkspace.cpp

index 5dec62a..6758aeb 100644 (file)
@@ -481,7 +481,7 @@ QRegion QColumnView::visualRegionForSelection(const QItemSelection &selection) c
 
     QRegion firstRegion = visualRect(firstIdx);
     QRegion lastRegion = visualRect(lastIdx);
-    return firstRegion.unite(lastRegion);
+    return firstRegion.united(lastRegion);
 }
 
 /*!
index 80f0a7e..0031a71 100644 (file)
@@ -3204,7 +3204,7 @@ QRect QWorkspacePrivate::updateWorkspace()
             QWorkspaceChild *child = *it;
             ++it;
             if (!child->isHidden())
-                r = r.unite(child->geometry());
+                r = r.united(child->geometry());
         }
         vbar->blockSignals(true);
         hbar->blockSignals(true);