From 0987bda99e3473186f61c11ca46be504534cedaf Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Thu, 27 Jul 2017 22:09:05 +0200 Subject: Convert features.progressbar to QT_[REQUIRE_]CONFIG Change-Id: I66d00d5bac98ff337ba5877e5f23be5e14a97551 Reviewed-by: Oswald Buddenhagen --- src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 +- src/widgets/accessible/simplewidgets.cpp | 8 +++++--- src/widgets/accessible/simplewidgets_p.h | 2 +- src/widgets/styles/qcommonstyle.cpp | 12 ++++++------ src/widgets/styles/qfusionstyle.cpp | 2 ++ src/widgets/styles/qmacstyle_mac.mm | 6 ++++-- src/widgets/styles/qmacstyle_mac_p_p.h | 2 ++ src/widgets/styles/qpixmapstyle.cpp | 2 ++ src/widgets/styles/qwindowsvistastyle_p_p.h | 2 ++ src/widgets/widgets/qprogressbar.cpp | 4 +--- src/widgets/widgets/qprogressbar.h | 7 ++----- src/widgets/widgets/widgets.pri | 7 +++++-- 12 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 194b38461b..5ecb1cdf5f 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -130,7 +130,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje #endif } else if (classname == QLatin1String("QStatusBar")) { iface = new QAccessibleDisplay(widget); -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) } else if (classname == QLatin1String("QProgressBar")) { iface = new QAccessibleProgressBar(widget); #endif diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index a09bb99bcb..e5ab85ebab 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -48,7 +48,9 @@ #if QT_CONFIG(pushbutton) #include #endif +#if QT_CONFIG(progressbar) #include +#endif #if QT_CONFIG(statusbar) #include #endif @@ -430,7 +432,7 @@ QAccessible::Role QAccessibleDisplay::role() const if (l->movie()) return QAccessible::Animation; #endif -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) } else if (qobject_cast(object())) { return QAccessible::ProgressBar; #endif @@ -484,7 +486,7 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const } break; case QAccessible::Value: -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) if (qobject_cast(object())) str = QString::number(qobject_cast(object())->value()); #endif @@ -891,7 +893,7 @@ void QAccessibleLineEdit::replaceText(int startOffset, int endOffset, const QStr #endif // QT_NO_LINEEDIT -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) QAccessibleProgressBar::QAccessibleProgressBar(QWidget *o) : QAccessibleDisplay(o) { diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 1e4ae5ab67..d4a25b4b80 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -190,7 +190,7 @@ protected: }; #endif // QT_NO_LINEEDIT -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValueInterface { public: diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 4e6f0c8817..671da4c38c 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -288,7 +288,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q case PE_PanelToolBar: break; #endif // QT_NO_TOOLBAR -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case PE_IndicatorProgressChunk: { bool vertical = false; @@ -303,7 +303,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) case PE_IndicatorBranch: { static const int decoration_size = 9; int mid_h = opt->rect.x() + opt->rect.width() / 2; @@ -1414,7 +1414,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, p->eraseRect(opt->rect); break; #endif // QT_NO_MENUBAR -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case CE_ProgressBar: if (const QStyleOptionProgressBar *pb = qstyleoption_cast(opt)) { @@ -1551,7 +1551,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) case CE_HeaderLabel: if (const QStyleOptionHeader *header = qstyleoption_cast(opt)) { QRect rect = header->rect; @@ -2487,7 +2487,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case SE_ProgressBarGroove: case SE_ProgressBarContents: case SE_ProgressBarLabel: @@ -2512,7 +2512,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, r = visualRect(pb->direction, pb->rect, r); } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) #if QT_CONFIG(combobox) case SE_ComboBoxFocusRect: if (const QStyleOptionComboBox *cb = qstyleoption_cast(opt)) { diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 792d958d8b..1f8e62bcde 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -66,7 +66,9 @@ #endif #include #include +#if QT_CONFIG(progressbar) #include +#endif #if QT_CONFIG(wizard) #include #endif diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 93f7dce590..a35981fa29 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -81,7 +81,9 @@ #include #include #include +#if QT_CONFIG(progressbar) #include +#endif #if QT_CONFIG(pushbutton) #include #endif @@ -659,7 +661,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg #endif else if (qobject_cast(widg)) ct = QStyle::CT_Slider; -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) else if (qobject_cast(widg)) ct = QStyle::CT_ProgressBar; #endif @@ -875,7 +877,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg ret.setWidth(w); break; } -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case QStyle::CT_ProgressBar: { int finalValue = -1; Qt::Orientation orient = Qt::Horizontal; diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 50596e572d..91e84ed82e 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -83,7 +83,9 @@ #include #include #include +#if QT_CONFIG(progressbar) #include +#endif #if QT_CONFIG(pushbutton) #include #endif diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp index 63308a5e36..7a628a4e39 100644 --- a/src/widgets/styles/qpixmapstyle.cpp +++ b/src/widgets/styles/qpixmapstyle.cpp @@ -49,7 +49,9 @@ #include #include #include +#if QT_CONFIG(progressbar) #include +#endif #include #include #if QT_CONFIG(combobox) diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index 5e2200b876..7b2d80eba3 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -76,7 +76,9 @@ #include #endif #include +#if QT_CONFIG(progressbar) #include +#endif #if QT_CONFIG(dockwidget) #include #endif diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index b4819278c7..c408a87339 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qprogressbar.h" -#ifndef QT_NO_PROGRESSBAR + #include #include #include @@ -623,5 +623,3 @@ QString QProgressBar::format() const QT_END_NAMESPACE #include "moc_qprogressbar.cpp" - -#endif // QT_NO_PROGRESSBAR diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 2dbb7240c5..e0f5e9084b 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -43,10 +43,9 @@ #include #include -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(progressbar); -#ifndef QT_NO_PROGRESSBAR +QT_BEGIN_NAMESPACE class QProgressBarPrivate; class QStyleOptionProgressBar; @@ -119,8 +118,6 @@ private: Q_DISABLE_COPY(QProgressBar) }; -#endif // QT_NO_PROGRESSBAR - QT_END_NAMESPACE #endif // QPROGRESSBAR_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 66416cdb08..eff98c717a 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -22,7 +22,6 @@ HEADERS += \ widgets/qmenu_p.h \ widgets/qmenubar.h \ widgets/qmenubar_p.h \ - widgets/qprogressbar.h \ widgets/qscrollbar.h \ widgets/qscrollbar_p.h \ widgets/qscrollarea_p.h \ @@ -67,7 +66,6 @@ SOURCES += \ widgets/qmdisubwindow.cpp \ widgets/qmenu.cpp \ widgets/qmenubar.cpp \ - widgets/qprogressbar.cpp \ widgets/qscrollbar.cpp \ widgets/qsizegrip.cpp \ widgets/qslider.cpp \ @@ -184,6 +182,11 @@ qtConfig(lcdnumber) { widgets/qlcdnumber.cpp } +qtConfig(progressbar) { + HEADERS += widgets/qprogressbar.h + SOURCES += widgets/qprogressbar.cpp +} + qtConfig(pushbutton) { HEADERS += \ widgets/qpushbutton.h \ -- cgit v1.2.3