From ee29be91c0b77d12f913f8f0b8d3f0d11a3a40fa Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Sat, 29 Jul 2017 09:04:28 +0200 Subject: Convert features.toolbutton to QT_[REQUIRE_]CONFIG Change-Id: I4227e1868da21bded76a8ec55996c436c8a8d763 Reviewed-by: Oswald Buddenhagen --- .../accessible/qaccessiblewidgetfactory.cpp | 6 +++-- src/widgets/accessible/simplewidgets.cpp | 6 +++-- src/widgets/accessible/simplewidgets_p.h | 4 ++-- src/widgets/styles/qcommonstyle.cpp | 26 ++++++++++++---------- src/widgets/styles/qmacstyle_mac.mm | 6 +++-- src/widgets/styles/qmacstyle_mac_p_p.h | 2 ++ src/widgets/styles/qstylesheetstyle.cpp | 4 +++- src/widgets/styles/qwindowsvistastyle_p_p.h | 2 ++ src/widgets/styles/qwindowsxpstyle.cpp | 6 +++-- src/widgets/widgets/qlineedit_p.h | 2 ++ src/widgets/widgets/qmenu.cpp | 2 ++ src/widgets/widgets/qmenubar.cpp | 2 ++ src/widgets/widgets/qtoolbarextension.cpp | 4 ---- src/widgets/widgets/qtoolbarextension_p.h | 6 ++--- src/widgets/widgets/qtoolbarlayout.cpp | 4 ++++ src/widgets/widgets/qtoolbutton.cpp | 3 --- src/widgets/widgets/qtoolbutton.h | 7 ++---- src/widgets/widgets/widgets.pri | 14 ++++++++---- 18 files changed, 63 insertions(+), 43 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index d207a7b8d2..3fbc9714f5 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -47,7 +47,9 @@ #include "itemviews_p.h" #endif +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(treeview) #include #endif @@ -103,10 +105,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QSlider")) { iface = new QAccessibleSlider(widget); #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) } else if (classname == QLatin1String("QToolButton")) { iface = new QAccessibleToolButton(widget); -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(abstractbutton) } else if (classname == QLatin1String("QCheckBox") || classname == QLatin1String("QRadioButton") diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index fae17988b6..b6fe003452 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -57,7 +57,9 @@ #if QT_CONFIG(radiobutton) #include #endif +#if QT_CONFIG(toolbutton) #include +#endif #include #if QT_CONFIG(label) #include @@ -280,7 +282,7 @@ QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) c } #endif // QT_CONFIG(abstractbutton) -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) /*! \class QAccessibleToolButton \brief The QAccessibleToolButton class implements the QAccessibleInterface for tool buttons. @@ -400,7 +402,7 @@ void QAccessibleToolButton::doAction(const QString &actionName) } -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) /*! \class QAccessibleDisplay diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 5055f2c534..c25aa31425 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -86,7 +86,7 @@ protected: }; #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) class QAccessibleToolButton : public QAccessibleButton { public: @@ -107,7 +107,7 @@ protected: bool isSplitButton() const; }; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface { diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index ca4fcc5bd3..64a3a73b0d 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -78,7 +78,9 @@ #include #endif #include +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(rubberband) #include #endif @@ -807,7 +809,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbutton, const QRect &rect, QPainter *painter, const QWidget *widget = 0) { @@ -832,7 +834,7 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut arrowOpt.rect = rect; style->drawPrimitive(pe, &arrowOpt, painter, widget); } -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(itemviews) @@ -1584,7 +1586,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, (header->state & State_Enabled), header->text, QPalette::ButtonText); } break; -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CE_ToolButtonLabel: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast(opt)) { @@ -1668,7 +1670,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(toolbox) case CE_ToolBoxTab: if (const QStyleOptionToolBox *tb = qstyleoption_cast(opt)) { @@ -3353,7 +3355,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } break; #endif // QT_NO_SPINBOX -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast(opt)) { @@ -3414,7 +3416,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) case CC_TitleBar: if (const QStyleOptionTitleBar *tb = qstyleoption_cast(opt)) { QRect ir; @@ -3855,7 +3857,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } break; #endif // QT_CONFIG(scrollbar) -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast(opt)) { QRect r; @@ -3870,7 +3872,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #ifndef QT_NO_SPINBOX case CC_SpinBox: if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast(opt)) { @@ -4125,7 +4127,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex } break; #endif // Qt_NO_SPINBOX -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *tb = qstyleoption_cast(opt)) { int mbi = proxy()->pixelMetric(PM_MenuButtonIndicator, tb, widget); @@ -4149,7 +4151,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex ret = visualRect(tb->direction, tb->rect, ret); } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(combobox) case CC_ComboBox: if (const QStyleOptionComboBox *cb = qstyleoption_cast(opt)) { @@ -4844,11 +4846,11 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, } break; #endif // QT_NO_MENU -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CT_ToolButton: sz = QSize(sz.width() + 6, sz.height() + 5); break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(combobox) case CT_ComboBox: if (const QStyleOptionComboBox *cmb = qstyleoption_cast(opt)) { diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index ed6bde5404..e517ba3d04 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -97,7 +97,9 @@ #include #include #include +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(treeview) #include #endif @@ -657,7 +659,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg else if (qobject_cast(widg)) ct = QStyle::CT_ComboBox; #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) else if (qobject_cast(widg)) ct = QStyle::CT_ToolButton; #endif @@ -792,7 +794,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg if (sz == QAquaSizeSmall) { int width = 0, height = 0; if (szHint == QSize(-1, -1)) { //just 'guess'.. -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) const QToolButton *bt = qobject_cast(widg); // If this conversion fails then the widget was not what it claimed to be. if(bt) { diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 409063e531..b9ba1d828e 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -104,7 +104,9 @@ #include #include #include +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(treeview) #include #endif diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 740fb4fa47..f704745c8f 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -60,7 +60,9 @@ #include "private/qabstractscrollarea_p.h" #include #include +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(scrollbar) #include #endif @@ -4638,7 +4640,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const switch (m) { case PM_MenuButtonIndicator: -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) // QToolButton adds this directly to the width if (qobject_cast(w) && (rule.hasBox() || !rule.hasNativeBorder())) return 0; diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index 4973c20440..fdc3297ea6 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -69,7 +69,9 @@ #include #include #include +#if QT_CONFIG(toolbutton) #include +#endif #include #include #if QT_CONFIG(combobox) diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index b74c4123b3..5d7699321e 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -57,7 +57,9 @@ #include #include +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(tabbar) #include #endif @@ -2853,7 +2855,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo } break; #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast(option)) { @@ -2967,7 +2969,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo } } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) case CC_TitleBar: { diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 2d695f8411..92bdd4ad60 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -56,7 +56,9 @@ #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" #include "QtWidgets/qlineedit.h" +#if QT_CONFIG(toolbutton) #include "QtWidgets/qtoolbutton.h" +#endif #include "QtGui/qtextlayout.h" #include "QtGui/qicon.h" #include "QtWidgets/qstyleoption.h" diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 167a10efc3..4848eba7ec 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -66,7 +66,9 @@ #include "qmenu_p.h" #include "qmenubar_p.h" #include "qwidgetaction.h" +#if QT_CONFIG(toolbutton) #include "qtoolbutton.h" +#endif #include "qpushbutton.h" #include "qtooltip.h" #include diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 552409a4ed..fd48058ec3 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -51,7 +51,9 @@ #include #include #include +#if QT_CONFIG(toolbutton) #include +#endif #if QT_CONFIG(whatsthis) #include #endif diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp index 267e220b8f..47cf16e0cc 100644 --- a/src/widgets/widgets/qtoolbarextension.cpp +++ b/src/widgets/widgets/qtoolbarextension.cpp @@ -43,8 +43,6 @@ #include #include -#ifndef QT_NO_TOOLBUTTON - QT_BEGIN_NAMESPACE QToolBarExtension::QToolBarExtension(QWidget *parent) @@ -88,5 +86,3 @@ QSize QToolBarExtension::sizeHint() const QT_END_NAMESPACE #include "moc_qtoolbarextension_p.cpp" - -#endif // QT_NO_TOOLBUTTON diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index c4d803165c..b6223107c4 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -54,9 +54,9 @@ #include #include "QtWidgets/qtoolbutton.h" -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbutton); -#ifndef QT_NO_TOOLBUTTON +QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton { @@ -71,8 +71,6 @@ public Q_SLOTS: void setOrientation(Qt::Orientation o); }; -#endif // QT_NO_TOOLBUTTON - QT_END_NAMESPACE #endif // QDYNAMICTOOLBAREXTENSION_P_H diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 39e61a1951..118cb2ae61 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -42,7 +42,9 @@ #include #include #include +#if QT_CONFIG(toolbutton) #include +#endif #include #include #include @@ -51,7 +53,9 @@ #endif #include "qmainwindowlayout_p.h" +#if QT_CONFIG(toolbutton) #include "qtoolbarextension_p.h" +#endif #include "qtoolbarlayout_p.h" #include "qtoolbarseparator_p.h" diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 13595575e6..f2c5814203 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qtoolbutton.h" -#ifndef QT_NO_TOOLBUTTON #include #include @@ -985,5 +984,3 @@ bool QToolButton::event(QEvent *event) QT_END_NAMESPACE #include "moc_qtoolbutton.cpp" - -#endif diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index e2470524da..7ba9a18fef 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -42,12 +42,11 @@ #include -#if QT_CONFIG(toolbutton) - #include -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbutton); +QT_BEGIN_NAMESPACE class QToolButtonPrivate; class QMenu; @@ -137,6 +136,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(toolbutton) - #endif // QTOOLBUTTON_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 2753b92ae4..c204dad08d 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -31,9 +31,7 @@ HEADERS += \ widgets/qtoolbar.h \ widgets/qtoolbar_p.h \ widgets/qtoolbarlayout_p.h \ - widgets/qtoolbarextension_p.h \ widgets/qtoolbarseparator_p.h \ - widgets/qtoolbutton.h \ widgets/qabstractscrollarea.h \ widgets/qabstractscrollarea_p.h \ widgets/qwidgetresizehandler_p.h \ @@ -66,9 +64,7 @@ SOURCES += \ widgets/qtextedit.cpp \ widgets/qtoolbar.cpp \ widgets/qtoolbarlayout.cpp \ - widgets/qtoolbarextension.cpp \ widgets/qtoolbarseparator.cpp \ - widgets/qtoolbutton.cpp \ widgets/qabstractscrollarea.cpp \ widgets/qwidgetresizehandler.cpp \ widgets/qfocusframe.cpp \ @@ -264,6 +260,16 @@ qtConfig(toolbox) { SOURCES += widgets/qtoolbox.cpp } +qtConfig(toolbutton) { + HEADERS += \ + widgets/qtoolbutton.h \ + widgets/qtoolbarextension_p.h + + SOURCES += \ + widgets/qtoolbutton.cpp \ + widgets/qtoolbarextension.cpp +} + qtConfig(widgettextcontrol) { HEADERS += \ widgets/qwidgettextcontrol_p.h \ -- cgit v1.2.3