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

QStyleOption: avoid code duplication

Browse Source 
Use delegate constructors to avoid code duplication

Change-Id: I5c7d3764966ec07d1e3d175ccb075c64408d2338
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Christian Ehrlicher 2020-12-23 13:44:47 +01:00
parent c80d6473fb
commit f3747c21d3
1 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/widgets/styles/qstyleoption.cpp
View File

@ -377,9 +377,8 @@ QStyleOption &QStyleOption::operator=(const QStyleOption &other)
*/
QStyleOptionFocusRect::QStyleOptionFocusRect()
: QStyleOption(Version, SO_FocusRect)
: QStyleOptionFocusRect(Version)
{
state |= QStyle::State_KeyboardFocusChange; // assume we had one, will be corrected in initFrom()
}
/*!
@ -477,8 +476,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
*/
QStyleOptionFrame::QStyleOptionFrame()
: QStyleOption(Version, SO_Frame), lineWidth(0), midLineWidth(0),
features(None), frameShape(QFrame::NoFrame)
: QStyleOptionFrame(Version)
{
}
@ -690,8 +688,7 @@ QStyleOptionFrame::QStyleOptionFrame(int version)
variables to their default values.
*/
QStyleOptionGroupBox::QStyleOptionGroupBox()
: QStyleOptionComplex(Version, Type), features(QStyleOptionFrame::None),
textAlignment(Qt::AlignLeft), lineWidth(0), midLineWidth(0)
: QStyleOptionGroupBox(Version)
{
}
@ -948,7 +945,7 @@ QStyleOptionHeader::QStyleOptionHeader(int version)
*/
QStyleOptionButton::QStyleOptionButton()
: QStyleOption(QStyleOptionButton::Version, SO_Button), features(None)
: QStyleOptionButton(QStyleOptionButton::Version)
{
}
@ -1072,8 +1069,7 @@ QStyleOptionButton::QStyleOptionButton(int version)
*/
QStyleOptionToolBar::QStyleOptionToolBar()
: QStyleOption(Version, SO_ToolBar), positionOfLine(OnlyOne), positionWithinLine(OnlyOne),
toolBarArea(Qt::TopToolBarArea), features(None), lineWidth(0), midLineWidth(0)
: QStyleOptionToolBar(Version)
{
}
@ -1257,13 +1253,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
*/
QStyleOptionTab::QStyleOptionTab()
: QStyleOption(QStyleOptionTab::Version, SO_Tab),
shape(QTabBar::RoundedNorth),
row(0),
position(Beginning),
selectedPosition(NotAdjacent), cornerWidgets(QStyleOptionTab::NoCornerWidgets),
documentMode(false),
features(QStyleOptionTab::None)
: QStyleOptionTab(QStyleOptionTab::Version)
{
}
@ -1500,9 +1490,7 @@ QStyleOptionTab::QStyleOptionTab(int version)
*/
QStyleOptionProgressBar::QStyleOptionProgressBar()
: QStyleOption(QStyleOptionProgressBar::Version, SO_ProgressBar),
minimum(0), maximum(0), progress(0), textAlignment(Qt::AlignLeft), textVisible(false),
invertedAppearance(false), bottomToTop(false)
: QStyleOptionProgressBar(QStyleOptionProgressBar::Version)
{
}
@ -1662,9 +1650,7 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version)
*/
QStyleOptionMenuItem::QStyleOptionMenuItem()
: QStyleOption(QStyleOptionMenuItem::Version, SO_MenuItem), menuItemType(Normal),
checkType(NotCheckable), checked(false), menuHasCheckableItems(true), maxIconWidth(0),
reservedShortcutWidth(0)
: QStyleOptionMenuItem(QStyleOptionMenuItem::Version)
{
}
@ -1960,10 +1946,7 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type)
*/
QStyleOptionSlider::QStyleOptionSlider()
: QStyleOptionComplex(Version, SO_Slider), orientation(Qt::Horizontal), minimum(0), maximum(0),
tickPosition(QSlider::NoTicks), tickInterval(0), upsideDown(false),
sliderPosition(0), sliderValue(0), singleStep(0), pageStep(0), notchTarget(0.0),
dialWrapping(false), keyboardModifiers{}
: QStyleOptionSlider(Version)
{
}
@ -2160,8 +2143,7 @@ QStyleOptionSlider::QStyleOptionSlider(int version)
*/
QStyleOptionSpinBox::QStyleOptionSpinBox()
: QStyleOptionComplex(Version, SO_SpinBox), buttonSymbols(QAbstractSpinBox::UpDownArrows),
stepEnabled(QAbstractSpinBox::StepNone), frame(false)
: QStyleOptionSpinBox(Version)
{
}
@ -2266,8 +2248,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
*/
QStyleOptionDockWidget::QStyleOptionDockWidget()
: QStyleOption(Version, SO_DockWidget), closable(false),
movable(false), floatable(false), verticalTitleBar(false)
: QStyleOptionDockWidget(Version)
{
}
@ -2388,8 +2369,7 @@ QStyleOptionDockWidget::QStyleOptionDockWidget(int version)
*/
QStyleOptionToolButton::QStyleOptionToolButton()
: QStyleOptionComplex(Version, SO_ToolButton), features(None), arrowType(Qt::DownArrow)
, toolButtonStyle(Qt::ToolButtonIconOnly)
: QStyleOptionToolButton(Version)
{
}
@ -2538,7 +2518,7 @@ QStyleOptionToolButton::QStyleOptionToolButton(int version)
*/
QStyleOptionComboBox::QStyleOptionComboBox()
: QStyleOptionComplex(Version, SO_ComboBox), editable(false), frame(true)
: QStyleOptionComboBox(Version)
{
}
@ -2674,7 +2654,7 @@ QStyleOptionComboBox::QStyleOptionComboBox(int version)
*/
QStyleOptionToolBox::QStyleOptionToolBox()
: QStyleOption(Version, SO_ToolBox), position(Beginning), selectedPosition(NotAdjacent)
: QStyleOptionToolBox(Version)
{
}
@ -2801,7 +2781,7 @@ QStyleOptionToolBox::QStyleOptionToolBox(int version)
*/
QStyleOptionRubberBand::QStyleOptionRubberBand()
: QStyleOption(Version, SO_RubberBand), shape(QRubberBand::Line), opaque(false)
: QStyleOptionRubberBand(Version)
{
}
@ -2893,7 +2873,7 @@ QStyleOptionRubberBand::QStyleOptionRubberBand(int version)
*/
QStyleOptionTitleBar::QStyleOptionTitleBar()
: QStyleOptionComplex(Version, SO_TitleBar), titleBarState(0)
: QStyleOptionTitleBar(Version)
{
}
@ -3043,11 +3023,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
*/
QStyleOptionViewItem::QStyleOptionViewItem()
: QStyleOption(Version, SO_ViewItem),
displayAlignment(Qt::AlignLeft), decorationAlignment(Qt::AlignLeft),
textElideMode(Qt::ElideMiddle), decorationPosition(Left),
showDecorationSelected(false), features(None), widget(nullptr),
checkState(Qt::Unchecked), viewItemPosition(QStyleOptionViewItem::Invalid)
: QStyleOptionViewItem(Version)
{
}
@ -3272,8 +3248,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
variables to their default values.
*/
QStyleOptionTabWidgetFrame::QStyleOptionTabWidgetFrame()
: QStyleOption(Version, SO_TabWidgetFrame), lineWidth(0), midLineWidth(0),
shape(QTabBar::RoundedNorth)
: QStyleOptionTabWidgetFrame(Version)
{
}
@ -3415,8 +3390,7 @@ QStyleOptionTabWidgetFrame::QStyleOptionTabWidgetFrame(int version)
vaiables to their default values.
*/
QStyleOptionTabBarBase::QStyleOptionTabBarBase()
: QStyleOption(Version, SO_TabBarBase), shape(QTabBar::RoundedNorth),
documentMode(false)
: QStyleOptionTabBarBase(Version)
{
}
@ -3525,7 +3499,7 @@ QStyleOptionTabBarBase::QStyleOptionTabBarBase(int version)
Constructs a QStyleOptionSizeGrip.
*/
QStyleOptionSizeGrip::QStyleOptionSizeGrip()
: QStyleOptionComplex(Version, Type), corner(Qt::BottomRightCorner)
: QStyleOptionSizeGrip(Version)
{
}
@ -3636,7 +3610,7 @@ QStyleOptionSizeGrip::QStyleOptionSizeGrip(int version)
Constructs a QStyleOptionGraphicsItem.
*/
QStyleOptionGraphicsItem::QStyleOptionGraphicsItem()
: QStyleOption(Version, Type)
: QStyleOptionGraphicsItem(Version)
{
}