From e029923c6041bd0ed5565a16c03382b065d22e83 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Thu, 27 Jul 2017 22:06:33 +0200 Subject: Convert features.statusbar to QT_[REQUIRE_]CONFIG Change-Id: Ifc1881388e559d3235df0202ac6d26f78ba2c691 Reviewed-by: Oswald Buddenhagen --- src/widgets/accessible/simplewidgets.cpp | 6 ++++-- src/widgets/styles/qstylesheetstyle.cpp | 1 - src/widgets/widgets/qmainwindow.cpp | 8 +++++--- src/widgets/widgets/qmainwindow.h | 2 +- src/widgets/widgets/qmainwindowlayout.cpp | 6 ++++-- src/widgets/widgets/qmainwindowlayout_p.h | 2 +- src/widgets/widgets/qstatusbar.cpp | 3 --- src/widgets/widgets/qstatusbar.h | 7 ++----- src/widgets/widgets/widgets.pri | 7 +++++-- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index b8ce9a9060..a09bb99bcb 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -49,7 +49,9 @@ #include #endif #include +#if QT_CONFIG(statusbar) #include +#endif #if QT_CONFIG(radiobutton) #include #endif @@ -432,7 +434,7 @@ QAccessible::Role QAccessibleDisplay::role() const } else if (qobject_cast(object())) { return QAccessible::ProgressBar; #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) } else if (qobject_cast(object())) { return QAccessible::StatusBar; #endif @@ -474,7 +476,7 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const else str = QString::number(l->intValue()); #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) } else if (qobject_cast(object())) { return qobject_cast(object())->currentMessage(); #endif diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 5557dba430..06dbf999ca 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -70,7 +70,6 @@ #if QT_CONFIG(checkbox) #include #endif -#include #if QT_CONFIG(itemviews) #include #endif diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 271465ec00..c76d3cb445 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -51,7 +51,9 @@ #include #include +#if QT_CONFIG(statusbar) #include +#endif #include #include #include @@ -607,7 +609,7 @@ void QMainWindow::setMenuWidget(QWidget *menuBar) } #endif // QT_NO_MENUBAR -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) /*! Returns the status bar for the main window. This function creates and returns an empty status bar if the status bar does not exist. @@ -644,7 +646,7 @@ void QMainWindow::setStatusBar(QStatusBar *statusbar) } d->layout->setStatusBar(statusbar); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) /*! Returns the central widget for the main window. This function @@ -1502,7 +1504,7 @@ bool QMainWindow::event(QEvent *event) #if QT_CONFIG(statustip) case QEvent::StatusTip: -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) if (QStatusBar *sb = d->layout->statusBar()) sb->showMessage(static_cast(event)->tip()); else diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index aa26d4c23b..e0592d2c3f 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -131,7 +131,7 @@ public: void setMenuWidget(QWidget *menubar); #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *statusBar() const; void setStatusBar(QStatusBar *statusbar); #endif diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index c0ad4e697d..8c1a0d7937 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -59,7 +59,9 @@ #endif #include +#if QT_CONFIG(statusbar) #include +#endif #include #include #include @@ -2326,7 +2328,7 @@ void QMainWindowLayout::setDockOptions(QMainWindow::DockOptions opts) invalidate(); } -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *QMainWindowLayout::statusBar() const { return statusbar ? qobject_cast(statusbar->widget()) : 0; } @@ -2338,7 +2340,7 @@ void QMainWindowLayout::setStatusBar(QStatusBar *sb) statusbar = sb ? new QWidgetItemV2(sb) : 0; invalidate(); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) QWidget *QMainWindowLayout::centralWidget() const { diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index ed0c6b96c5..7001859ae0 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -192,7 +192,7 @@ public: QLayoutItem *statusbar; -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *statusBar() const; void setStatusBar(QStatusBar *sb); #endif diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index bdf728ead2..da7c86a2af 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qstatusbar.h" -#ifndef QT_NO_STATUSBAR #include "qlist.h" #include "qdebug.h" @@ -787,5 +786,3 @@ bool QStatusBar::event(QEvent *e) QT_END_NAMESPACE #include "moc_qstatusbar.cpp" - -#endif diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index aaabb99a27..9ac637931c 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -43,10 +43,9 @@ #include #include -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(statusbar); -#ifndef QT_NO_STATUSBAR +QT_BEGIN_NAMESPACE class QStatusBarPrivate; @@ -94,8 +93,6 @@ private: Q_DECLARE_PRIVATE(QStatusBar) }; -#endif // QT_NO_STATUSBAR - QT_END_NAMESPACE #endif // QSTATUSBAR_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 0d6361ad77..347c821145 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -32,7 +32,6 @@ HEADERS += \ widgets/qsplitter.h \ widgets/qsplitter_p.h \ widgets/qstackedwidget.h \ - widgets/qstatusbar.h \ widgets/qtextedit.h \ widgets/qtextedit_p.h \ widgets/qtextbrowser.h \ @@ -76,7 +75,6 @@ SOURCES += \ widgets/qspinbox.cpp \ widgets/qsplitter.cpp \ widgets/qstackedwidget.cpp \ - widgets/qstatusbar.cpp \ widgets/qtextedit.cpp \ widgets/qtextbrowser.cpp \ widgets/qtoolbar.cpp \ @@ -226,6 +224,11 @@ qtConfig(splashscreen) { widgets/qsplashscreen.cpp } +qtConfig(statusbar) { + HEADERS += widgets/qstatusbar.h + SOURCES += widgets/qstatusbar.cpp +} + qtConfig(tabbar) { HEADERS += \ widgets/qtabbar.h \ -- cgit v1.2.3