summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-02-26 11:00:44 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-26 11:39:40 +0100
commit5cc1a87250a45068e3ed4cf3e83611ea79b9e37a (patch)
tree8aa40ea0b0da3c05fe6e06a2aad0545f63c52bb5
parent4f4491e0b682e705cc958829a1d122298990dac7 (diff)
Remove usage of deprecated QRect::unite
Change-Id: I1920da995fde6ff2a8b2e3facddeee6e3c17b44c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
-rw-r--r--src/widgets/itemviews/qcolumnview.cpp2
-rw-r--r--src/widgets/widgets/qworkspace.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index 5dec62acc2..6758aeb337 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -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);
}
/*!
diff --git a/src/widgets/widgets/qworkspace.cpp b/src/widgets/widgets/qworkspace.cpp
index 80f0a7e44a..0031a71ccd 100644
--- a/src/widgets/widgets/qworkspace.cpp
+++ b/src/widgets/widgets/qworkspace.cpp
@@ -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);