From 26dca142a75e71baad26583cd467d07e3b116e59 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 3 Nov 2015 21:44:33 +0100 Subject: QtWidgets: use new QRect::transposed() Change-Id: Idfed0ae6b80e301fd32206b2e6d68054460b76de Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/widgets/doc/snippets/javastyle.cpp | 3 +-- src/widgets/styles/qcommonstyle.cpp | 4 ++-- src/widgets/styles/qfusionstyle.cpp | 3 +-- src/widgets/styles/qmacstyle_mac.mm | 5 ++--- src/widgets/styles/qstylesheetstyle.cpp | 2 +- src/widgets/styles/qwindowsmobilestyle.cpp | 2 +- src/widgets/styles/qwindowsstyle.cpp | 2 +- src/widgets/styles/qwindowsvistastyle.cpp | 2 +- src/widgets/styles/qwindowsxpstyle.cpp | 2 +- 9 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp index 4997e25ada..cf62c2155e 100644 --- a/src/widgets/doc/snippets/javastyle.cpp +++ b/src/widgets/doc/snippets/javastyle.cpp @@ -242,8 +242,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, QRect rect = docker->rect; QRect titleRect = rect; if (docker->verticalTitleBar) { - QRect r = rect; - r.setSize(r.size().transposed()); + QRect r = rect.transposed(); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index c28a70e3f9..c26da68ac9 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -2036,7 +2036,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, const bool verticalTitleBar = dwOpt->verticalTitleBar; if (verticalTitleBar) { - r.setSize(r.size().transposed()); + r = r.transposed(); p->save(); p->translate(r.left(), r.top() + r.width()); @@ -2924,7 +2924,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, // horizontal, then transpose again. if (verticalTitleBar) - rect.setSize(rect.size().transposed()); + rect = rect.transposed(); do { diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 842641dd3a..1cd91a26ee 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1225,8 +1225,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio QRect titleRect = subElementRect(SE_DockWidgetTitleBarText, option, widget); if (verticalTitleBar) { QRect rect = dwOpt->rect; - QRect r = rect; - r.setSize(r.size().transposed()); + QRect r = rect.transposed(); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), r.top() + titleRect.left() - rect.left(), diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 74554f6d3d..3490d09fdf 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -4342,8 +4342,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter QRect titleRect = subElementRect(SE_DockWidgetTitleBarText, opt, w); if (verticalTitleBar) { QRect rect = dwOpt->rect; - QRect r = rect; - r.setSize(r.size().transposed()); + QRect r = rect.transposed(); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), @@ -5167,7 +5166,7 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt, // If this is a vertical titlebar, we transpose and work as if it was // horizontal, then transpose again. if (verticalTitleBar) - srect.setSize(srect.size().transposed()); + srect = srect.transposed(); do { int right = srect.right(); diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 55b91714cf..053820e459 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -4130,7 +4130,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q if (!dwOpt->title.isEmpty()) { QRect r = subElementRect(SE_DockWidgetTitleBarText, opt, w); if (dwOpt->verticalTitleBar) { - r.setSize(r.size().transposed()); + r = r.transposed(); p->save(); p->translate(r.left(), r.top() + r.width()); p->rotate(-90); diff --git a/src/widgets/styles/qwindowsmobilestyle.cpp b/src/widgets/styles/qwindowsmobilestyle.cpp index 93da8d42f0..45323d1d15 100644 --- a/src/widgets/styles/qwindowsmobilestyle.cpp +++ b/src/widgets/styles/qwindowsmobilestyle.cpp @@ -5690,7 +5690,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption QRect r = rect; if (verticalTitleBar) { - r.setSize(r.size().transposed()); + r = r.transposed(); painter->save(); painter->translate(r.left(), r.top() + r.width()); diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 34b281a36f..d8af8c5de8 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1779,7 +1779,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai QRect r = rect; if (verticalTitleBar) { - r.setSize(r.size().transposed()); + r = r.transposed(); p->save(); p->translate(r.left(), r.top() + r.width()); diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index c8ecc3f192..a48417677a 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -1383,7 +1383,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption const bool verticalTitleBar = dwOpt->verticalTitleBar; if (verticalTitleBar) { - rect.setSize(rect.size().transposed()); + rect = rect.transposed(); painter->translate(rect.left() - 1, rect.top() + rect.width()); painter->rotate(-90); diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index fecfb02782..cda7dff509 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -2383,7 +2383,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op const bool verticalTitleBar = dwOpt->verticalTitleBar; if (verticalTitleBar) { - rect.setSize(rect.size().transposed()); + rect = rect.transposed(); p->translate(rect.left() - 1, rect.top() + rect.width()); p->rotate(-90); -- cgit v1.2.3