summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-06-23 09:54:18 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-06-27 11:50:23 +0000
commitd84c4a8904765cfb8cd4eebe292dcb8ccb0b5003 (patch)
tree824bf9d0235a51dfe4d4f471f1a634d06b34c746 /src/client
parentb1e61e7e244faf13b6a750809adcccb526e68033 (diff)
Add missing Q_DECL_OVERRIDEs to client classes.
Change-Id: I10e550a25ce498bbeedc242ac73059cc6fdcef30 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src/client')
-rw-r--r--src/client/hardwareintegration/qwaylandhardwareintegration_p.h4
-rw-r--r--src/client/qwaylandcursor_p.h8
-rw-r--r--src/client/qwaylandinputcontext_p.h2
-rw-r--r--src/client/qwaylandinputdevice_p.h2
-rw-r--r--src/client/qwaylandintegration_p.h32
-rw-r--r--src/client/qwaylandnativeinterface_p.h16
-rw-r--r--src/client/qwaylandscreen_p.h16
-rw-r--r--src/client/qwaylandshmbackingstore_p.h10
-rw-r--r--src/client/qwaylandshmwindow_p.h4
-rw-r--r--src/client/qwaylandwindow_p.h22
-rw-r--r--src/client/qwaylandwindowmanagerintegration_p.h6
11 files changed, 61 insertions, 61 deletions
diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
index 466f0b20b..7ec747979 100644
--- a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
@@ -63,8 +63,8 @@ public:
QString serverBufferIntegration();
protected:
- void hardware_integration_client_backend(const QString &name);
- void hardware_integration_server_backend(const QString &name);
+ void hardware_integration_client_backend(const QString &name) Q_DECL_OVERRIDE;
+ void hardware_integration_server_backend(const QString &name) Q_DECL_OVERRIDE;
private:
QString m_client_buffer;
diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h
index 9e06cf626..a3461441c 100644
--- a/src/client/qwaylandcursor_p.h
+++ b/src/client/qwaylandcursor_p.h
@@ -67,10 +67,10 @@ public:
QWaylandCursor(QWaylandScreen *screen);
~QWaylandCursor();
- void changeCursor(QCursor *cursor, QWindow *window);
- void pointerEvent(const QMouseEvent &event);
- QPoint pos() const;
- void setPos(const QPoint &pos);
+ void changeCursor(QCursor *cursor, QWindow *window) Q_DECL_OVERRIDE;
+ void pointerEvent(const QMouseEvent &event) Q_DECL_OVERRIDE;
+ QPoint pos() const Q_DECL_OVERRIDE;
+ void setPos(const QPoint &pos) Q_DECL_OVERRIDE;
struct wl_cursor_image *cursorImage(Qt::CursorShape shape);
QSharedPointer<QWaylandBuffer> cursorBitmapImage(const QCursor *cursor);
diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h
index 679baa497..f6ade8db7 100644
--- a/src/client/qwaylandinputcontext_p.h
+++ b/src/client/qwaylandinputcontext_p.h
@@ -77,7 +77,7 @@ protected:
void text_input_commit_string(uint32_t serial, const QString &text) Q_DECL_OVERRIDE;
void text_input_enter(wl_surface *surface) Q_DECL_OVERRIDE;
void text_input_leave() Q_DECL_OVERRIDE;
- void text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers);
+ void text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers) Q_DECL_OVERRIDE;
private:
QString m_commit;
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index 508b67078..1df90292b 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -222,7 +222,7 @@ public:
void pointer_enter(uint32_t serial, struct wl_surface *surface,
wl_fixed_t sx, wl_fixed_t sy) Q_DECL_OVERRIDE;
- void pointer_leave(uint32_t time, struct wl_surface *surface);
+ void pointer_leave(uint32_t time, struct wl_surface *surface) Q_DECL_OVERRIDE;
void pointer_motion(uint32_t time,
wl_fixed_t sx, wl_fixed_t sy) Q_DECL_OVERRIDE;
void pointer_button(uint32_t serial, uint32_t time,
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
index 42bc287b5..987d80599 100644
--- a/src/client/qwaylandintegration_p.h
+++ b/src/client/qwaylandintegration_p.h
@@ -66,37 +66,37 @@ public:
QWaylandIntegration();
~QWaylandIntegration();
- bool hasCapability(QPlatformIntegration::Capability cap) const;
- QPlatformWindow *createPlatformWindow(QWindow *window) const;
+ bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE;
+ QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE;
#ifndef QT_NO_OPENGL
- QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
+ QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
#endif
- QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
+ QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE;
- QAbstractEventDispatcher *createEventDispatcher() const;
- void initialize();
+ QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
+ void initialize() Q_DECL_OVERRIDE;
- QPlatformFontDatabase *fontDatabase() const;
+ QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
- QPlatformNativeInterface *nativeInterface() const;
+ QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
- QPlatformClipboard *clipboard() const;
+ QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
- QPlatformDrag *drag() const;
+ QPlatformDrag *drag() const Q_DECL_OVERRIDE;
- QPlatformInputContext *inputContext() const;
+ QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
- QVariant styleHint(StyleHint hint) const;
+ QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
- QPlatformAccessibility *accessibility() const;
+ QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
- QPlatformServices *services() const;
+ QPlatformServices *services() const Q_DECL_OVERRIDE;
QWaylandDisplay *display() const;
- QStringList themeNames() const;
+ QStringList themeNames() const Q_DECL_OVERRIDE;
- QPlatformTheme *createPlatformTheme(const QString &name) const;
+ QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE;
QWaylandInputDevice *createInputDevice(QWaylandDisplay *display, int version, uint32_t id);
diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h
index 7050f9758..b4cb8fcb4 100644
--- a/src/client/qwaylandnativeinterface_p.h
+++ b/src/client/qwaylandnativeinterface_p.h
@@ -61,17 +61,17 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeIn
{
public:
QWaylandNativeInterface(QWaylandIntegration *integration);
- void *nativeResourceForIntegration(const QByteArray &resource);
+ void *nativeResourceForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE;
void *nativeResourceForWindow(const QByteArray &resourceString,
- QWindow *window);
+ QWindow *window) Q_DECL_OVERRIDE;
void *nativeResourceForScreen(const QByteArray &resourceString,
- QScreen *screen);
- void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context);
+ QScreen *screen) Q_DECL_OVERRIDE;
+ void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) Q_DECL_OVERRIDE;
- QVariantMap windowProperties(QPlatformWindow *window) const;
- QVariant windowProperty(QPlatformWindow *window, const QString &name) const;
- QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const;
- void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value);
+ QVariantMap windowProperties(QPlatformWindow *window) const Q_DECL_OVERRIDE;
+ QVariant windowProperty(QPlatformWindow *window, const QString &name) const Q_DECL_OVERRIDE;
+ QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const Q_DECL_OVERRIDE;
+ void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
void emitWindowPropertyChanged(QPlatformWindow *window, const QString &name);
diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h
index e3e1515d4..5cc11e8c5 100644
--- a/src/client/qwaylandscreen_p.h
+++ b/src/client/qwaylandscreen_p.h
@@ -66,25 +66,25 @@ public:
void init();
QWaylandDisplay *display() const;
- QRect geometry() const;
- int depth() const;
- QImage::Format format() const;
+ QRect geometry() const Q_DECL_OVERRIDE;
+ int depth() const Q_DECL_OVERRIDE;
+ QImage::Format format() const Q_DECL_OVERRIDE;
QSizeF physicalSize() const Q_DECL_OVERRIDE;
QDpi logicalDpi() const Q_DECL_OVERRIDE;
QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE;
- void setOrientationUpdateMask(Qt::ScreenOrientations mask);
+ void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE;
- Qt::ScreenOrientation orientation() const;
+ Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
int scale() const;
qreal devicePixelRatio() const Q_DECL_OVERRIDE;
- qreal refreshRate() const;
+ qreal refreshRate() const Q_DECL_OVERRIDE;
- QString name() const { return mOutputName; }
+ QString name() const Q_DECL_OVERRIDE { return mOutputName; }
- QPlatformCursor *cursor() const;
+ QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
QWaylandCursor *waylandCursor() const { return mWaylandCursor; };
uint32_t outputId() const { return m_outputId; }
diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h
index 8b58c0b5e..8ad559187 100644
--- a/src/client/qwaylandshmbackingstore_p.h
+++ b/src/client/qwaylandshmbackingstore_p.h
@@ -66,7 +66,7 @@ public:
QWaylandShmBuffer(QWaylandDisplay *display,
const QSize &size, QImage::Format format, int scale = 1);
~QWaylandShmBuffer();
- QSize size() const { return mImage.size(); }
+ QSize size() const Q_DECL_OVERRIDE { return mImage.size(); }
int scale() const Q_DECL_OVERRIDE { return int(mImage.devicePixelRatio()); }
QImage *image() { return &mImage; }
@@ -85,11 +85,11 @@ public:
~QWaylandShmBackingStore();
QPaintDevice *paintDevice();
- void flush(QWindow *window, const QRegion &region, const QPoint &offset);
- void resize(const QSize &size, const QRegion &staticContents);
+ void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
+ void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
void resize(const QSize &size);
- void beginPaint(const QRegion &);
- void endPaint();
+ void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
+ void endPaint() Q_DECL_OVERRIDE;
void hidden();
QWaylandAbstractDecoration *windowDecoration() const;
diff --git a/src/client/qwaylandshmwindow_p.h b/src/client/qwaylandshmwindow_p.h
index a0a5edffd..ea903980d 100644
--- a/src/client/qwaylandshmwindow_p.h
+++ b/src/client/qwaylandshmwindow_p.h
@@ -58,8 +58,8 @@ public:
QWaylandShmWindow(QWindow *window);
~QWaylandShmWindow();
- WindowType windowType() const;
- QSurfaceFormat format() const { return QSurfaceFormat(); }
+ WindowType windowType() const Q_DECL_OVERRIDE;
+ QSurfaceFormat format() const Q_DECL_OVERRIDE { return QSurfaceFormat(); }
};
}
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 6e271cc10..c60891d49 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -104,16 +104,16 @@ public:
~QWaylandWindow();
virtual WindowType windowType() const = 0;
- WId winId() const;
- void setVisible(bool visible);
- void setParent(const QPlatformWindow *parent);
+ WId winId() const Q_DECL_OVERRIDE;
+ void setVisible(bool visible) Q_DECL_OVERRIDE;
+ void setParent(const QPlatformWindow *parent) Q_DECL_OVERRIDE;
- void setWindowTitle(const QString &title);
+ void setWindowTitle(const QString &title) Q_DECL_OVERRIDE;
inline QIcon windowIcon() const;
- void setWindowIcon(const QIcon &icon);
+ void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE;
- void setGeometry(const QRect &rect);
+ void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
void configure(uint32_t edges, int32_t width, int32_t height);
@@ -127,7 +127,7 @@ public:
void waitForFrameSync();
- QMargins frameMargins() const;
+ QMargins frameMargins() const Q_DECL_OVERRIDE;
static QWaylandWindow *fromWlSurface(::wl_surface *surface);
@@ -136,11 +136,11 @@ public:
QWaylandSubSurface *subSurfaceWindow() const;
QWaylandScreen *screen() const { return mScreen; }
- void handleContentOrientationChange(Qt::ScreenOrientation orientation);
+ void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE;
void setOrientationMask(Qt::ScreenOrientations mask);
- void setWindowState(Qt::WindowState state);
- void setWindowFlags(Qt::WindowFlags flags);
+ void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
+ void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
void raise() Q_DECL_OVERRIDE;
void lower() Q_DECL_OVERRIDE;
@@ -176,7 +176,7 @@ public:
void doResize();
void setCanResize(bool canResize);
- bool setMouseGrabEnabled(bool grab);
+ bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
static QWaylandWindow *mouseGrab() { return mMouseGrab; }
void sendProperty(const QString &name, const QVariant &value);
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h
index 73c1b29e8..7abad64db 100644
--- a/src/client/qwaylandwindowmanagerintegration_p.h
+++ b/src/client/qwaylandwindowmanagerintegration_p.h
@@ -71,10 +71,10 @@ public:
explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay);
virtual ~QWaylandWindowManagerIntegration();
- QByteArray desktopEnvironment() const;
+ QByteArray desktopEnvironment() const Q_DECL_OVERRIDE;
- bool openUrl(const QUrl &url);
- bool openDocument(const QUrl &url);
+ bool openUrl(const QUrl &url) Q_DECL_OVERRIDE;
+ bool openDocument(const QUrl &url) Q_DECL_OVERRIDE;
bool showIsFullScreen() const;