diff options
Diffstat (limited to 'src/widgets/kernel')
25 files changed, 153 insertions, 153 deletions
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index ca127ef51a..ed26558d56 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -180,7 +180,7 @@ public: #endif protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; QAction(QActionPrivate &dd, QObject *parent); public Q_SLOTS: diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 396d0c9474..a147ecafb4 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -177,7 +177,7 @@ public: #endif static int exec(); - bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool notify(QObject *, QEvent *) override; #ifdef QT_KEYPAD_NAVIGATION static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); @@ -201,8 +201,8 @@ public Q_SLOTS: static void aboutQt(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override; private: Q_DISABLE_COPY(QApplication) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 5dca2e85f1..e83d6e5820 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -106,11 +106,11 @@ public: QApplicationPrivate(int &argc, char **argv, int flags); ~QApplicationPrivate(); - virtual void notifyLayoutDirectionChange() Q_DECL_OVERRIDE; - virtual void notifyActiveWindowChange(QWindow *) Q_DECL_OVERRIDE; + virtual void notifyLayoutDirectionChange() override; + virtual void notifyActiveWindowChange(QWindow *) override; - virtual bool shouldQuit() Q_DECL_OVERRIDE; - bool tryCloseAllWindows() Q_DECL_OVERRIDE; + virtual bool shouldQuit() override; + bool tryCloseAllWindows() override; #if 0 // Used to be included in Qt4 for Q_WS_X11 #ifndef QT_NO_SETTINGS @@ -122,13 +122,13 @@ public: static QString desktopStyleKey(); - void createEventDispatcher() Q_DECL_OVERRIDE; + void createEventDispatcher() override; static void dispatchEnterLeave(QWidget *enter, QWidget *leave, const QPointF &globalPosF); - void notifyWindowIconChanged() Q_DECL_OVERRIDE; + void notifyWindowIconChanged() override; //modality - bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const Q_DECL_OVERRIDE; + bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const override; static bool isBlockedByModal(QWidget *widget); static bool modalState(); static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0); @@ -158,7 +158,7 @@ public: #endif static bool inPopupMode(); - bool popupActive() Q_DECL_OVERRIDE { return inPopupMode(); } + bool popupActive() override { return inPopupMode(); } void closePopup(QWidget *popup); void openPopup(QWidget *popup); static void setFocusWidget(QWidget *focus, Qt::FocusReason reason); @@ -183,9 +183,9 @@ public: static QPalette *set_pal; protected: - void notifyThemeChanged() Q_DECL_OVERRIDE; + void notifyThemeChanged() override; #ifndef QT_NO_DRAGANDDROP - void notifyDragStarted(const QDrag *) Q_DECL_OVERRIDE; + void notifyDragStarted(const QDrag *) override; #endif // QT_NO_DRAGANDDROP public: @@ -284,7 +284,7 @@ public: ulong timestamp); static void translateTouchCancel(QTouchDevice *device, ulong timestamp); - QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const Q_DECL_OVERRIDE; + QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const override; private: static QApplicationPrivate *self; static bool tryCloseAllWidgetWindows(QWindowList *processedWindows); diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index 588cec2b95..a368f379ad 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -124,7 +124,7 @@ public: void calcHfw(int); void effectiveMargins(int *left, int *top, int *right, int *bottom) const; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QBoxLayoutPrivate::~QBoxLayoutPrivate() diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 9c7d0e593f..9a0d993d5f 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -74,7 +74,7 @@ public: void addWidget(QWidget *, int stretch = 0, Qt::Alignment alignment = Qt::Alignment()); void addLayout(QLayout *layout, int stretch = 0); void addStrut(int); - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; void insertSpacing(int index, int size); void insertStretch(int index, int stretch = 0); @@ -91,20 +91,20 @@ public: void setStretch(int index, int stretch); int stretch(int index) const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + int count() const override; + void setGeometry(const QRect&) override; private: Q_DISABLE_COPY(QBoxLayout) diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 64e1c568eb..2fb41cb208 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -87,7 +87,7 @@ Q_SIGNALS: void primaryScreenChanged(); protected: - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; private: Q_DISABLE_COPY(QDesktopWidget) diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index 868ac17b6f..8a5b863bb5 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -224,7 +224,7 @@ public: int hSpacing; int vSpacing; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QFormLayoutPrivate::QFormLayoutPrivate() diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index 5ec27433d3..309993d9ad 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -142,19 +142,19 @@ public: QWidget *labelForField(QLayout *field) const; // reimplemented from QLayout - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + + void setGeometry(const QRect &rect) override; + QSize minimumSize() const override; + QSize sizeHint() const override; + void invalidate() override; + + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; + Qt::Orientations expandingDirections() const override; + int count() const override; int rowCount() const; diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 29df38f19c..db8ef89477 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -170,7 +170,7 @@ public: } return 0; } - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override { if (!newitem) return 0; diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 51dd65d181..0283ec2028 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -66,9 +66,9 @@ public: ~QGridLayout(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; void setHorizontalSpacing(int spacing); int horizontalSpacing() const; @@ -92,12 +92,12 @@ public: QRect cellRect(int row, int column) const; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; inline void addWidget(QWidget *w) { QLayout::addWidget(w); } void addWidget(QWidget *, int row, int column, Qt::Alignment = Qt::Alignment()); @@ -108,11 +108,11 @@ public: void setOriginCorner(Qt::Corner); Qt::Corner originCorner() const; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + QLayoutItem *itemAt(int index) const override; QLayoutItem *itemAtPosition(int row, int column) const; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + QLayoutItem *takeAt(int index) override; + int count() const override; + void setGeometry(const QRect&) override; void addItem(QLayoutItem *item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment = Qt::Alignment()); @@ -120,7 +120,7 @@ public: void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan) const; protected: - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; private: Q_DISABLE_COPY(QGridLayout) diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 2de12b4f99..abadf2e69d 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -104,8 +104,8 @@ public: QWidget *parentWidget() const; - void invalidate() Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void invalidate() override; + QRect geometry() const override; bool activate(); void update(); @@ -115,16 +115,16 @@ public: void removeWidget(QWidget *w); void removeItem(QLayoutItem *); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - virtual void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; + virtual void setGeometry(const QRect&) override; virtual QLayoutItem *itemAt(int index) const = 0; virtual QLayoutItem *takeAt(int index) = 0; virtual int indexOf(QWidget *) const; virtual int count() const = 0; - bool isEmpty() const Q_DECL_OVERRIDE; - QSizePolicy::ControlTypes controlTypes() const Q_DECL_OVERRIDE; + bool isEmpty() const override; + QSizePolicy::ControlTypes controlTypes() const override; // ### Qt 6 make this function virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); @@ -133,7 +133,7 @@ public: QSize totalMinimumSize() const; QSize totalMaximumSize() const; QSize totalSizeHint() const; - QLayout *layout() Q_DECL_OVERRIDE; + QLayout *layout() override; void setEnabled(bool); bool isEnabled() const; @@ -143,7 +143,7 @@ public: protected: void widgetEvent(QEvent *); - void childEvent(QChildEvent *e) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *e) override; void addChildLayout(QLayout *l); void addChildWidget(QWidget *w); bool adoptLayout(QLayout *layout); diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 5bc408a8cd..07588d2ee2 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -536,8 +536,8 @@ public: : QOpenGLPaintDevicePrivate(QSize()), w(widget) { } - void beginPaint() Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint() override; + void endPaint() override; QOpenGLWidget *w; }; @@ -547,7 +547,7 @@ class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice public: QOpenGLWidgetPaintDevice(QOpenGLWidget *widget) : QOpenGLPaintDevice(*new QOpenGLWidgetPaintDevicePrivate(widget)) { } - void ensureActiveTarget() Q_DECL_OVERRIDE; + void ensureActiveTarget() override; }; class QOpenGLWidgetPrivate : public QWidgetPrivate @@ -576,8 +576,8 @@ public: void reset(); void recreateFbo(); - GLuint textureId() const Q_DECL_OVERRIDE; - QPlatformTextureList::Flags textureListFlags() Q_DECL_OVERRIDE; + GLuint textureId() const override; + QPlatformTextureList::Flags textureListFlags() override; void initialize(); void invokeUserPaint(); @@ -585,14 +585,14 @@ public: void invalidateFbo(); - QImage grabFramebuffer() Q_DECL_OVERRIDE; - void beginBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = true; } - void endBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = false; } - void beginCompose() Q_DECL_OVERRIDE; - void endCompose() Q_DECL_OVERRIDE; - void initializeViewportFramebuffer() Q_DECL_OVERRIDE; - void resizeViewportFramebuffer() Q_DECL_OVERRIDE; - void resolveSamples() Q_DECL_OVERRIDE; + QImage grabFramebuffer() override; + void beginBackingStorePainting() override { inBackingStorePaint = true; } + void endBackingStorePainting() override { inBackingStorePaint = false; } + void beginCompose() override; + void endCompose() override; + void initializeViewportFramebuffer() override; + void resizeViewportFramebuffer() override; + void resolveSamples() override; QOpenGLContext *context; QOpenGLFramebufferObject *fbo; diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h index c0a6e41522..f2d01c75d2 100644 --- a/src/widgets/kernel/qopenglwidget.h +++ b/src/widgets/kernel/qopenglwidget.h @@ -96,13 +96,13 @@ protected: virtual void resizeGL(int w, int h); virtual void paintGL(); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + bool event(QEvent *e) override; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *p) const Q_DECL_OVERRIDE; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + QPaintDevice *redirected(QPoint *p) const override; + QPaintEngine *paintEngine() const override; private: Q_DISABLE_COPY(QOpenGLWidget) diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index 22c667c9c1..bbf53bdbfd 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -91,7 +91,7 @@ Q_SIGNALS: void activatedAmbiguously(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; }; #endif // QT_NO_SHORTCUT diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index b8b6f4302d..7430d833db 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -51,7 +51,7 @@ class QStackedLayoutPrivate : public QLayoutPrivate Q_DECLARE_PUBLIC(QStackedLayout) public: QStackedLayoutPrivate() : index(-1), stackingMode(QStackedLayout::StackOne) {} - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override; QList<QLayoutItem *> list; int index; QStackedLayout::StackingMode stackingMode; diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 6f5eded1f0..966ee2aae4 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -75,20 +75,20 @@ public: int currentIndex() const; using QLayout::widget; QWidget *widget(int) const; - int count() const Q_DECL_OVERRIDE; + int count() const override; StackingMode stackingMode() const; void setStackingMode(StackingMode stackingMode); // abstract virtual functions: - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QSize sizeHint() const override; + QSize minimumSize() const override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + void setGeometry(const QRect &rect) override; + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; Q_SIGNALS: void widgetRemoved(int index); diff --git a/src/widgets/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h index 9b2cffaa9a..6de09361fe 100644 --- a/src/widgets/kernel/qstandardgestures_p.h +++ b/src/widgets/kernel/qstandardgestures_p.h @@ -64,9 +64,9 @@ class QPanGestureRecognizer : public QGestureRecognizer public: explicit QPanGestureRecognizer(int pointCount = 2) : m_pointCount(pointCount) {} - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; private: const int m_pointCount; @@ -77,9 +77,9 @@ class QPinchGestureRecognizer : public QGestureRecognizer public: QPinchGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QSwipeGestureRecognizer : public QGestureRecognizer @@ -87,9 +87,9 @@ class QSwipeGestureRecognizer : public QGestureRecognizer public: QSwipeGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapGestureRecognizer : public QGestureRecognizer @@ -97,9 +97,9 @@ class QTapGestureRecognizer : public QGestureRecognizer public: QTapGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapAndHoldGestureRecognizer : public QGestureRecognizer @@ -107,9 +107,9 @@ class QTapAndHoldGestureRecognizer : public QGestureRecognizer public: QTapAndHoldGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; QT_END_NAMESPACE diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 813b64b2dd..12badcee3d 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -123,7 +123,7 @@ public: ~QTipLabel(); static QTipLabel *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QBasicTimer hideTimer, expireTimer; @@ -139,10 +139,10 @@ public: static int getTipScreen(const QPoint &pos, QWidget *w); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; #ifndef QT_NO_STYLE_STYLESHEET public slots: diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 91d2b503e0..96d0cf61c4 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -145,12 +145,12 @@ public: static QWhatsThat *instance; protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void keyPressEvent(QKeyEvent*) override; + void paintEvent(QPaintEvent*) override; private: QPointer<QWidget>widget; @@ -365,7 +365,7 @@ class QWhatsThisPrivate : public QObject QWhatsThisPrivate(); ~QWhatsThisPrivate(); static QWhatsThisPrivate *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QPointer<QAction> action; static void say(QWidget *, const QString &, int x = 0, int y = 0); static void notifyToplevels(QEvent *e); diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 732af4de09..25d08993fb 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -214,7 +214,7 @@ public: explicit QWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); ~QWidget(); - int devType() const Q_DECL_OVERRIDE; + int devType() const override; WId winId() const; void createWinId(); // internal, going away @@ -578,7 +578,7 @@ public: void setAttribute(Qt::WidgetAttribute, bool on = true); inline bool testAttribute(Qt::WidgetAttribute) const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; void ensurePolished() const; @@ -608,7 +608,7 @@ Q_SIGNALS: protected: // Event handlers - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; virtual void mousePressEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event); virtual void mouseDoubleClickEvent(QMouseEvent *event); @@ -650,10 +650,10 @@ protected: // Misc. protected functions virtual void changeEvent(QEvent *); - int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; - void initPainter(QPainter *painter) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *offset) const Q_DECL_OVERRIDE; - QPainter *sharedPainter() const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; + void initPainter(QPainter *painter) const override; + QPaintDevice *redirected(QPoint *offset) const override; + QPainter *sharedPainter() const override; virtual void inputMethodEvent(QInputMethodEvent *); public: diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index f1eefd68dd..57da51dcba 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -902,26 +902,26 @@ public: : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false) {} - void detach() Q_DECL_OVERRIDE + void detach() override { m_widget->d_func()->graphicsEffect = 0; } - const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE + const QGraphicsItem *graphicsItem() const override { return 0; } - const QWidget *widget() const Q_DECL_OVERRIDE + const QWidget *widget() const override { return m_widget; } - void update() Q_DECL_OVERRIDE + void update() override { updateDueToGraphicsEffect = true; m_widget->update(); updateDueToGraphicsEffect = false; } - bool isPixmap() const Q_DECL_OVERRIDE + bool isPixmap() const override { return false; } - void effectBoundingRectChanged() Q_DECL_OVERRIDE + void effectBoundingRectChanged() override { // ### This function should take a rect parameter; then we can avoid // updating too much on the parent widget. @@ -931,16 +931,16 @@ public: update(); } - const QStyleOption *styleOption() const Q_DECL_OVERRIDE + const QStyleOption *styleOption() const override { return 0; } - QRect deviceRect() const Q_DECL_OVERRIDE + QRect deviceRect() const override { return m_widget->window()->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; - void draw(QPainter *p) Q_DECL_OVERRIDE; + QRectF boundingRect(Qt::CoordinateSystem system) const override; + void draw(QPainter *p) override; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; + QGraphicsEffect::PixmapPadMode mode) const override; QWidget *m_widget; QWidgetPaintContext *context; diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 3da691a430..4769332a23 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -66,8 +66,8 @@ public: void releaseWidget(QWidget *widget); protected: - virtual bool event(QEvent *) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *) override; + virtual bool eventFilter(QObject *, QEvent *) override; virtual QWidget *createWidget(QWidget *parent); virtual void deleteWidget(QWidget *widget); QList<QWidget *> createdWidgets() const; diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index d30154410c..bf0e6bac73 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -78,7 +78,7 @@ public: QWindowPrivate::setVisible(visible); } - QWindow *eventReceiver() Q_DECL_OVERRIDE { + QWindow *eventReceiver() override { Q_Q(QWidgetWindow); QWindow *w = q; while (w->parent() && qobject_cast<QWidgetWindow *>(w) && qobject_cast<QWidgetWindow *>(w->parent())) { @@ -87,7 +87,7 @@ public: return w; } - void clearFocusObject() Q_DECL_OVERRIDE + void clearFocusObject() override { Q_Q(QWidgetWindow); QWidget *widget = q->widget(); @@ -95,7 +95,7 @@ public: widget->focusWidget()->clearFocus(); } - QRectF closestAcceptableGeometry(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF closestAcceptableGeometry(const QRectF &rect) const override; }; QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index be3f808a22..d0f1d55c2a 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -75,13 +75,13 @@ public: QWidget *widget() const { return m_widget; } #ifndef QT_NO_ACCESSIBILITY - QAccessibleInterface *accessibleRoot() const Q_DECL_OVERRIDE; + QAccessibleInterface *accessibleRoot() const override; #endif - QObject *focusObject() const Q_DECL_OVERRIDE; + QObject *focusObject() const override; void setNativeWindowVisibility(bool visible); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; void handleCloseEvent(QCloseEvent *); void handleEnterLeaveEvent(QEvent *); @@ -102,7 +102,7 @@ protected: #endif void handleExposeEvent(QExposeEvent *); void handleWindowStateChangedEvent(QWindowStateChangeEvent *event); - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #if QT_CONFIG(tabletevent) void handleTabletEvent(QTabletEvent *); #endif diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h index 1d838c8dd6..a8754232a8 100644 --- a/src/widgets/kernel/qwindowcontainer_p.h +++ b/src/widgets/kernel/qwindowcontainer_p.h @@ -75,7 +75,7 @@ public: static void parentWasLowered(QWidget *parent); protected: - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private slots: void focusWindowChanged(QWindow *focusWindow); |