From c36a5aee70d0d4dec9062739cde9f83139900d92 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Thu, 27 Jul 2017 22:04:01 +0200 Subject: Convert features.dial to QT_[REQUIRE_]CONFIG Change-Id: I9fea2451fe3567fdd1af1540e9a55f218f54b569 Reviewed-by: Oswald Buddenhagen --- src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 +- src/widgets/accessible/rangecontrols.cpp | 7 ++++--- src/widgets/accessible/rangecontrols_p.h | 4 ++-- src/widgets/styles/qcommonstyle.cpp | 8 ++++---- src/widgets/styles/qmacstyle_mac.mm | 2 +- src/widgets/styles/qstylehelper.cpp | 4 ++-- src/widgets/styles/qstylehelper_p.h | 4 ++-- src/widgets/styles/qwindowsxpstyle.cpp | 4 ++-- src/widgets/widgets/qdial.cpp | 4 ---- src/widgets/widgets/qdial.h | 7 ++----- src/widgets/widgets/widgets.pri | 7 +++++-- 11 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index c3de7a7dd6..be52188cc3 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -193,7 +193,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QDialogButtonBox")) { iface = new QAccessibleDialogButtonBox(widget); #endif -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) } else if (classname == QLatin1String("QDial")) { iface = new QAccessibleDial(widget); #endif diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 602d0c7e11..1aa1fb4929 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -40,7 +40,9 @@ #include "rangecontrols_p.h" #include +#if QT_CONFIG(dial) #include +#endif #include #include #include @@ -48,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -398,7 +399,7 @@ QAbstractSlider *QAccessibleAbstractSlider::abstractSlider() const #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) // ======================================= QAccessibleDial ====================================== QAccessibleDial::QAccessibleDial(QWidget *widget) : QAccessibleAbstractSlider(widget, QAccessible::Dial) @@ -419,7 +420,7 @@ QDial *QAccessibleDial::dial() const { return static_cast(object()); } -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index c0b010c292..8c1f96fdf8 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -186,7 +186,7 @@ protected: }; #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) class QAccessibleDial : public QAccessibleAbstractSlider { public: @@ -197,7 +197,7 @@ public: protected: QDial *dial() const; }; -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 5e43d69e8f..4e6f0c8817 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -3084,7 +3084,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, #endif } -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) // in lieu of std::array, minimal API template @@ -3132,7 +3132,7 @@ static StaticPolygonF<3> calcArrow(const QStyleOptionSlider *dial, qreal &a) return arrow; } -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) /*! \reimp @@ -3590,7 +3590,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) case CC_Dial: if (const QStyleOptionSlider *dial = qstyleoption_cast(opt)) { // OK, this is more a port of things over @@ -3683,7 +3683,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl p->restore(); } break; -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #ifndef QT_NO_GROUPBOX case CC_GroupBox: if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast(opt)) { diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 6117ea22c7..93f7dce590 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -6101,7 +6101,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex #endif } break; -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) case CC_Dial: if (const QStyleOptionSlider *dial = qstyleoption_cast(opt)) QStyleHelper::drawDial(dial, p); diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index ffb898df57..43bec9a096 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -131,7 +131,7 @@ bool hasAncestor(QObject *obj, QAccessible::Role role) #endif // QT_NO_ACCESSIBILITY -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) int calcBigLineSize(int radius) { @@ -350,7 +350,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter) painter->drawEllipse(dialRect); painter->restore(); } -#endif //QT_NO_DIAL +#endif //QT_CONFIG(dial) void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, int left, int top, int right, diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h index 88eb05f1d7..17b6d9ab4f 100644 --- a/src/widgets/styles/qstylehelper_p.h +++ b/src/widgets/styles/qstylehelper_p.h @@ -72,12 +72,12 @@ namespace QStyleHelper { QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size); qreal dpiScaled(qreal value); -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) qreal angle(const QPointF &p1, const QPointF &p2); QPolygonF calcLines(const QStyleOptionSlider *dial); int calcBigLineSize(int radius); void drawDial(const QStyleOptionSlider *dial, QPainter *painter); -#endif //QT_NO_DIAL +#endif //QT_CONFIG(dial) void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, int left = 0, int top = 0, int right = 0, int bottom = 0); diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index bb2c0688c4..28171f3156 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -3225,12 +3225,12 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo } break; #endif //QT_NO_MDIAREA -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) case CC_Dial: if (const QStyleOptionSlider *dial = qstyleoption_cast(option)) QStyleHelper::drawDial(dial, p); break; -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) default: QWindowsStyle::drawComplexControl(cc, option, p, widget); break; diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index a219e4ccb6..c08c820127 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -39,8 +39,6 @@ #include "qdial.h" -#ifndef QT_NO_DIAL - #include #include #include @@ -480,5 +478,3 @@ bool QDial::event(QEvent *e) QT_END_NAMESPACE #include "moc_qdial.cpp" - -#endif // QT_NO_DIAL diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 472b14fcdb..ed753d86b0 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -43,12 +43,11 @@ #include -#if QT_CONFIG(dial) - #include -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(dial); +QT_BEGIN_NAMESPACE class QDialPrivate; class QStyleOptionSlider; @@ -101,6 +100,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(dial) - #endif // QDIAL_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index aed3f53478..0d6361ad77 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -5,7 +5,6 @@ HEADERS += \ widgets/qbuttongroup_p.h \ widgets/qabstractspinbox.h \ widgets/qabstractspinbox_p.h \ - widgets/qdial.h \ widgets/qframe.h \ widgets/qframe_p.h \ widgets/qgroupbox.h \ @@ -58,7 +57,6 @@ HEADERS += \ SOURCES += \ widgets/qbuttongroup.cpp \ widgets/qabstractspinbox.cpp \ - widgets/qdial.cpp \ widgets/qeffects.cpp \ widgets/qframe.cpp \ widgets/qgroupbox.cpp \ @@ -152,6 +150,11 @@ qtConfig(datetimeedit) { widgets/qdatetimeedit.cpp } +qtConfig(dial) { + HEADERS += widgets/qdial.h + SOURCES += widgets/qdial.cpp +} + qtConfig(dockwidget) { HEADERS += \ widgets/qdockwidget.h \ -- cgit v1.2.3