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

QStyleSheetStyle: remove references to QStyleOptionFrameV<n>

Browse Source 
They're gone since Qt 5.0 and only exist as typedefs for QStyleOptionFrame.

Change-Id: Ic165b524e8d86a0dd5355de338e87a33cd7429c7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Marc Mutz 2014-09-22 20:41:43 +02:00
parent fbc4bce710
commit d488153fc2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -1827,7 +1827,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption
extraClass |= PseudoClass_Frameless; extraClass |= PseudoClass_Frameless;
#endif // QT_NO_SPINBOX #endif // QT_NO_SPINBOX
} else if (const QStyleOptionGroupBox *gb = qstyleoption_cast<const QStyleOptionGroupBox *>(opt)) { } else if (const QStyleOptionGroupBox *gb = qstyleoption_cast<const QStyleOptionGroupBox *>(opt)) {
if (gb->features & QStyleOptionFrameV2::Flat) if (gb->features & QStyleOptionFrame::Flat)
extraClass |= PseudoClass_Flat; extraClass |= PseudoClass_Flat;
if (gb->lineWidth == 0) if (gb->lineWidth == 0)
extraClass |= PseudoClass_Frameless; extraClass |= PseudoClass_Frameless;
@ -1934,10 +1934,8 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption
} else if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { } else if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) {
if (frm->lineWidth == 0) if (frm->lineWidth == 0)
extraClass |= PseudoClass_Frameless; extraClass |= PseudoClass_Frameless;
if (const QStyleOptionFrameV2 *frame2 = qstyleoption_cast<const QStyleOptionFrameV2 *>(opt)) { if (frm->features & QStyleOptionFrame::Flat)
if (frame2->features & QStyleOptionFrameV2::Flat) extraClass |= PseudoClass_Flat;
extraClass |= PseudoClass_Flat;
}
} }
#ifndef QT_NO_TOOLBAR #ifndef QT_NO_TOOLBAR
else if (const QStyleOptionToolBar *tb = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) { else if (const QStyleOptionToolBar *tb = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
@ -2994,7 +2992,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
} }
frameRect = subControlRect(CC_GroupBox, opt, SC_GroupBoxFrame, w); frameRect = subControlRect(CC_GroupBox, opt, SC_GroupBoxFrame, w);
QStyleOptionFrameV2 frame; QStyleOptionFrame frame;
frame.QStyleOption::operator=(*gb); frame.QStyleOption::operator=(*gb);
frame.features = gb->features; frame.features = gb->features;
frame.lineWidth = gb->lineWidth; frame.lineWidth = gb->lineWidth;
@ -4089,7 +4087,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
case CE_ShapedFrame: case CE_ShapedFrame:
if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) {
if (rule.hasNativeBorder()) { if (rule.hasNativeBorder()) {
QStyleOptionFrameV3 frmOpt(*frm); QStyleOptionFrame frmOpt(*frm);
rule.configurePalette(&frmOpt.palette, QPalette::Text, QPalette::Base); rule.configurePalette(&frmOpt.palette, QPalette::Text, QPalette::Base);
frmOpt.rect = rule.borderRect(frmOpt.rect); frmOpt.rect = rule.borderRect(frmOpt.rect);
baseStyle()->drawControl(ce, &frmOpt, p, w); baseStyle()->drawControl(ce, &frmOpt, p, w);
@ -4224,10 +4222,8 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
case PE_Frame: case PE_Frame:
if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { if (const QStyleOptionFrame *frm = qstyleoption_cast<const QStyleOptionFrame *>(opt)) {
if (rule.hasNativeBorder()) { if (rule.hasNativeBorder()) {
QStyleOptionFrameV2 frmOpt(*frm); QStyleOptionFrame frmOpt(*frm);
rule.configurePalette(&frmOpt.palette, QPalette::Text, QPalette::Base); rule.configurePalette(&frmOpt.palette, QPalette::Text, QPalette::Base);
if (!qstyleoption_cast<const QStyleOptionFrameV3 *>(opt)) //if it comes from CE_ShapedFrame, the margins are already sustracted
frmOpt.rect = rule.borderRect(frmOpt.rect);
baseStyle()->drawPrimitive(pe, &frmOpt, p, w); baseStyle()->drawPrimitive(pe, &frmOpt, p, w);
} else { } else {
rule.drawBorder(p, rule.borderRect(opt->rect)); rule.drawBorder(p, rule.borderRect(opt->rect));