1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Add missing override

Browse Source 
Change-Id: I70b802517d8f7d129ffb71dc3e92cb2458a55acc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Alexander Volkov 2016-11-27 11:00:50 +03:00
parent c2446cb7df
commit e3ad43843a
21 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/android/androidplatformplugin.cpp
View File

@ -47,7 +47,7 @@ class QAndroidPlatformIntegrationPlugin: public QPlatformIntegrationPlugin
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json") Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json")
public: public:
QPlatformIntegration *create(const QString &key, const QStringList &paramList); QPlatformIntegration *create(const QString &key, const QStringList &paramList) override;
}; };

34
src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
View File

@ -75,12 +75,12 @@ public:
m_path = path; m_path = path;
} }
virtual QFileInfo currentFileInfo() const QFileInfo currentFileInfo() const override
{ {
return QFileInfo(currentFilePath()); return QFileInfo(currentFilePath());
} }
virtual QString currentFileName() const QString currentFileName() const override
{ {
if (m_index < 0 || m_index >= m_items.size()) if (m_index < 0 || m_index >= m_items.size())
return QString(); return QString();
@ -95,12 +95,12 @@ public:
return m_path + currentFileName(); return m_path + currentFileName();
} }
virtual bool hasNext() const bool hasNext() const override
{ {
return m_items.size() && (m_index < m_items.size() - 1); return m_items.size() && (m_index < m_items.size() - 1);
} }
virtual QString next() QString next() override
{ {
if (!hasNext()) if (!hasNext())
return QString(); return QString();
@ -137,12 +137,12 @@ public:
close(); close();
} }
virtual bool open(QIODevice::OpenMode openMode) bool open(QIODevice::OpenMode openMode) override
{ {
return m_assetFile != 0 && (openMode & QIODevice::WriteOnly) == 0; return m_assetFile != 0 && (openMode & QIODevice::WriteOnly) == 0;
} }
virtual bool close() bool close() override
{ {
if (m_assetFile) { if (m_assetFile) {
AAsset_close(m_assetFile); AAsset_close(m_assetFile);
@ -152,50 +152,50 @@ public:
return false; return false;
} }
virtual qint64 size() const qint64 size() const override
{ {
if (m_assetFile) if (m_assetFile)
return AAsset_getLength(m_assetFile); return AAsset_getLength(m_assetFile);
return -1; return -1;
} }
virtual qint64 pos() const qint64 pos() const override
{ {
if (m_assetFile) if (m_assetFile)
return AAsset_seek(m_assetFile, 0, SEEK_CUR); return AAsset_seek(m_assetFile, 0, SEEK_CUR);
return -1; return -1;
} }
virtual bool seek(qint64 pos) bool seek(qint64 pos) override
{ {
if (m_assetFile) if (m_assetFile)
return pos == AAsset_seek(m_assetFile, pos, SEEK_SET); return pos == AAsset_seek(m_assetFile, pos, SEEK_SET);
return false; return false;
} }
virtual qint64 read(char *data, qint64 maxlen) qint64 read(char *data, qint64 maxlen) override
{ {
if (m_assetFile) if (m_assetFile)
return AAsset_read(m_assetFile, data, maxlen); return AAsset_read(m_assetFile, data, maxlen);
return -1; return -1;
} }
virtual bool isSequential() const bool isSequential() const override
{ {
return false; return false;
} }
virtual bool caseSensitive() const bool caseSensitive() const override
{ {
return true; return true;
} }
virtual bool isRelativePath() const bool isRelativePath() const override
{ {
return false; return false;
} }
virtual FileFlags fileFlags(FileFlags type = FileInfoAll) const FileFlags fileFlags(FileFlags type = FileInfoAll) const override
{ {
FileFlags flags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag); FileFlags flags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag);
if (m_assetFile) if (m_assetFile)
@ -206,7 +206,7 @@ public:
return type & flags; return type & flags;
} }
virtual QString fileName(FileName file = DefaultName) const QString fileName(FileName file = DefaultName) const override
{ {
int pos; int pos;
switch (file) { switch (file) {
@ -231,7 +231,7 @@ public:
} }
} }
virtual void setFileName(const QString &file) void setFileName(const QString &file) override
{ {
if (file == m_fileName) if (file == m_fileName)
return; return;
@ -243,7 +243,7 @@ public:
close(); close();
} }
virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override
{ {
if (!m_assetDir.isNull()) if (!m_assetDir.isNull())
return new AndroidAbstractFileEngineIterator(filters, filterNames, m_assetDir, m_fileName); return new AndroidAbstractFileEngineIterator(filters, filterNames, m_assetDir, m_fileName);

2
src/plugins/platforms/android/qandroidassetsfileenginehandler.h
View File

@ -55,7 +55,7 @@ class AndroidAssetsFileEngineHandler: public QAbstractFileEngineHandler
public: public:
AndroidAssetsFileEngineHandler(); AndroidAssetsFileEngineHandler();
virtual ~AndroidAssetsFileEngineHandler(); virtual ~AndroidAssetsFileEngineHandler();
QAbstractFileEngine *create(const QString &fileName) const; QAbstractFileEngine *create(const QString &fileName) const override;
private: private:
void prepopulateCache() const; void prepopulateCache() const;

2
src/plugins/platforms/android/qandroideventdispatcher.h
View File

@ -56,7 +56,7 @@ public:
void goingToStop(bool stop); void goingToStop(bool stop);
protected: protected:
bool processEvents(QEventLoop::ProcessEventsFlags flags); bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
private: private:
QAtomicInt m_stopRequest; QAtomicInt m_stopRequest;

22
src/plugins/platforms/android/qandroidinputcontext.h
View File

@ -80,21 +80,21 @@ public:
QAndroidInputContext(); QAndroidInputContext();
~QAndroidInputContext(); ~QAndroidInputContext();
static QAndroidInputContext * androidInputContext(); static QAndroidInputContext * androidInputContext();
bool isValid() const { return true; } bool isValid() const override { return true; }
void reset(); void reset() override;
void commit(); void commit() override;
void update(Qt::InputMethodQueries queries); void update(Qt::InputMethodQueries queries) override;
void invokeAction(QInputMethod::Action action, int cursorPosition); void invokeAction(QInputMethod::Action action, int cursorPosition) override;
QRectF keyboardRect() const; QRectF keyboardRect() const override;
bool isAnimating() const; bool isAnimating() const override;
void showInputPanel(); void showInputPanel() override;
void hideInputPanel(); void hideInputPanel() override;
bool isInputPanelVisible() const; bool isInputPanelVisible() const override;
bool isComposing() const; bool isComposing() const;
void clear(); void clear();
void setFocusObject(QObject *object); void setFocusObject(QObject *object) override;
void sendShortcut(const QKeySequence &); void sendShortcut(const QKeySequence &);
//---------------// //---------------//

2
src/plugins/platforms/android/qandroidplatformaccessibility.h
View File

@ -51,7 +51,7 @@ public:
QAndroidPlatformAccessibility(); QAndroidPlatformAccessibility();
~QAndroidPlatformAccessibility(); ~QAndroidPlatformAccessibility();
virtual void notifyAccessibilityUpdate(QAccessibleEvent *event); void notifyAccessibilityUpdate(QAccessibleEvent *event) override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

8
src/plugins/platforms/android/qandroidplatformbackingstore.h
View File

@ -50,10 +50,10 @@ class QAndroidPlatformBackingStore : public QPlatformBackingStore
{ {
public: public:
explicit QAndroidPlatformBackingStore(QWindow *window); explicit QAndroidPlatformBackingStore(QWindow *window);
virtual QPaintDevice *paintDevice(); QPaintDevice *paintDevice() override;
virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset); void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
virtual void resize(const QSize &size, const QRegion &staticContents); void resize(const QSize &size, const QRegion &staticContents) override;
QImage toImage() const { return m_image; } QImage toImage() const override { return m_image; }
void setBackingStore(QWindow *window); void setBackingStore(QWindow *window);
protected: protected:
QImage m_image; QImage m_image;

6
src/plugins/platforms/android/qandroidplatformclipboard.h
View File

@ -51,9 +51,9 @@ class QAndroidPlatformClipboard: public QPlatformClipboard
public: public:
QAndroidPlatformClipboard(); QAndroidPlatformClipboard();
virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
virtual void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override;
virtual bool supportsMode(QClipboard::Mode mode) const; bool supportsMode(QClipboard::Mode mode) const override;
private: private:
QMimeData m_mimeData; QMimeData m_mimeData;

8
src/plugins/platforms/android/qandroidplatformdialoghelpers.h
View File

@ -53,11 +53,11 @@ class QAndroidPlatformMessageDialogHelper: public QPlatformMessageDialogHelper
Q_OBJECT Q_OBJECT
public: public:
QAndroidPlatformMessageDialogHelper(); QAndroidPlatformMessageDialogHelper();
void exec(); void exec() override;
bool show(Qt::WindowFlags windowFlags, bool show(Qt::WindowFlags windowFlags,
Qt::WindowModality windowModality, Qt::WindowModality windowModality,
QWindow *parent); QWindow *parent) override;
void hide(); void hide() override;
public slots: public slots:
void dialogResult(int buttonID); void dialogResult(int buttonID);

10
src/plugins/platforms/android/qandroidplatformfontdatabase.h
View File

@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE
class QAndroidPlatformFontDatabase: public QBasicFontDatabase class QAndroidPlatformFontDatabase: public QBasicFontDatabase
{ {
public: public:
QString fontDir() const; QString fontDir() const override;
void populateFontDatabase(); void populateFontDatabase() override;
QStringList fallbacksForFamily(const QString &family, QStringList fallbacksForFamily(const QString &family,
QFont::Style style, QFont::Style style,
QFont::StyleHint styleHint, QFont::StyleHint styleHint,
QChar::Script script) const; QChar::Script script) const override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

34
src/plugins/platforms/android/qandroidplatformintegration.h
View File

@ -63,7 +63,7 @@ struct AndroidStyle;
class QAndroidPlatformNativeInterface: public QPlatformNativeInterface class QAndroidPlatformNativeInterface: public QPlatformNativeInterface
{ {
public: public:
void *nativeResourceForIntegration(const QByteArray &resource); void *nativeResourceForIntegration(const QByteArray &resource) override;
std::shared_ptr<AndroidStyle> m_androidStyle; std::shared_ptr<AndroidStyle> m_androidStyle;
}; };
@ -75,39 +75,39 @@ public:
QAndroidPlatformIntegration(const QStringList &paramList); QAndroidPlatformIntegration(const QStringList &paramList);
~QAndroidPlatformIntegration(); ~QAndroidPlatformIntegration();
bool hasCapability(QPlatformIntegration::Capability cap) const; bool hasCapability(QPlatformIntegration::Capability cap) const override;
QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformWindow *createPlatformWindow(QWindow *window) const override;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
QAbstractEventDispatcher *createEventDispatcher() const; QAbstractEventDispatcher *createEventDispatcher() const override;
QAndroidPlatformScreen *screen() { return m_primaryScreen; } 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 setDesktopSize(int width, int height);
virtual void setDisplayMetrics(int width, int height); virtual void setDisplayMetrics(int width, int height);
void setScreenSize(int width, int height); void setScreenSize(int width, int height);
bool isVirtualDesktop() { return true; } bool isVirtualDesktop() { return true; }
QPlatformFontDatabase *fontDatabase() const; QPlatformFontDatabase *fontDatabase() const override;
#ifndef QT_NO_CLIPBOARD #ifndef QT_NO_CLIPBOARD
QPlatformClipboard *clipboard() const; QPlatformClipboard *clipboard() const override;
#endif #endif
QPlatformInputContext *inputContext() const; QPlatformInputContext *inputContext() const override;
QPlatformNativeInterface *nativeInterface() const; QPlatformNativeInterface *nativeInterface() const override;
QPlatformServices *services() const; QPlatformServices *services() const override;
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
virtual QPlatformAccessibility *accessibility() const; virtual QPlatformAccessibility *accessibility() const override;
#endif #endif
QVariant styleHint(StyleHint hint) const; QVariant styleHint(StyleHint hint) const override;
Qt::WindowState defaultWindowState(Qt::WindowFlags flags) const; Qt::WindowState defaultWindowState(Qt::WindowFlags flags) const override;
QStringList themeNames() const; QStringList themeNames() const override;
QPlatformTheme *createPlatformTheme(const QString &name) const; QPlatformTheme *createPlatformTheme(const QString &name) const override;
static void setDefaultDisplayMetrics(int gw, int gh, int sw, int sh, int width, int height); static void setDefaultDisplayMetrics(int gw, int gh, int sw, int sh, int width, int height);
static void setDefaultDesktopSize(int gw, int gh); static void setDefaultDesktopSize(int gw, int gh);

28
src/plugins/platforms/android/qandroidplatformmenu.h
View File

@ -56,25 +56,25 @@ public:
QAndroidPlatformMenu(); QAndroidPlatformMenu();
~QAndroidPlatformMenu(); ~QAndroidPlatformMenu();
void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before); void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override;
void removeMenuItem(QPlatformMenuItem *menuItem); void removeMenuItem(QPlatformMenuItem *menuItem) override;
void syncMenuItem(QPlatformMenuItem *menuItem); void syncMenuItem(QPlatformMenuItem *menuItem) override;
void syncSeparatorsCollapsible(bool enable); void syncSeparatorsCollapsible(bool enable) override;
void setTag(quintptr tag); void setTag(quintptr tag) override;
quintptr tag() const; quintptr tag() const override;
void setText(const QString &text); void setText(const QString &text) override;
QString text() const; QString text() const;
void setIcon(const QIcon &icon); void setIcon(const QIcon &icon) override;
QIcon icon() const; QIcon icon() const;
void setEnabled(bool enabled); void setEnabled(bool enabled) override;
bool isEnabled() const; bool isEnabled() const override;
void setVisible(bool visible); void setVisible(bool visible) override;
bool isVisible() const; 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 *menuItemAt(int position) const override;
QPlatformMenuItem *menuItemForTag(quintptr tag) const; QPlatformMenuItem *menuItemForTag(quintptr tag) const override;
PlatformMenuItemsType menuItems() const; PlatformMenuItemsType menuItems() const;
QMutex *menuItemsMutex(); QMutex *menuItemsMutex();

10
src/plugins/platforms/android/qandroidplatformmenubar.h
View File

@ -55,11 +55,11 @@ public:
QAndroidPlatformMenuBar(); QAndroidPlatformMenuBar();
~QAndroidPlatformMenuBar(); ~QAndroidPlatformMenuBar();
void insertMenu(QPlatformMenu *menu, QPlatformMenu *before); void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override;
void removeMenu(QPlatformMenu *menu); void removeMenu(QPlatformMenu *menu) override;
void syncMenu(QPlatformMenu *menu); void syncMenu(QPlatformMenu *menu) override;
void handleReparent(QWindow *newParentWindow); void handleReparent(QWindow *newParentWindow) override;
QPlatformMenu *menuForTag(quintptr tag) const; QPlatformMenu *menuForTag(quintptr tag) const override;
QWindow *parentWindow() const; QWindow *parentWindow() const;
PlatformMenusType menus() const; PlatformMenusType menus() const;

28
src/plugins/platforms/android/qandroidplatformmenuitem.h
View File

@ -49,41 +49,41 @@ class QAndroidPlatformMenuItem: public QPlatformMenuItem
{ {
public: public:
QAndroidPlatformMenuItem(); QAndroidPlatformMenuItem();
void setTag(quintptr tag); void setTag(quintptr tag) override;
quintptr tag() const; quintptr tag() const override;
void setText(const QString &text); void setText(const QString &text) override;
QString text() const; QString text() const;
void setIcon(const QIcon &icon); void setIcon(const QIcon &icon) override;
QIcon icon() const; QIcon icon() const;
void setMenu(QPlatformMenu *menu); void setMenu(QPlatformMenu *menu) override;
QAndroidPlatformMenu *menu() const; QAndroidPlatformMenu *menu() const;
void setVisible(bool isVisible); void setVisible(bool isVisible) override;
bool isVisible() const; bool isVisible() const;
void setIsSeparator(bool isSeparator); void setIsSeparator(bool isSeparator) override;
bool isSeparator() const; 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; MenuRole role() const;
void setCheckable(bool checkable); void setCheckable(bool checkable) override;
bool isCheckable() const; bool isCheckable() const;
void setChecked(bool isChecked); void setChecked(bool isChecked) override;
bool isChecked() const; 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; bool isEnabled() const;
void setIconSize(int size); void setIconSize(int size) override;
private: private:
quintptr m_tag; quintptr m_tag;

6
src/plugins/platforms/android/qandroidplatformopenglcontext.h
View File

@ -49,11 +49,11 @@ class QAndroidPlatformOpenGLContext : public QEGLPlatformContext
{ {
public: public:
QAndroidPlatformOpenGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display); QAndroidPlatformOpenGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display);
void swapBuffers(QPlatformSurface *surface); void swapBuffers(QPlatformSurface *surface) override;
bool makeCurrent(QPlatformSurface *surface); bool makeCurrent(QPlatformSurface *surface) override;
private: private:
virtual EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface); EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override;
static bool needsFBOReadBackWorkaround(); static bool needsFBOReadBackWorkaround();
}; };

8
src/plugins/platforms/android/qandroidplatformopenglwindow.h
View File

@ -56,18 +56,18 @@ public:
explicit QAndroidPlatformOpenGLWindow(QWindow *window, EGLDisplay display); explicit QAndroidPlatformOpenGLWindow(QWindow *window, EGLDisplay display);
~QAndroidPlatformOpenGLWindow(); ~QAndroidPlatformOpenGLWindow();
void setGeometry(const QRect &rect); void setGeometry(const QRect &rect) override;
EGLSurface eglSurface(EGLConfig config); EGLSurface eglSurface(EGLConfig config);
QSurfaceFormat format() const; QSurfaceFormat format() const override;
bool checkNativeSurface(EGLConfig config); bool checkNativeSurface(EGLConfig config);
void applicationStateChanged(Qt::ApplicationState); void applicationStateChanged(Qt::ApplicationState) override;
void repaint(const QRegion &region) Q_DECL_OVERRIDE; void repaint(const QRegion &region) Q_DECL_OVERRIDE;
protected: 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 createEgl(EGLConfig config);
void clearEgl(); void clearEgl();

22
src/plugins/platforms/android/qandroidplatformscreen.h
View File

@ -63,14 +63,14 @@ public:
QAndroidPlatformScreen(); QAndroidPlatformScreen();
~QAndroidPlatformScreen(); ~QAndroidPlatformScreen();
QRect geometry() const { return QRect(QPoint(), m_size); } QRect geometry() const override { return QRect(QPoint(), m_size); }
QRect availableGeometry() const { return m_availableGeometry; } QRect availableGeometry() const override { return m_availableGeometry; }
int depth() const { return m_depth; } int depth() const override { return m_depth; }
QImage::Format format() const { return m_format; } QImage::Format format() const override { return m_format; }
QSizeF physicalSize() const { return m_physicalSize; } QSizeF physicalSize() const override { return m_physicalSize; }
inline QWindow *topWindow() const; inline QWindow *topWindow() const;
QWindow *topLevelAt(const QPoint & p) const; QWindow *topLevelAt(const QPoint & p) const override;
// compositor api // compositor api
void addWindow(QAndroidPlatformWindow *window); void addWindow(QAndroidPlatformWindow *window);
@ -100,11 +100,11 @@ protected:
QSizeF m_physicalSize; QSizeF m_physicalSize;
private: private:
QDpi logicalDpi() const; QDpi logicalDpi() const override;
qreal pixelDensity() const; qreal pixelDensity() const override;
Qt::ScreenOrientation orientation() const; Qt::ScreenOrientation orientation() const override;
Qt::ScreenOrientation nativeOrientation() const; Qt::ScreenOrientation nativeOrientation() const override;
void surfaceChanged(JNIEnv *env, jobject surface, int w, int h); void surfaceChanged(JNIEnv *env, jobject surface, int w, int h) override;
void releaseSurface(); void releaseSurface();
void applicationStateChanged(Qt::ApplicationState); void applicationStateChanged(Qt::ApplicationState);

6
src/plugins/platforms/android/qandroidplatformservices.h
View File

@ -49,9 +49,9 @@ class QAndroidPlatformServices: public QPlatformServices
{ {
public: public:
QAndroidPlatformServices(); QAndroidPlatformServices();
bool openUrl(const QUrl &url); bool openUrl(const QUrl &url) override;
bool openDocument(const QUrl &url); bool openDocument(const QUrl &url) override;
QByteArray desktopEnvironment() const; QByteArray desktopEnvironment() const override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

18
src/plugins/platforms/android/qandroidplatformtheme.h
View File

@ -65,16 +65,16 @@ class QAndroidPlatformTheme: public QPlatformTheme
{ {
public: public:
QAndroidPlatformTheme(QAndroidPlatformNativeInterface * androidPlatformNativeInterface); QAndroidPlatformTheme(QAndroidPlatformNativeInterface * androidPlatformNativeInterface);
virtual QPlatformMenuBar *createPlatformMenuBar() const; QPlatformMenuBar *createPlatformMenuBar() const override;
virtual QPlatformMenu *createPlatformMenu() const; QPlatformMenu *createPlatformMenu() const override;
virtual QPlatformMenuItem *createPlatformMenuItem() const; QPlatformMenuItem *createPlatformMenuItem() const override;
virtual void showPlatformMenuBar(); void showPlatformMenuBar() override;
virtual const QPalette *palette(Palette type = SystemPalette) const; const QPalette *palette(Palette type = SystemPalette) const override;
virtual const QFont *font(Font type = SystemFont) const; const QFont *font(Font type = SystemFont) const override;
virtual QVariant themeHint(ThemeHint hint) const; QVariant themeHint(ThemeHint hint) const override;
QString standardButtonText(int button) const Q_DECL_OVERRIDE; QString standardButtonText(int button) const Q_DECL_OVERRIDE;
virtual bool usePlatformNativeDialog(DialogType type) const; bool usePlatformNativeDialog(DialogType type) const override;
virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;
private: private:

22
src/plugins/platforms/android/qandroidplatformwindow.h
View File

@ -54,21 +54,21 @@ class QAndroidPlatformWindow: public QPlatformWindow
public: public:
explicit QAndroidPlatformWindow(QWindow *window); explicit QAndroidPlatformWindow(QWindow *window);
void lower(); void lower() override;
void raise(); void raise() override;
void setVisible(bool visible); void setVisible(bool visible) override;
void setWindowState(Qt::WindowState state); void setWindowState(Qt::WindowState state) override;
void setWindowFlags(Qt::WindowFlags flags); void setWindowFlags(Qt::WindowFlags flags) override;
Qt::WindowFlags windowFlags() const; Qt::WindowFlags windowFlags() const;
void setParent(const QPlatformWindow *window); void setParent(const QPlatformWindow *window) override;
WId winId() const { return m_windowId; } WId winId() const override { return m_windowId; }
QAndroidPlatformScreen *platformScreen() const; QAndroidPlatformScreen *platformScreen() const;
void propagateSizeHints(); void propagateSizeHints() override;
void requestActivateWindow(); void requestActivateWindow() override;
void updateStatusBarVisibility(); void updateStatusBarVisibility();
inline bool isRaster() const { inline bool isRaster() const {
if ((window()->flags() & Qt::ForeignWindow) == Qt::ForeignWindow) if ((window()->flags() & Qt::ForeignWindow) == Qt::ForeignWindow)
@ -77,7 +77,7 @@ public:
return window()->surfaceType() == QSurface::RasterSurface return window()->surfaceType() == QSurface::RasterSurface
|| window()->surfaceType() == QSurface::RasterGLSurface; || window()->surfaceType() == QSurface::RasterGLSurface;
} }
bool isExposed() const; bool isExposed() const override;
virtual void applicationStateChanged(Qt::ApplicationState); virtual void applicationStateChanged(Qt::ApplicationState);
@ -87,7 +87,7 @@ public:
virtual void repaint(const QRegion &) { } virtual void repaint(const QRegion &) { }
protected: protected:
void setGeometry(const QRect &rect); void setGeometry(const QRect &rect) override;
protected: protected:
Qt::WindowFlags m_windowFlags; Qt::WindowFlags m_windowFlags;

4
src/plugins/platforms/android/qandroidsystemlocale.h
View File

@ -50,8 +50,8 @@ class QAndroidSystemLocale : public QSystemLocale
public: public:
QAndroidSystemLocale(); QAndroidSystemLocale();
virtual QVariant query(QueryType type, QVariant in) const; QVariant query(QueryType type, QVariant in) const override;
virtual QLocale fallbackUiLocale() const; QLocale fallbackUiLocale() const override;
private: private:
void getLocaleFromJava() const; void getLocaleFromJava() const;