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 <thiago.macieira@intel.com>
This commit is contained in:
parent
ceb753626f
commit
3f893e6fd9
@ -244,9 +244,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option,
|
|||||||
QRect titleRect = rect;
|
QRect titleRect = rect;
|
||||||
if (docker->verticalTitleBar) {
|
if (docker->verticalTitleBar) {
|
||||||
QRect r = rect;
|
QRect r = rect;
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
|
|
||||||
titleRect = QRect(r.left() + rect.bottom()
|
titleRect = QRect(r.left() + rect.bottom()
|
||||||
- titleRect.bottom(),
|
- titleRect.bottom(),
|
||||||
|
@ -2021,9 +2021,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
|
|||||||
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
|
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
|
||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
|
|
||||||
p->save();
|
p->save();
|
||||||
p->translate(r.left(), r.top() + r.width());
|
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
|
// If this is a vertical titlebar, we transpose and work as if it was
|
||||||
// horizontal, then transpose again.
|
// horizontal, then transpose again.
|
||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar)
|
||||||
QSize size = rect.size();
|
rect.setSize(rect.size().transposed());
|
||||||
size.transpose();
|
|
||||||
rect.setSize(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
|
||||||
|
@ -1210,9 +1210,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
|
|||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QRect rect = dwOpt->rect;
|
QRect rect = dwOpt->rect;
|
||||||
QRect r = rect;
|
QRect r = rect;
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
titleRect = QRect(r.left() + rect.bottom()
|
titleRect = QRect(r.left() + rect.bottom()
|
||||||
- titleRect.bottom(),
|
- titleRect.bottom(),
|
||||||
r.top() + titleRect.left() - rect.left(),
|
r.top() + titleRect.left() - rect.left(),
|
||||||
|
@ -2902,9 +2902,7 @@ void QGtkStyle::drawControl(ControlElement element,
|
|||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QRect r = rect;
|
QRect r = rect;
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
|
|
||||||
titleRect = QRect(r.left() + rect.bottom()
|
titleRect = QRect(r.left() + rect.bottom()
|
||||||
- titleRect.bottom(),
|
- titleRect.bottom(),
|
||||||
|
@ -4367,9 +4367,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
|
|||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QRect rect = dwOpt->rect;
|
QRect rect = dwOpt->rect;
|
||||||
QRect r = rect;
|
QRect r = rect;
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
|
|
||||||
titleRect = QRect(r.left() + rect.bottom()
|
titleRect = QRect(r.left() + rect.bottom()
|
||||||
- titleRect.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
|
// If this is a vertical titlebar, we transpose and work as if it was
|
||||||
// horizontal, then transpose again.
|
// horizontal, then transpose again.
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar)
|
||||||
QSize size = srect.size();
|
srect.setSize(srect.size().transposed());
|
||||||
size.transpose();
|
|
||||||
srect.setSize(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
int right = srect.right();
|
int right = srect.right();
|
||||||
|
@ -4049,9 +4049,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
|
|||||||
if (!dwOpt->title.isEmpty()) {
|
if (!dwOpt->title.isEmpty()) {
|
||||||
QRect r = subElementRect(SE_DockWidgetTitleBarText, opt, w);
|
QRect r = subElementRect(SE_DockWidgetTitleBarText, opt, w);
|
||||||
if (dwOpt->verticalTitleBar) {
|
if (dwOpt->verticalTitleBar) {
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
p->save();
|
p->save();
|
||||||
p->translate(r.left(), r.top() + r.width());
|
p->translate(r.left(), r.top() + r.width());
|
||||||
p->rotate(-90);
|
p->rotate(-90);
|
||||||
|
@ -5686,9 +5686,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption
|
|||||||
QRect r = rect;
|
QRect r = rect;
|
||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
|
|
||||||
painter->save();
|
painter->save();
|
||||||
painter->translate(r.left(), r.top() + r.width());
|
painter->translate(r.left(), r.top() + r.width());
|
||||||
|
@ -1767,9 +1767,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
|
|||||||
QRect r = rect;
|
QRect r = rect;
|
||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QSize s = r.size();
|
r.setSize(r.size().transposed());
|
||||||
s.transpose();
|
|
||||||
r.setSize(s);
|
|
||||||
|
|
||||||
p->save();
|
p->save();
|
||||||
p->translate(r.left(), r.top() + r.width());
|
p->translate(r.left(), r.top() + r.width());
|
||||||
|
@ -1382,9 +1382,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
|
|||||||
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
|
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
|
||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QSize s = rect.size();
|
rect.setSize(rect.size().transposed());
|
||||||
s.transpose();
|
|
||||||
rect.setSize(s);
|
|
||||||
|
|
||||||
painter->translate(rect.left() - 1, rect.top() + rect.width());
|
painter->translate(rect.left() - 1, rect.top() + rect.width());
|
||||||
painter->rotate(-90);
|
painter->rotate(-90);
|
||||||
|
@ -2372,9 +2372,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
|
|||||||
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
|
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
|
||||||
|
|
||||||
if (verticalTitleBar) {
|
if (verticalTitleBar) {
|
||||||
QSize s = rect.size();
|
rect.setSize(rect.size().transposed());
|
||||||
s.transpose();
|
|
||||||
rect.setSize(s);
|
|
||||||
|
|
||||||
p->translate(rect.left() - 1, rect.top() + rect.width());
|
p->translate(rect.left() - 1, rect.top() + rect.width());
|
||||||
p->rotate(-90);
|
p->rotate(-90);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user