From 3f893e6fd90603c176e8c25f0b5278436fd1a0f4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 17 Dec 2014 16:21:03 +0100 Subject: QtWidgets: convert some users of QSize::transpose() to transposed() ...because transposed() is inline (and transpose() is not), and because it makes the code more readable and compact. Change-Id: I5661ee6251be638fb40c5c748aa50a89de6f7735 Reviewed-by: Thiago Macieira --- src/widgets/doc/snippets/javastyle.cpp | 4 +--- src/widgets/styles/qcommonstyle.cpp | 11 +++-------- src/widgets/styles/qfusionstyle.cpp | 4 +--- src/widgets/styles/qgtkstyle.cpp | 4 +--- src/widgets/styles/qmacstyle_mac.mm | 11 +++-------- src/widgets/styles/qstylesheetstyle.cpp | 4 +--- src/widgets/styles/qwindowsmobilestyle.cpp | 4 +--- src/widgets/styles/qwindowsstyle.cpp | 4 +--- src/widgets/styles/qwindowsvistastyle.cpp | 4 +--- src/widgets/styles/qwindowsxpstyle.cpp | 4 +--- 10 files changed, 14 insertions(+), 40 deletions(-) diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp index 37f02c7f13..84601abe3a 100644 --- a/src/widgets/doc/snippets/javastyle.cpp +++ b/src/widgets/doc/snippets/javastyle.cpp @@ -244,9 +244,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, QRect titleRect = rect; if (docker->verticalTitleBar) { QRect r = rect; - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 29df1c6387..e04e81c789 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -2021,9 +2021,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar; if (verticalTitleBar) { - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); p->save(); p->translate(r.left(), r.top() + r.width()); @@ -2898,11 +2896,8 @@ QRect QCommonStyle::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) { - QSize size = rect.size(); - size.transpose(); - rect.setSize(size); - } + if (verticalTitleBar) + rect.setSize(rect.size().transposed()); do { diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index c4f78b9998..94b6000436 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1210,9 +1210,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio if (verticalTitleBar) { QRect rect = dwOpt->rect; QRect r = rect; - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), r.top() + titleRect.left() - rect.left(), diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index f87af6cd93..144d723779 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -2902,9 +2902,7 @@ void QGtkStyle::drawControl(ControlElement element, if (verticalTitleBar) { QRect r = rect; - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 6f573ab809..c586cbb0d2 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -4367,9 +4367,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter if (verticalTitleBar) { QRect rect = dwOpt->rect; QRect r = rect; - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), @@ -5196,11 +5194,8 @@ 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) { - QSize size = srect.size(); - size.transpose(); - srect.setSize(size); - } + if (verticalTitleBar) + srect.setSize(srect.size().transposed()); do { int right = srect.right(); diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 21464ef090..282416971b 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -4049,9 +4049,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q if (!dwOpt->title.isEmpty()) { QRect r = subElementRect(SE_DockWidgetTitleBarText, opt, w); if (dwOpt->verticalTitleBar) { - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().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 4ff0248b0d..a94c62f37d 100644 --- a/src/widgets/styles/qwindowsmobilestyle.cpp +++ b/src/widgets/styles/qwindowsmobilestyle.cpp @@ -5686,9 +5686,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption QRect r = rect; if (verticalTitleBar) { - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().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 9deeb725f9..1336c04c42 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1767,9 +1767,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai QRect r = rect; if (verticalTitleBar) { - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().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 42a85e8f64..57ad1fe02b 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -1382,9 +1382,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar; if (verticalTitleBar) { - QSize s = rect.size(); - s.transpose(); - rect.setSize(s); + rect.setSize(rect.size().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 c1f7b599b3..ed5eca7318 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -2372,9 +2372,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar; if (verticalTitleBar) { - QSize s = rect.size(); - s.transpose(); - rect.setSize(s); + rect.setSize(rect.size().transposed()); p->translate(rect.left() - 1, rect.top() + rect.width()); p->rotate(-90); -- cgit v1.2.3