diff options
Diffstat (limited to 'src/widgets/widgets/qtabbar_p.h')
| -rw-r--r-- | src/widgets/widgets/qtabbar_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 195ff79c5d..1092878f2c 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -71,11 +71,11 @@ QT_BEGIN_NAMESPACE class QMovableTabWidget : public QWidget { public: - explicit QMovableTabWidget(QWidget *parent = Q_NULLPTR); + explicit QMovableTabWidget(QWidget *parent = nullptr); void setPixmap(const QPixmap &pixmap); protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; private: QPixmap m_pixmap; @@ -142,9 +142,9 @@ public: TabBarAnimation(Tab *t, QTabBarPrivate *_priv) : tab(t), priv(_priv) { setEasingCurve(QEasingCurve::InOutQuad); } - void updateCurrentValue(const QVariant ¤t) Q_DECL_OVERRIDE; + void updateCurrentValue(const QVariant ¤t) override; - void updateState(State, State newState) Q_DECL_OVERRIDE; + void updateState(State, State newState) override; private: //these are needed for the callbacks Tab *tab; @@ -278,12 +278,12 @@ class CloseButton : public QAbstractButton public: explicit CloseButton(QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override; + QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; }; QT_END_NAMESPACE |