summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/client/client/mockinput.h14
-rw-r--r--tests/auto/client/client/mocksurface.h12
-rw-r--r--tests/auto/client/client/tst_client.cpp4
-rw-r--r--tests/auto/compositor/compositor/testcompositor.h4
-rw-r--r--tests/auto/compositor/compositor/testkeyboardgrabber.h8
-rw-r--r--tests/auto/compositor/compositor/testseat.h2
-rw-r--r--tests/auto/compositor/compositor/tst_compositor.cpp6
7 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/client/client/mockinput.h b/tests/auto/client/client/mockinput.h
index 7e88ffb0f..9c217b6ac 100644
--- a/tests/auto/client/client/mockinput.h
+++ b/tests/auto/client/client/mockinput.h
@@ -54,10 +54,10 @@ public:
Touch *touch() const { return m_touch.data(); }
protected:
- void seat_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
- void seat_get_keyboard(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
- void seat_get_pointer(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
- void seat_get_touch(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
+ void seat_bind_resource(Resource *resource) override;
+ void seat_get_keyboard(Resource *resource, uint32_t id) override;
+ void seat_get_pointer(Resource *resource, uint32_t id) override;
+ void seat_get_touch(Resource *resource, uint32_t id) override;
private:
Compositor *m_compositor;
@@ -80,7 +80,7 @@ public:
void sendKey(uint32_t key, uint32_t state);
protected:
- void keyboard_destroy_resource(wl_keyboard::Resource *resource) Q_DECL_OVERRIDE;
+ void keyboard_destroy_resource(wl_keyboard::Resource *resource) override;
private:
Compositor *m_compositor;
@@ -103,7 +103,7 @@ public:
void sendButton(uint32_t button, uint32_t state);
protected:
- void pointer_destroy_resource(wl_pointer::Resource *resource) Q_DECL_OVERRIDE;
+ void pointer_destroy_resource(wl_pointer::Resource *resource) override;
private:
Compositor *m_compositor;
@@ -158,7 +158,7 @@ public:
DataDevice *dataDevice() const;
protected:
- void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) Q_DECL_OVERRIDE;
+ void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) override;
void data_device_manager_create_data_source(Resource *resource, uint32_t id) override;
private:
diff --git a/tests/auto/client/client/mocksurface.h b/tests/auto/client/client/mocksurface.h
index d04386ac8..e34d6596e 100644
--- a/tests/auto/client/client/mocksurface.h
+++ b/tests/auto/client/client/mocksurface.h
@@ -49,16 +49,16 @@ public:
protected:
- void surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+ void surface_destroy_resource(Resource *resource) override;
- void surface_destroy(Resource *resource) Q_DECL_OVERRIDE;
+ void surface_destroy(Resource *resource) override;
void surface_attach(Resource *resource,
- struct wl_resource *buffer, int x, int y) Q_DECL_OVERRIDE;
+ struct wl_resource *buffer, int x, int y) override;
void surface_damage(Resource *resource,
- int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
+ int32_t x, int32_t y, int32_t width, int32_t height) override;
void surface_frame(Resource *resource,
- uint32_t callback) Q_DECL_OVERRIDE;
- void surface_commit(Resource *resource) Q_DECL_OVERRIDE;
+ uint32_t callback) override;
+ void surface_commit(Resource *resource) override;
private:
wl_resource *m_buffer;
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index f48bb8724..0c9c007a2 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -91,7 +91,7 @@ public:
++mouseReleaseEventCount;
}
- void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE
+ void touchEvent(QTouchEvent *event) override
{
++touchEventCount;
}
@@ -269,7 +269,7 @@ public:
bool dragStarted;
protected:
- void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE
+ void mousePressEvent(QMouseEvent *event) override
{
if (dragStarted)
return;
diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
index 8eeb7ade6..d80fe3588 100644
--- a/tests/auto/compositor/compositor/testcompositor.h
+++ b/tests/auto/compositor/compositor/testcompositor.h
@@ -43,8 +43,8 @@ public slots:
void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface);
protected:
- QWaylandSeat *createSeat() Q_DECL_OVERRIDE;
- QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE;
+ QWaylandSeat *createSeat() override;
+ QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) override;
public:
QList<QWaylandSurface *> surfaces;
diff --git a/tests/auto/compositor/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
index 0ef595987..7f0f2c86c 100644
--- a/tests/auto/compositor/compositor/testkeyboardgrabber.h
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h
@@ -34,10 +34,10 @@ class TestKeyboardGrabber : public QWaylandKeyboard
public:
TestKeyboardGrabber(QWaylandSeat *seat);
- void setFocus(QWaylandSurface *surface) Q_DECL_OVERRIDE;
- void sendKeyModifiers(QWaylandClient *client, uint32_t serial) Q_DECL_OVERRIDE;
- void sendKeyPressEvent(uint code) Q_DECL_OVERRIDE;
- void sendKeyReleaseEvent(uint code) Q_DECL_OVERRIDE;
+ void setFocus(QWaylandSurface *surface) override;
+ void sendKeyModifiers(QWaylandClient *client, uint32_t serial) override;
+ void sendKeyPressEvent(uint code) override;
+ void sendKeyReleaseEvent(uint code) override;
signals:
void focusedCalled();
diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h
index 7fa7030fa..b9f04a2c2 100644
--- a/tests/auto/compositor/compositor/testseat.h
+++ b/tests/auto/compositor/compositor/testseat.h
@@ -42,7 +42,7 @@ public:
TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps);
~TestSeat();
- bool isOwner(QInputEvent *inputEvent) const Q_DECL_OVERRIDE;
+ bool isOwner(QInputEvent *inputEvent) const override;
QList<QMouseEvent *> createMouseEvents(int count);
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index b31d51b4e..3d7d2dab9 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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 17:18:48 +0000