summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor/compositor/tst_compositor.cpp
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 /tests/auto/compositor/compositor/tst_compositor.cpp
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 'tests/auto/compositor/compositor/tst_compositor.cpp')
-rw-r--r--tests/auto/compositor/compositor/tst_compositor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 393b9f5b7..b3ceb9e5c 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -315,7 +315,7 @@ void tst_WaylandCompositor::frameCallback()
class BufferView : public QWaylandView
{
public:
- void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) Q_DECL_OVERRIDE
+ void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) override
{
Q_UNUSED(damage);
bufferRef = ref;
@@ -529,7 +529,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
{
public:
MockXdgSurface(::xdg_surface *xdgSurface) : QtWayland::xdg_surface(xdgSurface) {}
- void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) Q_DECL_OVERRIDE
+ void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) override
{
configureSize = QSize(width, height);
configureSerial = serial;
@@ -729,7 +729,7 @@ void tst_WaylandCompositor::sendsIviConfigure()
{
public:
MockIviSurface(::ivi_surface *iviSurface) : QtWayland::ivi_surface(iviSurface) {}
- void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE
+ void ivi_surface_configure(int32_t width, int32_t height) override
{
configureSize = QSize(width, height);
}