diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:25:48 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-23 16:20:03 +0000 |
commit | f72d63866d3f5820865fcd309b649dc9932518ee (patch) | |
tree | 675610cbbc8a88f0197c351e754e7892e4eb7871 /src/client/qwaylandwindow_p.h | |
parent | 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff) |
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
-rw-r--r-- | src/client/qwaylandwindow_p.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 7b48e890f..d5d6e3a31 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -111,16 +111,16 @@ public: ~QWaylandWindow(); virtual WindowType windowType() const = 0; - WId winId() const Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; - void setParent(const QPlatformWindow *parent) Q_DECL_OVERRIDE; + WId winId() const override; + void setVisible(bool visible) override; + void setParent(const QPlatformWindow *parent) override; - void setWindowTitle(const QString &title) Q_DECL_OVERRIDE; + void setWindowTitle(const QString &title) override; inline QIcon windowIcon() const; - void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE; + void setWindowIcon(const QIcon &icon) override; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; void configure(uint32_t edges, int32_t width, int32_t height); @@ -136,7 +136,7 @@ public: void waitForFrameSync(); - QMargins frameMargins() const Q_DECL_OVERRIDE; + QMargins frameMargins() const override; static QWaylandWindow *fromWlSurface(::wl_surface *surface); @@ -145,22 +145,22 @@ public: QWaylandSubSurface *subSurfaceWindow() const; QWaylandScreen *screen() const { return mScreen; } - void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE; + void handleContentOrientationChange(Qt::ScreenOrientation orientation) override; void setOrientationMask(Qt::ScreenOrientations mask); - void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE; - void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE; + void setWindowState(Qt::WindowState state) override; + void setWindowFlags(Qt::WindowFlags flags) override; - void raise() Q_DECL_OVERRIDE; - void lower() Q_DECL_OVERRIDE; + void raise() override; + void lower() override; - void setMask(const QRegion ®ion) Q_DECL_OVERRIDE; + void setMask(const QRegion ®ion) override; int scale() const; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; + qreal devicePixelRatio() const override; - void requestActivateWindow() Q_DECL_OVERRIDE; - bool isExposed() const Q_DECL_OVERRIDE; + void requestActivateWindow() override; + bool isExposed() const override; void unfocus(); QWaylandAbstractDecoration *decoration() const; @@ -187,7 +187,7 @@ public: void doResize(); void setCanResize(bool canResize); - bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE; + bool setMouseGrabEnabled(bool grab) override; static QWaylandWindow *mouseGrab() { return mMouseGrab; } void sendProperty(const QString &name, const QVariant &value); @@ -200,11 +200,11 @@ public: void setBackingStore(QWaylandShmBackingStore *backingStore) { mBackingStore = backingStore; } QWaylandShmBackingStore *backingStore() const { return mBackingStore; } - bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } - void propagateSizeHints() Q_DECL_OVERRIDE { } + bool setKeyboardGrabEnabled(bool) override { return false; } + void propagateSizeHints() override { } void addAttachOffset(const QPoint point); - void requestUpdate() Q_DECL_OVERRIDE; + void requestUpdate() override; public slots: void requestResize(); |