From 5f276d7a5ff961568d69c3d94232527342728027 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Fri, 24 Jul 2015 11:37:42 +0200 Subject: iOS: add missing Q_DECL_OVERRIDE Add missing Q_DECL_OVERRIDE to silence clang. Change-Id: I57261a39f0dcf4e0ffd8d9c079a95f2d3347d34a Reviewed-by: Jake Petroules --- src/plugins/platforms/ios/qioscontext.h | 12 +++++----- .../platforms/ios/qiosfileengineassetslibrary.mm | 2 +- src/plugins/platforms/ios/qiosintegration.h | 26 +++++++++++----------- src/plugins/platforms/ios/qiosmenu.h | 2 +- src/plugins/platforms/ios/qiosscreen.h | 20 ++++++++--------- src/plugins/platforms/ios/qiostheme.h | 4 ++-- src/plugins/platforms/ios/qioswindow.h | 24 ++++++++++---------- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/plugins/platforms/ios/qioscontext.h b/src/plugins/platforms/ios/qioscontext.h index e550efe7c3..ec678fee44 100644 --- a/src/plugins/platforms/ios/qioscontext.h +++ b/src/plugins/platforms/ios/qioscontext.h @@ -50,15 +50,15 @@ public: QIOSContext(QOpenGLContext *context); ~QIOSContext(); - QSurfaceFormat format() const; + QSurfaceFormat format() const Q_DECL_OVERRIDE; - void swapBuffers(QPlatformSurface *surface); + void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; - bool makeCurrent(QPlatformSurface *surface); - void doneCurrent(); + bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void doneCurrent() Q_DECL_OVERRIDE; - GLuint defaultFramebufferObject(QPlatformSurface *) const; - QFunctionPointer getProcAddress(const QByteArray &procName); + GLuint defaultFramebufferObject(QPlatformSurface *) const Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const QByteArray &procName) Q_DECL_OVERRIDE; bool isSharing() const Q_DECL_OVERRIDE; bool isValid() const Q_DECL_OVERRIDE; diff --git a/src/plugins/platforms/ios/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/qiosfileengineassetslibrary.mm index f0b6afce2d..761a89c989 100644 --- a/src/plugins/platforms/ios/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/qiosfileengineassetslibrary.mm @@ -304,7 +304,7 @@ public: return g_iteratorCurrentUrl.localData(); } - QFileInfo currentFileInfo() const + QFileInfo currentFileInfo() const Q_DECL_OVERRIDE { return QFileInfo(currentFileName()); } diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h index 0fe318dce7..7d23fe1d62 100644 --- a/src/plugins/platforms/ios/qiosintegration.h +++ b/src/plugins/platforms/ios/qiosintegration.h @@ -54,26 +54,26 @@ public: QIOSIntegration(); ~QIOSIntegration(); - bool hasCapability(Capability cap) const; + bool hasCapability(Capability cap) const Q_DECL_OVERRIDE; - QPlatformWindow *createPlatformWindow(QWindow *window) const; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; + QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE; - QPlatformFontDatabase *fontDatabase() const; - QPlatformClipboard *clipboard() const; - QPlatformInputContext *inputContext() const; + QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; + QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; QPlatformServices *services() const Q_DECL_OVERRIDE; - QVariant styleHint(StyleHint hint) const; + QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; - QStringList themeNames() const; - QPlatformTheme *createPlatformTheme(const QString &name) const; + QStringList themeNames() const Q_DECL_OVERRIDE; + QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const; - QPlatformNativeInterface *nativeInterface() const; + QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; QTouchDevice *touchDevice(); QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; @@ -86,7 +86,7 @@ public: // -- QPlatformNativeInterface -- - void *nativeResourceForWindow(const QByteArray &resource, QWindow *window); + void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) Q_DECL_OVERRIDE; void setDebugWindowManagement(bool); bool debugWindowManagement() const; diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h index 15f200bb27..4fa0416df7 100644 --- a/src/plugins/platforms/ios/qiosmenu.h +++ b/src/plugins/platforms/ios/qiosmenu.h @@ -112,7 +112,7 @@ public: static id menuActionTarget() { return m_currentMenu ? m_currentMenu->m_menuController : 0; } protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; private: quintptr m_tag; diff --git a/src/plugins/platforms/ios/qiosscreen.h b/src/plugins/platforms/ios/qiosscreen.h index a638210c00..a0aa922a31 100644 --- a/src/plugins/platforms/ios/qiosscreen.h +++ b/src/plugins/platforms/ios/qiosscreen.h @@ -50,17 +50,17 @@ public: QIOSScreen(UIScreen *screen); ~QIOSScreen(); - QRect geometry() const; - QRect availableGeometry() const; - int depth() const; - QImage::Format format() const; - QSizeF physicalSize() const; - QDpi logicalDpi() const; - qreal devicePixelRatio() const; + QRect geometry() const Q_DECL_OVERRIDE; + QRect availableGeometry() 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; + qreal devicePixelRatio() const Q_DECL_OVERRIDE; - Qt::ScreenOrientation nativeOrientation() const; - Qt::ScreenOrientation orientation() const; - void setOrientationUpdateMask(Qt::ScreenOrientations mask); + Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE; + Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; + void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE; UIScreen *uiScreen() const; UIWindow *uiWindow() const; diff --git a/src/plugins/platforms/ios/qiostheme.h b/src/plugins/platforms/ios/qiostheme.h index 9ef179b4dc..58144cb239 100644 --- a/src/plugins/platforms/ios/qiostheme.h +++ b/src/plugins/platforms/ios/qiostheme.h @@ -47,7 +47,7 @@ public: ~QIOSTheme(); const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; - QVariant themeHint(ThemeHint hint) const; + QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE; @@ -55,7 +55,7 @@ public: bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE; QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE; - const QFont *font(Font type = SystemFont) const; + const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; static const char *name; diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h index c53eee1afd..0c65cf8aa5 100644 --- a/src/plugins/platforms/ios/qioswindow.h +++ b/src/plugins/platforms/ios/qioswindow.h @@ -54,29 +54,29 @@ public: explicit QIOSWindow(QWindow *window); ~QIOSWindow(); - void setGeometry(const QRect &rect); + void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - void setWindowState(Qt::WindowState state); - void setParent(const QPlatformWindow *window); - void handleContentOrientationChange(Qt::ScreenOrientation orientation); - void setVisible(bool visible); + void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE; + void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE; + void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE; + void setVisible(bool visible) Q_DECL_OVERRIDE; void setOpacity(qreal level) Q_DECL_OVERRIDE; bool isExposed() const Q_DECL_OVERRIDE; void propagateSizeHints() Q_DECL_OVERRIDE {} - void raise() { raiseOrLower(true); } - void lower() { raiseOrLower(false); } + void raise() Q_DECL_OVERRIDE{ raiseOrLower(true); } + void lower() Q_DECL_OVERRIDE { raiseOrLower(false); } bool shouldAutoActivateWindow() const; - void requestActivateWindow(); + void requestActivateWindow() Q_DECL_OVERRIDE; - qreal devicePixelRatio() const; + qreal devicePixelRatio() const Q_DECL_OVERRIDE; - bool setMouseGrabEnabled(bool grab) { return grab; } - bool setKeyboardGrabEnabled(bool grab) { return grab; } + bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE { return grab; } + bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE { return grab; } - WId winId() const { return WId(m_view); }; + WId winId() const Q_DECL_OVERRIDE { return WId(m_view); } void clearAccessibleCache(); -- cgit v1.2.3