1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWindows*Style: remove use of obsolete QStyleOption*V<N>

Browse Source 
They are obsolete since Qt 5.0.

Change-Id: I59f8b30ec877c5124922ab12ef38fbe33a1ae6b8
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
This commit is contained in:
Marc Mutz 2015-11-02 16:42:21 +01:00
parent 01284f3886
commit c8c39ecc37
5 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/styles/qwindowscestyle.cpp
View File

@ -1536,7 +1536,7 @@ void QWindowsCEStyle::drawComplexControl(ComplexControl control, const QStyleOpt
QRect textRect = subControlRect(CC_GroupBox, &groupBoxFont, SC_GroupBoxLabel, widget); QRect textRect = subControlRect(CC_GroupBox, &groupBoxFont, SC_GroupBoxLabel, widget);
QRect checkBoxRect = subControlRect(CC_GroupBox, option, SC_GroupBoxCheckBox, widget); QRect checkBoxRect = subControlRect(CC_GroupBox, option, SC_GroupBoxCheckBox, widget);
if (groupBox->subControls & QStyle::SC_GroupBoxFrame) { if (groupBox->subControls & QStyle::SC_GroupBoxFrame) {
QStyleOptionFrameV2 frame; QStyleOptionFrame frame;
frame.QStyleOption::operator=(*groupBox); frame.QStyleOption::operator=(*groupBox);
frame.features = groupBox->features; frame.features = groupBox->features;
frame.lineWidth = groupBox->lineWidth; frame.lineWidth = groupBox->lineWidth;
@ -2002,7 +2002,7 @@ QRect QWindowsCEStyle::subControlRect(ComplexControl control, const QStyleOption
} }
int frameWidth = 0; int frameWidth = 0;
if ((groupBox->features & QStyleOptionFrameV2::Flat) == 0) if ((groupBox->features & QStyleOptionFrame::Flat) == 0)
frameWidth = pixelMetric(PM_DefaultFrameWidth, groupBox, widget); frameWidth = pixelMetric(PM_DefaultFrameWidth, groupBox, widget);
rect = frameRect.adjusted(frameWidth, frameWidth + topHeight, -frameWidth, -frameWidth - noLabelMargin); rect = frameRect.adjusted(frameWidth, frameWidth + topHeight, -frameWidth, -frameWidth - noLabelMargin);
break; break;
@ -2013,7 +2013,7 @@ QRect QWindowsCEStyle::subControlRect(ComplexControl control, const QStyleOption
QFontMetrics fontMetrics = groupBox->fontMetrics; QFontMetrics fontMetrics = groupBox->fontMetrics;
int h = fontMetrics.height(); int h = fontMetrics.height();
int tw = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + QLatin1Char(' ')).width(); int tw = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + QLatin1Char(' ')).width();
int marg = (groupBox->features & QStyleOptionFrameV2::Flat) ? 0 : 8; const int marg = (groupBox->features & QStyleOptionFrame::Flat) ? 0 : 8;
rect = groupBox->rect.adjusted(marg, 0, -marg, 0); rect = groupBox->rect.adjusted(marg, 0, -marg, 0);
rect.setHeight(h); rect.setHeight(h);

18
src/widgets/styles/qwindowsmobilestyle.cpp
View File

@ -4682,8 +4682,8 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp
#ifndef QT_NO_PROGRESSBAR #ifndef QT_NO_PROGRESSBAR
case PE_IndicatorProgressChunk: { case PE_IndicatorProgressChunk: {
bool vertical = false; bool vertical = false;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(option))
vertical = (pb2->orientation == Qt::Vertical); vertical = pb->orientation == Qt::Vertical;
if (!vertical) { if (!vertical) {
painter->fillRect(option->rect.x(), option->rect.y()+2, option->rect.width(), option->rect.height()-4, painter->fillRect(option->rect.x(), option->rect.y()+2, option->rect.width(), option->rect.height()-4,
option->palette.brush(QPalette::Highlight)); option->palette.brush(QPalette::Highlight));
@ -4806,8 +4806,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp
case PE_FrameGroupBox: case PE_FrameGroupBox:
if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option)) { if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
const QStyleOptionFrameV2 *frame2 = qstyleoption_cast<const QStyleOptionFrameV2 *>(option); if (!(frame->features & QStyleOptionFrame::Flat)) {
if (frame2 && !(frame2->features & QStyleOptionFrameV2::Flat)) {
QPen oldPen = painter->pen(); QPen oldPen = painter->pen();
QRect r = frame->rect; QRect r = frame->rect;
painter->setPen(frame->palette.shadow().color()); painter->setPen(frame->palette.shadow().color());
@ -5678,9 +5677,8 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption
#ifndef QT_NO_DOCKWIDGET #ifndef QT_NO_DOCKWIDGET
case CE_DockWidgetTitle: case CE_DockWidgetTitle:
if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget *>(option)) { if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget *>(option)) {
const QStyleOptionDockWidgetV2 *v2
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(option); const bool verticalTitleBar = dwOpt->verticalTitleBar;
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
QRect rect = dwOpt->rect; QRect rect = dwOpt->rect;
QRect r = rect; QRect r = rect;
@ -6168,7 +6166,7 @@ void QWindowsMobileStyle::drawComplexControl(ComplexControl control, const QStyl
QRect textRect = proxy()->subControlRect(CC_GroupBox, &groupBoxFont, SC_GroupBoxLabel, widget); QRect textRect = proxy()->subControlRect(CC_GroupBox, &groupBoxFont, SC_GroupBoxLabel, widget);
QRect checkBoxRect = proxy()->subControlRect(CC_GroupBox, option, SC_GroupBoxCheckBox, widget).adjusted(0,0,0,0); QRect checkBoxRect = proxy()->subControlRect(CC_GroupBox, option, SC_GroupBoxCheckBox, widget).adjusted(0,0,0,0);
if (groupBox->subControls & QStyle::SC_GroupBoxFrame) { if (groupBox->subControls & QStyle::SC_GroupBoxFrame) {
QStyleOptionFrameV2 frame; QStyleOptionFrame frame;
frame.QStyleOption::operator=(*groupBox); frame.QStyleOption::operator=(*groupBox);
frame.features = groupBox->features; frame.features = groupBox->features;
frame.lineWidth = groupBox->lineWidth; frame.lineWidth = groupBox->lineWidth;
@ -6800,8 +6798,8 @@ QRect QWindowsMobileStyle::subControlRect(ComplexControl control, const QStyleOp
QFontMetrics fontMetrics = groupBox->fontMetrics; QFontMetrics fontMetrics = groupBox->fontMetrics;
int h = fontMetrics.height(); int h = fontMetrics.height();
int textWidth = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + QLatin1Char(' ')).width(); int textWidth = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + QLatin1Char(' ')).width();
int margX = (groupBox->features & QStyleOptionFrameV2::Flat) ? 0 : 2; const int margX = (groupBox->features & QStyleOptionFrame::Flat) ? 0 : 2;
int margY = (groupBox->features & QStyleOptionFrameV2::Flat) ? 0 : 2; const int margY = (groupBox->features & QStyleOptionFrame::Flat) ? 0 : 2;
rect = groupBox->rect.adjusted(margX, margY, -margX, 0); rect = groupBox->rect.adjusted(margX, margY, -margX, 0);
if (groupBox->text.size()) if (groupBox->text.size())
rect.setHeight(h); rect.setHeight(h);

28
src/widgets/styles/qwindowsstyle.cpp
View File

@ -1024,9 +1024,9 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
case PE_IndicatorProgressChunk: case PE_IndicatorProgressChunk:
{ {
bool vertical = false, inverted = false; bool vertical = false, inverted = false;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(opt)) { if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
vertical = (pb2->orientation == Qt::Vertical); vertical = pb->orientation == Qt::Vertical;
inverted = pb2->invertedAppearance; inverted = pb->invertedAppearance;
} }
int space = 2; int space = 2;
@ -1689,15 +1689,9 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
if (!rect.isValid()) if (!rect.isValid())
return; return;
bool vertical = false; const bool vertical = pb->orientation == Qt::Vertical;
bool inverted = false; const bool inverted = pb->invertedAppearance;
// Get extra style options if version 2
const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(opt);
if (pb2) {
vertical = (pb2->orientation == Qt::Vertical);
inverted = pb2->invertedAppearance;
}
QMatrix m; QMatrix m;
if (vertical) { if (vertical) {
rect = QRect(rect.y(), rect.x(), rect.height(), rect.width()); // flip width and height rect = QRect(rect.y(), rect.x(), rect.height(), rect.width()); // flip width and height
@ -1716,7 +1710,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
Q_D(const QWindowsStyle); Q_D(const QWindowsStyle);
if (pb->minimum == 0 && pb->maximum == 0) { if (pb->minimum == 0 && pb->maximum == 0) {
const int unit_width = proxy()->pixelMetric(PM_ProgressBarChunkWidth, pb, widget); const int unit_width = proxy()->pixelMetric(PM_ProgressBarChunkWidth, pb, widget);
QStyleOptionProgressBarV2 pbBits = *pb; QStyleOptionProgressBar pbBits = *pb;
Q_ASSERT(unit_width >0); Q_ASSERT(unit_width >0);
pbBits.rect = rect; pbBits.rect = rect;
@ -1773,9 +1767,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget *>(opt)) { if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast<const QStyleOptionDockWidget *>(opt)) {
Q_D(const QWindowsStyle); Q_D(const QWindowsStyle);
const QStyleOptionDockWidgetV2 *v2 const bool verticalTitleBar = dwOpt->verticalTitleBar;
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt);
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
QRect rect = dwOpt->rect; QRect rect = dwOpt->rect;
QRect r = rect; QRect r = rect;
@ -1874,9 +1866,9 @@ QRect QWindowsStyle::subElementRect(SubElement sr, const QStyleOption *opt, cons
break; break;
case SE_DockWidgetTitleBarText: { case SE_DockWidgetTitleBarText: {
r = QCommonStyle::subElementRect(sr, opt, w); r = QCommonStyle::subElementRect(sr, opt, w);
const QStyleOptionDockWidgetV2 *v2 const QStyleOptionDockWidget *dwOpt
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(opt); = qstyleoption_cast<const QStyleOptionDockWidget*>(opt);
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar; const bool verticalTitleBar = dwOpt && dwOpt->verticalTitleBar;
int m = proxy()->pixelMetric(PM_DockWidgetTitleMargin, opt, w); int m = proxy()->pixelMetric(PM_DockWidgetTitleMargin, opt, w);
if (verticalTitleBar) { if (verticalTitleBar) {
r.adjust(0, 0, 0, -m); r.adjust(0, 0, 0, -m);

12
src/widgets/styles/qwindowsvistastyle.cpp
View File

@ -1007,12 +1007,8 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
if (const QStyleOptionProgressBar *bar if (const QStyleOptionProgressBar *bar
= qstyleoption_cast<const QStyleOptionProgressBar *>(option)) { = qstyleoption_cast<const QStyleOptionProgressBar *>(option)) {
bool isIndeterminate = (bar->minimum == 0 && bar->maximum == 0); bool isIndeterminate = (bar->minimum == 0 && bar->maximum == 0);
bool vertical = false; const bool vertical = bar->orientation == Qt::Vertical;
bool inverted = false; const bool inverted = bar->invertedAppearance;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
vertical = (pb2->orientation == Qt::Vertical);
inverted = pb2->invertedAppearance;
}
if (isIndeterminate || (bar->progress > 0 && (bar->progress < bar->maximum) && d->transitionsEnabled())) { if (isIndeterminate || (bar->progress > 0 && (bar->progress < bar->maximum) && d->transitionsEnabled())) {
if (!d->animation(styleObject(option))) if (!d->animation(styleObject(option)))
@ -1378,9 +1374,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
break; //otherwise fall through break; //otherwise fall through
} }
const QStyleOptionDockWidgetV2 *v2 const bool verticalTitleBar = dwOpt->verticalTitleBar;
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(dwOpt);
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
if (verticalTitleBar) { if (verticalTitleBar) {
rect.setSize(rect.size().transposed()); rect.setSize(rect.size().transposed());

24
src/widgets/styles/qwindowsxpstyle.cpp
View File

@ -1690,7 +1690,7 @@ case PE_Frame:
// This should work, but currently there's an error in the ::drawBackgroundDirectly() // This should work, but currently there's an error in the ::drawBackgroundDirectly()
// code, when using the HDC directly.. // code, when using the HDC directly..
if (useGradient) { if (useGradient) {
QStyleOptionTabWidgetFrameV2 frameOpt = *tab; QStyleOptionTabWidgetFrame frameOpt = *tab;
frameOpt.rect = widget->rect(); frameOpt.rect = widget->rect();
QRect contentsRect = subElementRect(SE_TabWidgetTabContents, &frameOpt, widget); QRect contentsRect = subElementRect(SE_TabWidgetTabContents, &frameOpt, widget);
QRegion reg = option->rect; QRegion reg = option->rect;
@ -1810,8 +1810,7 @@ case PE_Frame:
else else
stateId = GBS_NORMAL; stateId = GBS_NORMAL;
if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option)) { if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
const QStyleOptionFrameV2 *frame2 = qstyleoption_cast<const QStyleOptionFrameV2 *>(option); if (frame->features & QStyleOptionFrame::Flat) {
if (frame2->features & QStyleOptionFrameV2::Flat) {
// Windows XP does not have a theme part for a flat GroupBox, paint it with the windows style // Windows XP does not have a theme part for a flat GroupBox, paint it with the windows style
QRect fr = frame->rect; QRect fr = frame->rect;
QPoint p1(fr.x(), fr.y() + 1); QPoint p1(fr.x(), fr.y() + 1);
@ -1826,10 +1825,9 @@ case PE_Frame:
{ {
Qt::Orientation orient = Qt::Horizontal; Qt::Orientation orient = Qt::Horizontal;
bool inverted = false; bool inverted = false;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) { if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(option)) {
orient = pb2->orientation; orient = pb->orientation;
if (pb2->invertedAppearance) inverted = pb->invertedAppearance;
inverted = true;
} }
if (orient == Qt::Horizontal) { if (orient == Qt::Horizontal) {
partId = PP_CHUNK; partId = PP_CHUNK;
@ -2207,8 +2205,8 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
case CE_ProgressBarGroove: case CE_ProgressBarGroove:
{ {
Qt::Orientation orient = Qt::Horizontal; Qt::Orientation orient = Qt::Horizontal;
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(option))
orient = pb2->orientation; orient = pb->orientation;
partId = (orient == Qt::Horizontal) ? PP_BAR : PP_BARVERT; partId = (orient == Qt::Horizontal) ? PP_BAR : PP_BARVERT;
themeNumber = QWindowsXPStylePrivate::ProgressTheme; themeNumber = QWindowsXPStylePrivate::ProgressTheme;
stateId = 1; stateId = 1;
@ -2378,9 +2376,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op
bool isFloating = widget && widget->isWindow(); bool isFloating = widget && widget->isWindow();
bool isActive = dwOpt->state & State_Active; bool isActive = dwOpt->state & State_Active;
const QStyleOptionDockWidgetV2 *v2 const bool verticalTitleBar = dwOpt->verticalTitleBar;
= qstyleoption_cast<const QStyleOptionDockWidgetV2*>(dwOpt);
bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar;
if (verticalTitleBar) { if (verticalTitleBar) {
rect.setSize(rect.size().transposed()); rect.setSize(rect.size().transposed());
@ -3316,8 +3312,8 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo
static inline Qt::Orientation progressBarOrientation(const QStyleOption *option = 0) static inline Qt::Orientation progressBarOrientation(const QStyleOption *option = 0)
{ {
if (const QStyleOptionProgressBarV2 *pb2 = qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(option))
return pb2->orientation; return pb->orientation;
return Qt::Horizontal; return Qt::Horizontal;
} }