summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-11-27 11:00:50 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-11-29 15:29:28 +0000
commite3ad43843a6ddb20c901b6fba85c12fb0e6c5651 (patch)
tree9e620e82aebaa92766a9972b6557f580d8e257ae /src/plugins/platforms/android
parentc2446cb7df1466e9252f691567133295e4101c44 (diff)
Android: Add missing override
Change-Id: I70b802517d8f7d129ffb71dc3e92cb2458a55acc Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/platforms/android')
-rw-r--r--src/plugins/platforms/android/androidplatformplugin.cpp2
-rw-r--r--src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp34
-rw-r--r--src/plugins/platforms/android/qandroidassetsfileenginehandler.h2
-rw-r--r--src/plugins/platforms/android/qandroideventdispatcher.h2
-rw-r--r--src/plugins/platforms/android/qandroidinputcontext.h24
-rw-r--r--src/plugins/platforms/android/qandroidplatformaccessibility.h2
-rw-r--r--src/plugins/platforms/android/qandroidplatformbackingstore.h8
-rw-r--r--src/plugins/platforms/android/qandroidplatformclipboard.h6
-rw-r--r--src/plugins/platforms/android/qandroidplatformdialoghelpers.h8
-rw-r--r--src/plugins/platforms/android/qandroidplatformfontdatabase.h10
-rw-r--r--src/plugins/platforms/android/qandroidplatformintegration.h34
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenu.h28
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenubar.h10
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenuitem.h28
-rw-r--r--src/plugins/platforms/android/qandroidplatformopenglcontext.h6
-rw-r--r--src/plugins/platforms/android/qandroidplatformopenglwindow.h8
-rw-r--r--src/plugins/platforms/android/qandroidplatformscreen.h22
-rw-r--r--src/plugins/platforms/android/qandroidplatformservices.h6
-rw-r--r--src/plugins/platforms/android/qandroidplatformtheme.h18
-rw-r--r--src/plugins/platforms/android/qandroidplatformwindow.h22
-rw-r--r--src/plugins/platforms/android/qandroidsystemlocale.h4
21 files changed, 142 insertions, 142 deletions
diff --git a/src/plugins/platforms/android/androidplatformplugin.cpp b/src/plugins/platforms/android/androidplatformplugin.cpp
index 8e365e9a59..297e167f47 100644
--- a/src/plugins/platforms/android/androidplatformplugin.cpp
+++ b/src/plugins/platforms/android/androidplatformplugin.cpp
@@ -47,7 +47,7 @@ class QAndroidPlatformIntegrationPlugin: public QPlatformIntegrationPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json")
public:
- QPlatformIntegration *create(const QString &key, const QStringList &paramList);
+ QPlatformIntegration *create(const QString &key, const QStringList &paramList) override;
};
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
index 7e8e1ba9c5..e1dcebfa4c 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
@@ -75,12 +75,12 @@ public:
m_path = path;
}
- virtual QFileInfo currentFileInfo() const
+ QFileInfo currentFileInfo() const override
{
return QFileInfo(currentFilePath());
}
- virtual QString currentFileName() const
+ QString currentFileName() const override
{
if (m_index < 0 || m_index >= m_items.size())
return QString();
@@ -95,12 +95,12 @@ public:
return m_path + currentFileName();
}
- virtual bool hasNext() const
+ bool hasNext() const override
{
return m_items.size() && (m_index < m_items.size() - 1);
}
- virtual QString next()
+ QString next() override
{
if (!hasNext())
return QString();
@@ -137,12 +137,12 @@ public:
close();
}
- virtual bool open(QIODevice::OpenMode openMode)
+ bool open(QIODevice::OpenMode openMode) override
{
return m_assetFile != 0 && (openMode & QIODevice::WriteOnly) == 0;
}
- virtual bool close()
+ bool close() override
{
if (m_assetFile) {
AAsset_close(m_assetFile);
@@ -152,50 +152,50 @@ public:
return false;
}
- virtual qint64 size() const
+ qint64 size() const override
{
if (m_assetFile)
return AAsset_getLength(m_assetFile);
return -1;
}
- virtual qint64 pos() const
+ qint64 pos() const override
{
if (m_assetFile)
return AAsset_seek(m_assetFile, 0, SEEK_CUR);
return -1;
}
- virtual bool seek(qint64 pos)
+ bool seek(qint64 pos) override
{
if (m_assetFile)
return pos == AAsset_seek(m_assetFile, pos, SEEK_SET);
return false;
}
- virtual qint64 read(char *data, qint64 maxlen)
+ qint64 read(char *data, qint64 maxlen) override
{
if (m_assetFile)
return AAsset_read(m_assetFile, data, maxlen);
return -1;
}
- virtual bool isSequential() const
+ bool isSequential() const override
{
return false;
}
- virtual bool caseSensitive() const
+ bool caseSensitive() const override
{
return true;
}
- virtual bool isRelativePath() const
+ bool isRelativePath() const override
{
return false;
}
- virtual FileFlags fileFlags(FileFlags type = FileInfoAll) const
+ FileFlags fileFlags(FileFlags type = FileInfoAll) const override
{
FileFlags flags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag);
if (m_assetFile)
@@ -206,7 +206,7 @@ public:
return type & flags;
}
- virtual QString fileName(FileName file = DefaultName) const
+ QString fileName(FileName file = DefaultName) const override
{
int pos;
switch (file) {
@@ -231,7 +231,7 @@ public:
}
}
- virtual void setFileName(const QString &file)
+ void setFileName(const QString &file) override
{
if (file == m_fileName)
return;
@@ -243,7 +243,7 @@ public:
close();
}
- virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames)
+ Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
{
if (!m_assetDir.isNull())
return new AndroidAbstractFileEngineIterator(filters, filterNames, m_assetDir, m_fileName);
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.h b/src/plugins/platforms/android/qandroidassetsfileenginehandler.h
index b09d8090a4..f99dc9a11a 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.h
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.h
@@ -55,7 +55,7 @@ class AndroidAssetsFileEngineHandler: public QAbstractFileEngineHandler
public:
AndroidAssetsFileEngineHandler();
virtual ~AndroidAssetsFileEngineHandler();
- QAbstractFileEngine *create(const QString &fileName) const;
+ QAbstractFileEngine *create(const QString &fileName) const override;
private:
void prepopulateCache() const;
diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h
index 86a7e460b3..057a1660c9 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.h
+++ b/src/plugins/platforms/android/qandroideventdispatcher.h
@@ -56,7 +56,7 @@ public:
void goingToStop(bool stop);
protected:
- bool processEvents(QEventLoop::ProcessEventsFlags flags);
+ bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
private:
QAtomicInt m_stopRequest;
diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h
index 8a33ff71cc..ce0ec8724c 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.h
+++ b/src/plugins/platforms/android/qandroidinputcontext.h
@@ -80,21 +80,21 @@ public:
QAndroidInputContext();
~QAndroidInputContext();
static QAndroidInputContext * androidInputContext();
- bool isValid() const { return true; }
-
- void reset();
- void commit();
- void update(Qt::InputMethodQueries queries);
- void invokeAction(QInputMethod::Action action, int cursorPosition);
- QRectF keyboardRect() const;
- bool isAnimating() const;
- void showInputPanel();
- void hideInputPanel();
- bool isInputPanelVisible() const;
+ bool isValid() const override { return true; }
+
+ void reset() override;
+ void commit() override;
+ void update(Qt::InputMethodQueries queries) override;
+ void invokeAction(QInputMethod::Action action, int cursorPosition) override;
+ QRectF keyboardRect() const override;
+ bool isAnimating() const override;
+ void showInputPanel() override;
+ void hideInputPanel() override;
+ bool isInputPanelVisible() const override;
bool isComposing() const;
void clear();
- void setFocusObject(QObject *object);
+ void setFocusObject(QObject *object) override;
void sendShortcut(const QKeySequence &);
//---------------//
diff --git a/src/plugins/platforms/android/qandroidplatformaccessibility.h b/src/plugins/platforms/android/qandroidplatformaccessibility.h
index 3a428ca1ad..8216c05fa6 100644
--- a/src/plugins/platforms/android/qandroidplatformaccessibility.h
+++ b/src/plugins/platforms/android/qandroidplatformaccessibility.h
@@ -51,7 +51,7 @@ public:
QAndroidPlatformAccessibility();
~QAndroidPlatformAccessibility();
- virtual void notifyAccessibilityUpdate(QAccessibleEvent *event);
+ void notifyAccessibilityUpdate(QAccessibleEvent *event) override;
};
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.h b/src/plugins/platforms/android/qandroidplatformbackingstore.h
index e4a161d608..a3a65aa30e 100644
--- a/src/plugins/platforms/android/qandroidplatformbackingstore.h
+++ b/src/plugins/platforms/android/qandroidplatformbackingstore.h
@@ -50,10 +50,10 @@ class QAndroidPlatformBackingStore : public QPlatformBackingStore
{
public:
explicit QAndroidPlatformBackingStore(QWindow *window);
- virtual QPaintDevice *paintDevice();
- virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset);
- virtual void resize(const QSize &size, const QRegion &staticContents);
- QImage toImage() const { return m_image; }
+ QPaintDevice *paintDevice() override;
+ void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
+ void resize(const QSize &size, const QRegion &staticContents) override;
+ QImage toImage() const override { return m_image; }
void setBackingStore(QWindow *window);
protected:
QImage m_image;
diff --git a/src/plugins/platforms/android/qandroidplatformclipboard.h b/src/plugins/platforms/android/qandroidplatformclipboard.h
index 47976c1693..dfc3629c10 100644
--- a/src/plugins/platforms/android/qandroidplatformclipboard.h
+++ b/src/plugins/platforms/android/qandroidplatformclipboard.h
@@ -51,9 +51,9 @@ class QAndroidPlatformClipboard: public QPlatformClipboard
public:
QAndroidPlatformClipboard();
- virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard);
- virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard);
- virtual bool supportsMode(QClipboard::Mode mode) const;
+ QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
+ void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override;
+ bool supportsMode(QClipboard::Mode mode) const override;
private:
QMimeData m_mimeData;
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.h b/src/plugins/platforms/android/qandroidplatformdialoghelpers.h
index 5c3aef2bc1..694b4c7580 100644
--- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.h
+++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.h
@@ -53,11 +53,11 @@ class QAndroidPlatformMessageDialogHelper: public QPlatformMessageDialogHelper
Q_OBJECT
public:
QAndroidPlatformMessageDialogHelper();
- void exec();
+ void exec() override;
bool show(Qt::WindowFlags windowFlags,
- Qt::WindowModality windowModality,
- QWindow *parent);
- void hide();
+ Qt::WindowModality windowModality,
+ QWindow *parent) override;
+ void hide() override;
public slots:
void dialogResult(int buttonID);
diff --git a/src/plugins/platforms/android/qandroidplatformfontdatabase.h b/src/plugins/platforms/android/qandroidplatformfontdatabase.h
index b20fd75cb2..533d6e50a9 100644
--- a/src/plugins/platforms/android/qandroidplatformfontdatabase.h
+++ b/src/plugins/platforms/android/qandroidplatformfontdatabase.h
@@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE
class QAndroidPlatformFontDatabase: public QBasicFontDatabase
{
public:
- QString fontDir() const;
- void populateFontDatabase();
+ QString fontDir() const override;
+ void populateFontDatabase() override;
QStringList fallbacksForFamily(const QString &family,
- QFont::Style style,
- QFont::StyleHint styleHint,
- QChar::Script script) const;
+ QFont::Style style,
+ QFont::StyleHint styleHint,
+ QChar::Script script) const override;
};
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.h b/src/plugins/platforms/android/qandroidplatformintegration.h
index bda0bee9ad..2337801250 100644
--- a/src/plugins/platforms/android/qandroidplatformintegration.h
+++ b/src/plugins/platforms/android/qandroidplatformintegration.h
@@ -63,7 +63,7 @@ struct AndroidStyle;
class QAndroidPlatformNativeInterface: public QPlatformNativeInterface
{
public:
- void *nativeResourceForIntegration(const QByteArray &resource);
+ void *nativeResourceForIntegration(const QByteArray &resource) override;
std::shared_ptr<AndroidStyle> m_androidStyle;
};
@@ -75,39 +75,39 @@ public:
QAndroidPlatformIntegration(const QStringList &paramList);
~QAndroidPlatformIntegration();
- bool hasCapability(QPlatformIntegration::Capability cap) const;
+ bool hasCapability(QPlatformIntegration::Capability cap) const override;
- QPlatformWindow *createPlatformWindow(QWindow *window) const;
- QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
- QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
- QAbstractEventDispatcher *createEventDispatcher() const;
+ QPlatformWindow *createPlatformWindow(QWindow *window) const override;
+ QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
+ QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
+ QAbstractEventDispatcher *createEventDispatcher() const override;
QAndroidPlatformScreen *screen() { return m_primaryScreen; }
- QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const;
+ QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
virtual void setDesktopSize(int width, int height);
virtual void setDisplayMetrics(int width, int height);
void setScreenSize(int width, int height);
bool isVirtualDesktop() { return true; }
- QPlatformFontDatabase *fontDatabase() const;
+ QPlatformFontDatabase *fontDatabase() const override;
#ifndef QT_NO_CLIPBOARD
- QPlatformClipboard *clipboard() const;
+ QPlatformClipboard *clipboard() const override;
#endif
- QPlatformInputContext *inputContext() const;
- QPlatformNativeInterface *nativeInterface() const;
- QPlatformServices *services() const;
+ QPlatformInputContext *inputContext() const override;
+ QPlatformNativeInterface *nativeInterface() const override;
+ QPlatformServices *services() const override;
#ifndef QT_NO_ACCESSIBILITY
- virtual QPlatformAccessibility *accessibility() const;
+ virtual QPlatformAccessibility *accessibility() const override;
#endif
- QVariant styleHint(StyleHint hint) const;
- Qt::WindowState defaultWindowState(Qt::WindowFlags flags) const;
+ QVariant styleHint(StyleHint hint) const override;
+ Qt::WindowState defaultWindowState(Qt::WindowFlags flags) const override;
- QStringList themeNames() const;
- QPlatformTheme *createPlatformTheme(const QString &name) const;
+ QStringList themeNames() const override;
+ QPlatformTheme *createPlatformTheme(const QString &name) const override;
static void setDefaultDisplayMetrics(int gw, int gh, int sw, int sh, int width, int height);
static void setDefaultDesktopSize(int gw, int gh);
diff --git a/src/plugins/platforms/android/qandroidplatformmenu.h b/src/plugins/platforms/android/qandroidplatformmenu.h
index cb1b431d31..00968672c5 100644
--- a/src/plugins/platforms/android/qandroidplatformmenu.h
+++ b/src/plugins/platforms/android/qandroidplatformmenu.h
@@ -56,25 +56,25 @@ public:
QAndroidPlatformMenu();
~QAndroidPlatformMenu();
- void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before);
- void removeMenuItem(QPlatformMenuItem *menuItem);
- void syncMenuItem(QPlatformMenuItem *menuItem);
- void syncSeparatorsCollapsible(bool enable);
+ void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override;
+ void removeMenuItem(QPlatformMenuItem *menuItem) override;
+ void syncMenuItem(QPlatformMenuItem *menuItem) override;
+ void syncSeparatorsCollapsible(bool enable) override;
- void setTag(quintptr tag);
- quintptr tag() const;
- void setText(const QString &text);
+ void setTag(quintptr tag) override;
+ quintptr tag() const override;
+ void setText(const QString &text) override;
QString text() const;
- void setIcon(const QIcon &icon);
+ void setIcon(const QIcon &icon) override;
QIcon icon() const;
- void setEnabled(bool enabled);
- bool isEnabled() const;
- void setVisible(bool visible);
+ void setEnabled(bool enabled) override;
+ bool isEnabled() const override;
+ void setVisible(bool visible) override;
bool isVisible() const;
- void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item);
+ void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override;
- QPlatformMenuItem *menuItemAt(int position) const;
- QPlatformMenuItem *menuItemForTag(quintptr tag) const;
+ QPlatformMenuItem *menuItemAt(int position) const override;
+ QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
PlatformMenuItemsType menuItems() const;
QMutex *menuItemsMutex();
diff --git a/src/plugins/platforms/android/qandroidplatformmenubar.h b/src/plugins/platforms/android/qandroidplatformmenubar.h
index d98d02d5de..0316ea9362 100644
--- a/src/plugins/platforms/android/qandroidplatformmenubar.h
+++ b/src/plugins/platforms/android/qandroidplatformmenubar.h
@@ -55,11 +55,11 @@ public:
QAndroidPlatformMenuBar();
~QAndroidPlatformMenuBar();
- void insertMenu(QPlatformMenu *menu, QPlatformMenu *before);
- void removeMenu(QPlatformMenu *menu);
- void syncMenu(QPlatformMenu *menu);
- void handleReparent(QWindow *newParentWindow);
- QPlatformMenu *menuForTag(quintptr tag) const;
+ void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override;
+ void removeMenu(QPlatformMenu *menu) override;
+ void syncMenu(QPlatformMenu *menu) override;
+ void handleReparent(QWindow *newParentWindow) override;
+ QPlatformMenu *menuForTag(quintptr tag) const override;
QWindow *parentWindow() const;
PlatformMenusType menus() const;
diff --git a/src/plugins/platforms/android/qandroidplatformmenuitem.h b/src/plugins/platforms/android/qandroidplatformmenuitem.h
index e843c9eedc..be5240cfa6 100644
--- a/src/plugins/platforms/android/qandroidplatformmenuitem.h
+++ b/src/plugins/platforms/android/qandroidplatformmenuitem.h
@@ -49,41 +49,41 @@ class QAndroidPlatformMenuItem: public QPlatformMenuItem
{
public:
QAndroidPlatformMenuItem();
- void setTag(quintptr tag);
- quintptr tag() const;
+ void setTag(quintptr tag) override;
+ quintptr tag() const override;
- void setText(const QString &text);
+ void setText(const QString &text) override;
QString text() const;
- void setIcon(const QIcon &icon);
+ void setIcon(const QIcon &icon) override;
QIcon icon() const;
- void setMenu(QPlatformMenu *menu);
+ void setMenu(QPlatformMenu *menu) override;
QAndroidPlatformMenu *menu() const;
- void setVisible(bool isVisible);
+ void setVisible(bool isVisible) override;
bool isVisible() const;
- void setIsSeparator(bool isSeparator);
+ void setIsSeparator(bool isSeparator) override;
bool isSeparator() const;
- void setFont(const QFont &font);
+ void setFont(const QFont &font) override;
- void setRole(MenuRole role);
+ void setRole(MenuRole role) override;
MenuRole role() const;
- void setCheckable(bool checkable);
+ void setCheckable(bool checkable) override;
bool isCheckable() const;
- void setChecked(bool isChecked);
+ void setChecked(bool isChecked) override;
bool isChecked() const;
- void setShortcut(const QKeySequence &shortcut);
+ void setShortcut(const QKeySequence &shortcut) override;
- void setEnabled(bool enabled);
+ void setEnabled(bool enabled) override;
bool isEnabled() const;
- void setIconSize(int size);
+ void setIconSize(int size) override;
private:
quintptr m_tag;
diff --git a/src/plugins/platforms/android/qandroidplatformopenglcontext.h b/src/plugins/platforms/android/qandroidplatformopenglcontext.h
index d3f6cf13a4..87a0829655 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglcontext.h
+++ b/src/plugins/platforms/android/qandroidplatformopenglcontext.h
@@ -49,11 +49,11 @@ class QAndroidPlatformOpenGLContext : public QEGLPlatformContext
{
public:
QAndroidPlatformOpenGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display);
- void swapBuffers(QPlatformSurface *surface);
- bool makeCurrent(QPlatformSurface *surface);
+ void swapBuffers(QPlatformSurface *surface) override;
+ bool makeCurrent(QPlatformSurface *surface) override;
private:
- virtual EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface);
+ EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override;
static bool needsFBOReadBackWorkaround();
};
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.h b/src/plugins/platforms/android/qandroidplatformopenglwindow.h
index c7cb881973..12e86b3db4 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.h
@@ -56,18 +56,18 @@ public:
explicit QAndroidPlatformOpenGLWindow(QWindow *window, EGLDisplay display);
~QAndroidPlatformOpenGLWindow();
- void setGeometry(const QRect &rect);
+ void setGeometry(const QRect &rect) override;
EGLSurface eglSurface(EGLConfig config);
- QSurfaceFormat format() const;
+ QSurfaceFormat format() const override;
bool checkNativeSurface(EGLConfig config);
- void applicationStateChanged(Qt::ApplicationState);
+ void applicationStateChanged(Qt::ApplicationState) override;
void repaint(const QRegion &region) Q_DECL_OVERRIDE;
protected:
- virtual void surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h);
+ void surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h) override;
void createEgl(EGLConfig config);
void clearEgl();
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h
index 6e601d5f87..923c9e8832 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -63,14 +63,14 @@ public:
QAndroidPlatformScreen();
~QAndroidPlatformScreen();
- QRect geometry() const { return QRect(QPoint(), m_size); }
- QRect availableGeometry() const { return m_availableGeometry; }
- int depth() const { return m_depth; }
- QImage::Format format() const { return m_format; }
- QSizeF physicalSize() const { return m_physicalSize; }
+ QRect geometry() const override { return QRect(QPoint(), m_size); }
+ QRect availableGeometry() const override { return m_availableGeometry; }
+ int depth() const override { return m_depth; }
+ QImage::Format format() const override { return m_format; }
+ QSizeF physicalSize() const override { return m_physicalSize; }
inline QWindow *topWindow() const;
- QWindow *topLevelAt(const QPoint & p) const;
+ QWindow *topLevelAt(const QPoint & p) const override;
// compositor api
void addWindow(QAndroidPlatformWindow *window);
@@ -100,11 +100,11 @@ protected:
QSizeF m_physicalSize;
private:
- QDpi logicalDpi() const;
- qreal pixelDensity() const;
- Qt::ScreenOrientation orientation() const;
- Qt::ScreenOrientation nativeOrientation() const;
- void surfaceChanged(JNIEnv *env, jobject surface, int w, int h);
+ QDpi logicalDpi() const override;
+ qreal pixelDensity() const override;
+ Qt::ScreenOrientation orientation() const override;
+ Qt::ScreenOrientation nativeOrientation() const override;
+ void surfaceChanged(JNIEnv *env, jobject surface, int w, int h) override;
void releaseSurface();
void applicationStateChanged(Qt::ApplicationState);
diff --git a/src/plugins/platforms/android/qandroidplatformservices.h b/src/plugins/platforms/android/qandroidplatformservices.h
index 5cdc3e95b2..6f2f0a394f 100644
--- a/src/plugins/platforms/android/qandroidplatformservices.h
+++ b/src/plugins/platforms/android/qandroidplatformservices.h
@@ -49,9 +49,9 @@ class QAndroidPlatformServices: public QPlatformServices
{
public:
QAndroidPlatformServices();
- bool openUrl(const QUrl &url);
- bool openDocument(const QUrl &url);
- QByteArray desktopEnvironment() const;
+ bool openUrl(const QUrl &url) override;
+ bool openDocument(const QUrl &url) override;
+ QByteArray desktopEnvironment() const override;
};
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h
index b4d8fa35b1..7405c3cdbd 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.h
+++ b/src/plugins/platforms/android/qandroidplatformtheme.h
@@ -65,16 +65,16 @@ class QAndroidPlatformTheme: public QPlatformTheme
{
public:
QAndroidPlatformTheme(QAndroidPlatformNativeInterface * androidPlatformNativeInterface);
- virtual QPlatformMenuBar *createPlatformMenuBar() const;
- virtual QPlatformMenu *createPlatformMenu() const;
- virtual QPlatformMenuItem *createPlatformMenuItem() const;
- virtual void showPlatformMenuBar();
- virtual const QPalette *palette(Palette type = SystemPalette) const;
- virtual const QFont *font(Font type = SystemFont) const;
- virtual QVariant themeHint(ThemeHint hint) const;
+ QPlatformMenuBar *createPlatformMenuBar() const override;
+ QPlatformMenu *createPlatformMenu() const override;
+ QPlatformMenuItem *createPlatformMenuItem() const override;
+ void showPlatformMenuBar() override;
+ const QPalette *palette(Palette type = SystemPalette) const override;
+ const QFont *font(Font type = SystemFont) const override;
+ QVariant themeHint(ThemeHint hint) const override;
QString standardButtonText(int button) const Q_DECL_OVERRIDE;
- virtual bool usePlatformNativeDialog(DialogType type) const;
- virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
+ bool usePlatformNativeDialog(DialogType type) const override;
+ QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;
private:
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h
index 8d69532d08..87e5cbaa4f 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformwindow.h
@@ -54,21 +54,21 @@ class QAndroidPlatformWindow: public QPlatformWindow
public:
explicit QAndroidPlatformWindow(QWindow *window);
- void lower();
- void raise();
+ void lower() override;
+ void raise() override;
- void setVisible(bool visible);
+ void setVisible(bool visible) override;
- void setWindowState(Qt::WindowState state);
- void setWindowFlags(Qt::WindowFlags flags);
+ void setWindowState(Qt::WindowState state) override;
+ void setWindowFlags(Qt::WindowFlags flags) override;
Qt::WindowFlags windowFlags() const;
- void setParent(const QPlatformWindow *window);
- WId winId() const { return m_windowId; }
+ void setParent(const QPlatformWindow *window) override;
+ WId winId() const override { return m_windowId; }
QAndroidPlatformScreen *platformScreen() const;
- void propagateSizeHints();
- void requestActivateWindow();
+ void propagateSizeHints() override;
+ void requestActivateWindow() override;
void updateStatusBarVisibility();
inline bool isRaster() const {
if ((window()->flags() & Qt::ForeignWindow) == Qt::ForeignWindow)
@@ -77,7 +77,7 @@ public:
return window()->surfaceType() == QSurface::RasterSurface
|| window()->surfaceType() == QSurface::RasterGLSurface;
}
- bool isExposed() const;
+ bool isExposed() const override;
virtual void applicationStateChanged(Qt::ApplicationState);
@@ -87,7 +87,7 @@ public:
virtual void repaint(const QRegion &) { }
protected:
- void setGeometry(const QRect &rect);
+ void setGeometry(const QRect &rect) override;
protected:
Qt::WindowFlags m_windowFlags;
diff --git a/src/plugins/platforms/android/qandroidsystemlocale.h b/src/plugins/platforms/android/qandroidsystemlocale.h
index 26af1ee51d..bc96d2e8f6 100644
--- a/src/plugins/platforms/android/qandroidsystemlocale.h
+++ b/src/plugins/platforms/android/qandroidsystemlocale.h
@@ -50,8 +50,8 @@ class QAndroidSystemLocale : public QSystemLocale
public:
QAndroidSystemLocale();
- virtual QVariant query(QueryType type, QVariant in) const;
- virtual QLocale fallbackUiLocale() const;
+ QVariant query(QueryType type, QVariant in) const override;
+ QLocale fallbackUiLocale() const override;
private:
void getLocaleFromJava() const;