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

Android: Use override instead of Q_DECL_OVERRIDE

Browse Source 
... for consistency.

Change-Id: I37afaff6f7512a1cd09f0f31996b9bedc6cb3bab
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Alexander Volkov 2016-11-29 14:23:34 +03:00
parent e3ad43843a
commit 4c375f75e0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/android/qandroidplatformforeignwindow.h
View File

@ -51,12 +51,12 @@ class QAndroidPlatformForeignWindow : public QAndroidPlatformWindow
public:
explicit QAndroidPlatformForeignWindow(QWindow *window);
~QAndroidPlatformForeignWindow();
void lower() Q_DECL_OVERRIDE;
void raise() Q_DECL_OVERRIDE;
void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
void setVisible(bool visible) Q_DECL_OVERRIDE;
void applicationStateChanged(Qt::ApplicationState state) Q_DECL_OVERRIDE;
void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
void lower() override;
void raise() override;
void setGeometry(const QRect &rect) override;
void setVisible(bool visible) override;
void applicationStateChanged(Qt::ApplicationState state) override;
void setParent(const QPlatformWindow *window) override;
private:
int m_surfaceId;

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

@ -64,7 +64,7 @@ public:
void applicationStateChanged(Qt::ApplicationState) override;
void repaint(const QRegion &region) Q_DECL_OVERRIDE;
void repaint(const QRegion &region) override;
protected:
void surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h) override;

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

@ -72,7 +72,7 @@ public:
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;
QString standardButtonText(int button) const override;
bool usePlatformNativeDialog(DialogType type) const override;
QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;