summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylandwlshellsurface_p.h
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-01-12 13:25:48 +0100
committerJohan Helsing <johan.helsing@qt.io>2017-01-23 16:20:03 +0000
commitf72d63866d3f5820865fcd309b649dc9932518ee (patch)
tree675610cbbc8a88f0197c351e754e7892e4eb7871 /src/client/qwaylandwlshellsurface_p.h
parent76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (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/qwaylandwlshellsurface_p.h')
-rw-r--r--src/client/qwaylandwlshellsurface_p.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h
index 89bce5585..94e3417a4 100644
--- a/src/client/qwaylandwlshellsurface_p.h
+++ b/src/client/qwaylandwlshellsurface_p.h
@@ -78,27 +78,27 @@ public:
virtual ~QWaylandWlShellSurface();
using QtWayland::wl_shell_surface::resize;
- void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) Q_DECL_OVERRIDE;
+ void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) override;
using QtWayland::wl_shell_surface::move;
- void move(QWaylandInputDevice *inputDevice) Q_DECL_OVERRIDE;
+ void move(QWaylandInputDevice *inputDevice) override;
- void setTitle(const QString & title) Q_DECL_OVERRIDE;
- void setAppId(const QString &appId) Q_DECL_OVERRIDE;
+ void setTitle(const QString & title) override;
+ void setAppId(const QString &appId) override;
- void raise() Q_DECL_OVERRIDE;
- void lower() Q_DECL_OVERRIDE;
- void setContentOrientationMask(Qt::ScreenOrientations orientation) Q_DECL_OVERRIDE;
- void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
- void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
+ void raise() override;
+ void lower() override;
+ void setContentOrientationMask(Qt::ScreenOrientations orientation) override;
+ void setWindowFlags(Qt::WindowFlags flags) override;
+ void sendProperty(const QString &name, const QVariant &value) override;
void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
private:
- void setMaximized() Q_DECL_OVERRIDE;
- void setFullscreen() Q_DECL_OVERRIDE;
- void setNormal() Q_DECL_OVERRIDE;
- void setMinimized() Q_DECL_OVERRIDE;
+ void setMaximized() override;
+ void setFullscreen() override;
+ void setNormal() override;
+ void setMinimized() override;
void setTopLevel();
void updateTransientParent(QWindow *parent);
@@ -110,11 +110,11 @@ private:
QSize m_size;
QWaylandExtendedSurface *m_extendedWindow;
- void shell_surface_ping(uint32_t serial) Q_DECL_OVERRIDE;
+ void shell_surface_ping(uint32_t serial) override;
void shell_surface_configure(uint32_t edges,
int32_t width,
- int32_t height) Q_DECL_OVERRIDE;
- void shell_surface_popup_done() Q_DECL_OVERRIDE;
+ int32_t height) override;
+ void shell_surface_popup_done() override;
friend class QWaylandWindow;
};