From 39851c6905f68a91f95838da91947f8bfae65729 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Sat, 29 Jul 2017 08:48:11 +0200 Subject: Convert features.groupbox to QT_[REQUIRE_]CONFIG Change-Id: I034286043a880ab777ec3f2311572bdc38e7fafc Reviewed-by: Oswald Buddenhagen --- src/widgets/accessible/qaccessiblewidget.cpp | 6 +++-- .../accessible/qaccessiblewidgetfactory.cpp | 2 +- src/widgets/accessible/simplewidgets.cpp | 4 +++- src/widgets/accessible/simplewidgets_p.h | 2 +- src/widgets/styles/qcommonstyle.cpp | 26 ++++++++++++---------- src/widgets/styles/qfusionstyle.cpp | 2 ++ src/widgets/styles/qmacstyle_mac.mm | 2 +- src/widgets/styles/qmacstyle_mac_p_p.h | 2 ++ src/widgets/widgets/qgroupbox.cpp | 5 +---- src/widgets/widgets/qgroupbox.h | 7 ++---- src/widgets/widgets/widgets.pri | 7 ++++-- 11 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 3bc0f7e77b..e3dd7383b2 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -43,7 +43,9 @@ #include "qaction.h" #include "qapplication.h" +#if QT_CONFIG(groupbox) #include "qgroupbox.h" +#endif #if QT_CONFIG(label) #include "qlabel.h" #endif @@ -95,7 +97,7 @@ static QString buddyString(const QWidget *widget) } #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QGroupBox *groupbox = qobject_cast(parent); if (groupbox) return groupbox->title(); @@ -331,7 +333,7 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel } } #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QGroupBox *groupbox = qobject_cast(parent); if (groupbox && !groupbox->title().isEmpty()) { QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(groupbox); diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 4ca29dfbe6..67afec5faf 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -124,7 +124,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje #endif } else if (classname == QLatin1String("QLabel") || classname == QLatin1String("QLCDNumber")) { iface = new QAccessibleDisplay(widget); -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) } else if (classname == QLatin1String("QGroupBox")) { iface = new QAccessibleGroupBox(widget); #endif diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index e5ab85ebab..fae17988b6 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -62,7 +62,9 @@ #if QT_CONFIG(label) #include #endif +#if QT_CONFIG(groupbox) #include +#endif #if QT_CONFIG(lcdnumber) #include #endif @@ -566,7 +568,7 @@ QPoint QAccessibleDisplay::imagePosition() const #endif } -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QAccessibleGroupBox::QAccessibleGroupBox(QWidget *w) : QAccessibleWidget(w) { diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index d4a25b4b80..5055f2c534 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -126,7 +126,7 @@ public: QPoint imagePosition() const Q_DECL_OVERRIDE; }; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) class QAccessibleGroupBox : public QAccessibleWidget { public: diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 2eb7c11c06..ca4fcc5bd3 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -61,7 +61,9 @@ #else #include #endif +#if QT_CONFIG(groupbox) #include +#endif #include #include #include @@ -441,7 +443,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q case PE_FrameLineEdit: proxy()->drawPrimitive(PE_Frame, opt, p, widget); break; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case PE_FrameGroupBox: if (const QStyleOptionFrame *frame = qstyleoption_cast(opt)) { if (frame->features & QStyleOptionFrame::Flat) { @@ -457,7 +459,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) #if QT_CONFIG(dockwidget) case PE_FrameDockWidget: if (const QStyleOptionFrame *frame = qstyleoption_cast(opt)) { @@ -3684,7 +3686,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } break; #endif // QT_CONFIG(dial) -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CC_GroupBox: if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast(opt)) { // Draw frame @@ -3745,7 +3747,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) #ifndef QT_NO_MDIAREA case CC_MdiControls: { @@ -3916,7 +3918,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } break; #endif // QT_CONFIG(combobox) -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CC_GroupBox: if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast(opt)) { QRect r; @@ -3931,7 +3933,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } } break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) case CC_MdiControls: { QRect r; @@ -4263,7 +4265,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex ret = visualRect(tb->direction, tb->rect, ret); } break; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CC_GroupBox: { if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast(opt)) { switch (sc) { @@ -4339,7 +4341,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex } break; } -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) #ifndef QT_NO_MDIAREA case CC_MdiControls: { @@ -4883,12 +4885,12 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, if (const QStyleOptionFrame *f = qstyleoption_cast(opt)) sz += QSize(2*f->lineWidth, 2*f->lineWidth); break; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CT_GroupBox: if (const QGroupBox *grb = static_cast(widget)) sz += QSize(!grb->isFlat() ? 16 : 0, 0); break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) case CT_MdiControls: if (const QStyleOptionComplex *styleOpt = qstyleoption_cast(opt)) { const int buttonSize = proxy()->pixelMetric(PM_TitleBarButtonSize, styleOpt, widget); @@ -4968,7 +4970,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget ret = QDialogButtonBox::AcceptRole; break; #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case SH_GroupBox_TextLabelVerticalAlignment: ret = Qt::AlignVCenter; break; @@ -4976,7 +4978,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget case SH_GroupBox_TextLabelColor: ret = opt ? int(opt->palette.color(QPalette::Text).rgba()) : 0; break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) case SH_ListViewExpand_SelectMouseType: case SH_TabBar_SelectMouseType: diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index c58ed3bee1..d1e2cd25c4 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -57,7 +57,9 @@ #include #include #include +#if QT_CONFIG(groupbox) #include +#endif #include #if QT_CONFIG(scrollbar) #include diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index d495af6333..ed6bde5404 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -3290,7 +3290,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai HIThemeGroupBoxDrawInfo gdi; gdi.version = qt_mac_hitheme_version; gdi.state = tds; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) if (w && qobject_cast(w->parentWidget())) gdi.kind = kHIThemeGroupBoxKindSecondary; else diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 91e84ed82e..1770c07bca 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -68,7 +68,9 @@ #include #include #include +#if QT_CONFIG(groupbox) #include +#endif #include #include #include diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 9e323df9a6..611f3f88db 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qgroupbox.h" -#ifndef QT_NO_GROUPBOX + #include "qapplication.h" #include "qbitmap.h" #include "qdrawutil.h" @@ -751,9 +751,6 @@ void QGroupBox::mouseReleaseEvent(QMouseEvent *event) update(style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this)); } - QT_END_NAMESPACE #include "moc_qgroupbox.cpp" - -#endif //QT_NO_GROUPBOX diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index a132d48e16..668dc03f3d 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -43,10 +43,9 @@ #include #include -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(groupbox); -#ifndef QT_NO_GROUPBOX +QT_BEGIN_NAMESPACE class QGroupBoxPrivate; class QStyleOptionGroupBox; @@ -104,8 +103,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_setChildrenEnabled(bool b)) }; -#endif // QT_NO_GROUPBOX - QT_END_NAMESPACE #endif // QGROUPBOX_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 0401d7ada2..a4bd39cf67 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -7,7 +7,6 @@ HEADERS += \ widgets/qabstractspinbox_p.h \ widgets/qframe.h \ widgets/qframe_p.h \ - widgets/qgroupbox.h \ widgets/qkeysequenceedit.h \ widgets/qkeysequenceedit_p.h \ widgets/qlineedit.h \ @@ -53,7 +52,6 @@ SOURCES += \ widgets/qabstractspinbox.cpp \ widgets/qeffects.cpp \ widgets/qframe.cpp \ - widgets/qgroupbox.cpp \ widgets/qkeysequenceedit.cpp \ widgets/qlineedit_p.cpp \ widgets/qlineedit.cpp \ @@ -160,6 +158,11 @@ qtConfig(fontcombobox) { SOURCES += widgets/qfontcombobox.cpp } +qtConfig(groupbox) { + HEADERS += widgets/qgroupbox.h + SOURCES += widgets/qgroupbox.cpp +} + qtConfig(label) { HEADERS += \ widgets/qlabel.h \ -- cgit v1.2.3