AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eglfs: Replace Q_DECL_OVERRIDE by override

Browse Source 
We can use 'override' directly since Qt 5.7.
Also remove redundant 'virtual'.

Change-Id: I4c1d5d8a69bf51a7f31077f7cdc74ba06da0bc11
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Alexander Volkov 2016-12-06 23:22:46 +03:00
parent b5c273cb1a
commit 964d9e8f8a
31 changed files with 152 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/eglfs/api/qeglfscontext_p.h
View File

@ -62,11 +62,11 @@ class Q_EGLFS_EXPORT QEglFSContext : public QEGLPlatformContext
public: public:
QEglFSContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, QEglFSContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display,
EGLConfig *config, const QVariant &nativeHandle); EGLConfig *config, const QVariant &nativeHandle);
EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) Q_DECL_OVERRIDE; EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override;
EGLSurface createTemporaryOffscreenSurface() Q_DECL_OVERRIDE; EGLSurface createTemporaryOffscreenSurface() override;
void destroyTemporaryOffscreenSurface(EGLSurface surface) Q_DECL_OVERRIDE; void destroyTemporaryOffscreenSurface(EGLSurface surface) override;
void runGLChecks() Q_DECL_OVERRIDE; void runGLChecks() override;
void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; void swapBuffers(QPlatformSurface *surface) override;
private: private:
EGLNativeWindowType m_tempWindow; EGLNativeWindowType m_tempWindow;

10
src/plugins/platforms/eglfs/api/qeglfscursor_p.h
View File

@ -87,11 +87,11 @@ public:
~QEglFSCursor(); ~QEglFSCursor();
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
void changeCursor(QCursor *cursor, QWindow *widget) Q_DECL_OVERRIDE; void changeCursor(QCursor *cursor, QWindow *widget) override;
#endif #endif
void pointerEvent(const QMouseEvent &event) Q_DECL_OVERRIDE; void pointerEvent(const QMouseEvent &event) override;
QPoint pos() const Q_DECL_OVERRIDE; QPoint pos() const override;
void setPos(const QPoint &pos) Q_DECL_OVERRIDE; void setPos(const QPoint &pos) override;
QRect cursorRect() const; QRect cursorRect() const;
void paintOnScreen(); void paintOnScreen();
@ -100,7 +100,7 @@ public:
void updateMouseStatus(); void updateMouseStatus();
private: private:
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
bool setCurrentCursor(QCursor *cursor); bool setCurrentCursor(QCursor *cursor);
#endif #endif

2
src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp
View File

@ -362,7 +362,7 @@ EGLConfig QEglFSDeviceIntegration::chooseConfig(EGLDisplay display, const QSurfa
public: public:
Chooser(EGLDisplay display) Chooser(EGLDisplay display)
: QEglConfigChooser(display) { } : QEglConfigChooser(display) { }
bool filterConfig(EGLConfig config) const Q_DECL_OVERRIDE { bool filterConfig(EGLConfig config) const override {
return qt_egl_device_integration()->filterConfig(display(), config) return qt_egl_device_integration()->filterConfig(display(), config)
&& QEglConfigChooser::filterConfig(config); && QEglConfigChooser::filterConfig(config);
} }

38
src/plugins/platforms/eglfs/api/qeglfsintegration_p.h
View File

@ -69,37 +69,37 @@ class Q_EGLFS_EXPORT QEglFSIntegration : public QPlatformIntegration, public QPl
public: public:
QEglFSIntegration(); QEglFSIntegration();
void initialize() Q_DECL_OVERRIDE; void initialize() override;
void destroy() Q_DECL_OVERRIDE; void destroy() override;
EGLDisplay display() const { return m_display; } EGLDisplay display() const { return m_display; }
QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; QAbstractEventDispatcher *createEventDispatcher() const override;
QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; QPlatformFontDatabase *fontDatabase() const override;
QPlatformServices *services() const Q_DECL_OVERRIDE; QPlatformServices *services() const override;
QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; } QPlatformInputContext *inputContext() const override { return m_inputContext; }
QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE; QPlatformTheme *createPlatformTheme(const QString &name) const override;
QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; QPlatformWindow *createPlatformWindow(QWindow *window) const override;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE; QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
#endif #endif
bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; bool hasCapability(QPlatformIntegration::Capability cap) const override;
QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; QPlatformNativeInterface *nativeInterface() const override;
// QPlatformNativeInterface // QPlatformNativeInterface
void *nativeResourceForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE; void *nativeResourceForIntegration(const QByteArray &resource) override;
void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) Q_DECL_OVERRIDE; void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) override;
void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) Q_DECL_OVERRIDE; void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) override;
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) Q_DECL_OVERRIDE; void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) override;
#endif #endif
NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) Q_DECL_OVERRIDE; NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) override;
QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE; QFunctionPointer platformFunction(const QByteArray &function) const override;
QFbVtHandler *vtHandler() { return m_vtHandler.data(); } QFbVtHandler *vtHandler() { return m_vtHandler.data(); }

4
src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h
View File

@ -62,8 +62,8 @@ public:
QEglFSOffscreenWindow(EGLDisplay display, const QSurfaceFormat &format, QOffscreenSurface *offscreenSurface); QEglFSOffscreenWindow(EGLDisplay display, const QSurfaceFormat &format, QOffscreenSurface *offscreenSurface);
~QEglFSOffscreenWindow(); ~QEglFSOffscreenWindow();
QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; } QSurfaceFormat format() const override { return m_format; }
bool isValid() const Q_DECL_OVERRIDE { return m_surface != EGL_NO_SURFACE; } bool isValid() const override { return m_surface != EGL_NO_SURFACE; }
private: private:
QSurfaceFormat m_format; QSurfaceFormat m_format;

22
src/plugins/platforms/eglfs/api/qeglfsscreen_p.h
View File

@ -67,22 +67,22 @@ public:
QEglFSScreen(EGLDisplay display); QEglFSScreen(EGLDisplay display);
~QEglFSScreen(); ~QEglFSScreen();
QRect geometry() const Q_DECL_OVERRIDE; QRect geometry() const override;
virtual QRect rawGeometry() const; virtual QRect rawGeometry() const;
int depth() const Q_DECL_OVERRIDE; int depth() const override;
QImage::Format format() const Q_DECL_OVERRIDE; QImage::Format format() const override;
QSizeF physicalSize() const Q_DECL_OVERRIDE; QSizeF physicalSize() const override;
QDpi logicalDpi() const Q_DECL_OVERRIDE; QDpi logicalDpi() const override;
qreal pixelDensity() const Q_DECL_OVERRIDE; qreal pixelDensity() const override;
Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE; Qt::ScreenOrientation nativeOrientation() const override;
Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; Qt::ScreenOrientation orientation() const override;
QPlatformCursor *cursor() const Q_DECL_OVERRIDE; QPlatformCursor *cursor() const override;
qreal refreshRate() const Q_DECL_OVERRIDE; qreal refreshRate() const override;
QPixmap grabWindow(WId wid, int x, int y, int width, int height) const Q_DECL_OVERRIDE; QPixmap grabWindow(WId wid, int x, int y, int width, int height) const override;
EGLSurface primarySurface() const { return m_surface; } EGLSurface primarySurface() const { return m_surface; }

34
src/plugins/platforms/eglfs/api/qeglfswindow_p.h
View File

@ -77,21 +77,21 @@ public:
void create(); void create();
void destroy(); void destroy();
void setGeometry(const QRect &) Q_DECL_OVERRIDE; void setGeometry(const QRect &) override;
QRect geometry() const Q_DECL_OVERRIDE; QRect geometry() const override;
void setVisible(bool visible) Q_DECL_OVERRIDE; void setVisible(bool visible) override;
void requestActivateWindow() Q_DECL_OVERRIDE; void requestActivateWindow() override;
void raise() Q_DECL_OVERRIDE; void raise() override;
void lower() Q_DECL_OVERRIDE; void lower() override;
void propagateSizeHints() Q_DECL_OVERRIDE { } void propagateSizeHints() override { }
void setMask(const QRegion &) Q_DECL_OVERRIDE { } void setMask(const QRegion &) override { }
bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } bool setKeyboardGrabEnabled(bool) override { return false; }
bool setMouseGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } bool setMouseGrabEnabled(bool) override { return false; }
void setOpacity(qreal) Q_DECL_OVERRIDE; void setOpacity(qreal) override;
WId winId() const Q_DECL_OVERRIDE; WId winId() const override;
QSurfaceFormat format() const Q_DECL_OVERRIDE; QSurfaceFormat format() const override;
EGLNativeWindowType eglWindow() const; EGLNativeWindowType eglWindow() const;
EGLSurface surface() const; EGLSurface surface() const;
@ -99,7 +99,7 @@ public:
bool hasNativeWindow() const { return m_flags.testFlag(HasNativeWindow); } bool hasNativeWindow() const { return m_flags.testFlag(HasNativeWindow); }
virtual void invalidateSurface() Q_DECL_OVERRIDE; void invalidateSurface() override;
virtual void resetSurface(); virtual void resetSurface();
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
@ -108,9 +108,9 @@ public:
#endif #endif
bool isRaster() const; bool isRaster() const;
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
QWindow *sourceWindow() const Q_DECL_OVERRIDE; QWindow *sourceWindow() const override;
const QPlatformTextureList *textures() const Q_DECL_OVERRIDE; const QPlatformTextureList *textures() const override;
void endCompositing() Q_DECL_OVERRIDE; void endCompositing() override;
#endif #endif
protected: protected:

14
src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/qeglfsbrcmintegration.h
View File

@ -47,13 +47,13 @@ QT_BEGIN_NAMESPACE
class QEglFSBrcmIntegration : public QEglFSDeviceIntegration class QEglFSBrcmIntegration : public QEglFSDeviceIntegration
{ {
public: public:
void platformInit() Q_DECL_OVERRIDE; void platformInit() override;
void platformDestroy() Q_DECL_OVERRIDE; void platformDestroy() override;
EGLNativeDisplayType platformDisplay() const Q_DECL_OVERRIDE; EGLNativeDisplayType platformDisplay() const override;
QSize screenSize() const Q_DECL_OVERRIDE; QSize screenSize() const override;
EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) Q_DECL_OVERRIDE; EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE; void destroyNativeWindow(EGLNativeWindowType window) override;
bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; bool hasCapability(QPlatformIntegration::Capability cap) const override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/qeglfsbrcmmain.cpp
View File

@ -48,7 +48,7 @@ class QEglFSBrcmIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_brcm.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_brcm.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSBrcmIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSBrcmIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemumain.cpp
View File

@ -48,7 +48,7 @@ class QEglFSEmulatorIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_emu.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_emu.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSEmulatorIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSEmulatorIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
View File

@ -76,12 +76,12 @@ public:
~QEglFSKmsGbmCursor(); ~QEglFSKmsGbmCursor();
// input methods // input methods
void pointerEvent(const QMouseEvent & event) Q_DECL_OVERRIDE; void pointerEvent(const QMouseEvent & event) override;
#ifndef QT_NO_CURSOR #ifndef QT_NO_CURSOR
void changeCursor(QCursor * windowCursor, QWindow * window) Q_DECL_OVERRIDE; void changeCursor(QCursor * windowCursor, QWindow * window) override;
#endif #endif
QPoint pos() const Q_DECL_OVERRIDE; QPoint pos() const override;
void setPos(const QPoint &pos) Q_DECL_OVERRIDE; void setPos(const QPoint &pos) override;
void updateMouseStatus(); void updateMouseStatus();

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
View File

@ -56,10 +56,10 @@ class QEglFSKmsGbmDevice: public QEglFSKmsDevice
public: public:
QEglFSKmsGbmDevice(QKmsScreenConfig *screenConfig, const QString &path); QEglFSKmsGbmDevice(QKmsScreenConfig *screenConfig, const QString &path);
bool open() Q_DECL_OVERRIDE; bool open() override;
void close() Q_DECL_OVERRIDE; void close() override;
void *nativeDisplay() const Q_DECL_OVERRIDE; void *nativeDisplay() const override;
gbm_device *gbmDevice() const; gbm_device *gbmDevice() const;
QPlatformCursor *globalCursor() const; QPlatformCursor *globalCursor() const;
@ -67,7 +67,7 @@ public:
void handleDrmEvent(); void handleDrmEvent();
QPlatformScreen *createScreen(const QKmsOutput &output) Q_DECL_OVERRIDE; QPlatformScreen *createScreen(const QKmsOutput &output) override;
private: private:
Q_DISABLE_COPY(QEglFSKmsGbmDevice) Q_DISABLE_COPY(QEglFSKmsGbmDevice)

12
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
View File

@ -57,15 +57,15 @@ public:
EGLNativeWindowType createNativeWindow(QPlatformWindow *platformWindow, EGLNativeWindowType createNativeWindow(QPlatformWindow *platformWindow,
const QSize &size, const QSize &size,
const QSurfaceFormat &format) Q_DECL_OVERRIDE; const QSurfaceFormat &format) override;
EGLNativeWindowType createNativeOffscreenWindow(const QSurfaceFormat &format) Q_DECL_OVERRIDE; EGLNativeWindowType createNativeOffscreenWindow(const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE; void destroyNativeWindow(EGLNativeWindowType window) override;
QPlatformCursor *createCursor(QPlatformScreen *screen) const Q_DECL_OVERRIDE; QPlatformCursor *createCursor(QPlatformScreen *screen) const override;
void presentBuffer(QPlatformSurface *surface) Q_DECL_OVERRIDE; void presentBuffer(QPlatformSurface *surface) override;
protected: protected:
QKmsDevice *createDevice() Q_DECL_OVERRIDE; QKmsDevice *createDevice() override;
private: private:
}; };

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmmain.cpp
View File

@ -49,7 +49,7 @@ class QEglFSKmsGbmIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_kms.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_kms.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSKmsGbmIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSKmsGbmIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
View File

@ -57,15 +57,15 @@ public:
QEglFSKmsGbmScreen(QKmsDevice *device, const QKmsOutput &output); QEglFSKmsGbmScreen(QKmsDevice *device, const QKmsOutput &output);
~QEglFSKmsGbmScreen(); ~QEglFSKmsGbmScreen();
QPlatformCursor *cursor() const Q_DECL_OVERRIDE; QPlatformCursor *cursor() const override;
gbm_surface *surface() const { return m_gbm_surface; } gbm_surface *surface() const { return m_gbm_surface; }
gbm_surface *createSurface(); gbm_surface *createSurface();
void destroySurface(); void destroySurface();
void waitForFlip() Q_DECL_OVERRIDE; void waitForFlip() override;
void flip() Q_DECL_OVERRIDE; void flip() override;
void flipFinished() Q_DECL_OVERRIDE; void flipFinished() override;
private: private:
gbm_surface *m_gbm_surface; gbm_surface *m_gbm_surface;

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h
View File

@ -52,12 +52,12 @@ class QEglFSKmsEglDevice: public QEglFSKmsDevice
public: public:
QEglFSKmsEglDevice(QEglFSKmsEglDeviceIntegration *devInt, QKmsScreenConfig *screenConfig, const QString &path); QEglFSKmsEglDevice(QEglFSKmsEglDeviceIntegration *devInt, QKmsScreenConfig *screenConfig, const QString &path);
bool open() Q_DECL_OVERRIDE; bool open() override;
void close() Q_DECL_OVERRIDE; void close() override;
void *nativeDisplay() const Q_DECL_OVERRIDE; void *nativeDisplay() const override;
QPlatformScreen *createScreen(const QKmsOutput &output) Q_DECL_OVERRIDE; QPlatformScreen *createScreen(const QKmsOutput &output) override;
QPlatformCursor *globalCursor() { return m_globalCursor; } QPlatformCursor *globalCursor() { return m_globalCursor; }
void destroyGlobalCursor(); void destroyGlobalCursor();

4
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
View File

@ -109,8 +109,8 @@ public:
, m_egl_stream(EGL_NO_STREAM_KHR) , m_egl_stream(EGL_NO_STREAM_KHR)
{ } { }
void invalidateSurface() Q_DECL_OVERRIDE; void invalidateSurface() override;
void resetSurface() Q_DECL_OVERRIDE; void resetSurface() override;
const QEglFSKmsEglDeviceIntegration *m_integration; const QEglFSKmsEglDeviceIntegration *m_integration;
EGLStreamKHR m_egl_stream; EGLStreamKHR m_egl_stream;

14
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h
View File

@ -55,17 +55,17 @@ class QEglFSKmsEglDeviceIntegration : public QEglFSKmsIntegration
public: public:
QEglFSKmsEglDeviceIntegration(); QEglFSKmsEglDeviceIntegration();
EGLint surfaceType() const Q_DECL_OVERRIDE; EGLint surfaceType() const override;
EGLDisplay createDisplay(EGLNativeDisplayType nativeDisplay) Q_DECL_OVERRIDE; EGLDisplay createDisplay(EGLNativeDisplayType nativeDisplay) override;
bool supportsSurfacelessContexts() const Q_DECL_OVERRIDE; bool supportsSurfacelessContexts() const override;
bool supportsPBuffers() const Q_DECL_OVERRIDE; bool supportsPBuffers() const override;
QEglFSWindow *createWindow(QWindow *window) const Q_DECL_OVERRIDE; QEglFSWindow *createWindow(QWindow *window) const override;
EGLDeviceEXT eglDevice() const { return m_egl_device; } EGLDeviceEXT eglDevice() const { return m_egl_device; }
protected: protected:
QKmsDevice *createDevice() Q_DECL_OVERRIDE; QKmsDevice *createDevice() override;
QPlatformCursor *createCursor(QPlatformScreen *screen) const Q_DECL_OVERRIDE; QPlatformCursor *createCursor(QPlatformScreen *screen) const override;
private: private:
bool setup_kms(); bool setup_kms();

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicemain.cpp
View File

@ -47,7 +47,7 @@ class QEglFSKmsEglDeviceIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_kms_egldevice.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_kms_egldevice.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSKmsEglDeviceIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSKmsEglDeviceIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.h
View File

@ -50,9 +50,9 @@ public:
QEglFSKmsEglDeviceScreen(QKmsDevice *device, const QKmsOutput &output); QEglFSKmsEglDeviceScreen(QKmsDevice *device, const QKmsOutput &output);
~QEglFSKmsEglDeviceScreen(); ~QEglFSKmsEglDeviceScreen();
QPlatformCursor *cursor() const Q_DECL_OVERRIDE; QPlatformCursor *cursor() const override;
void waitForFlip() Q_DECL_OVERRIDE; void waitForFlip() override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

18
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
View File

@ -60,15 +60,15 @@ public:
QEglFSKmsIntegration(); QEglFSKmsIntegration();
~QEglFSKmsIntegration(); ~QEglFSKmsIntegration();
void platformInit() Q_DECL_OVERRIDE; void platformInit() override;
void platformDestroy() Q_DECL_OVERRIDE; void platformDestroy() override;
EGLNativeDisplayType platformDisplay() const Q_DECL_OVERRIDE; EGLNativeDisplayType platformDisplay() const override;
bool usesDefaultScreen() Q_DECL_OVERRIDE; bool usesDefaultScreen() override;
void screenInit() Q_DECL_OVERRIDE; void screenInit() override;
QSurfaceFormat surfaceFormatFor(const QSurfaceFormat &inputFormat) const Q_DECL_OVERRIDE; QSurfaceFormat surfaceFormatFor(const QSurfaceFormat &inputFormat) const override;
bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; bool hasCapability(QPlatformIntegration::Capability cap) const override;
void waitForVSync(QPlatformSurface *surface) const Q_DECL_OVERRIDE; void waitForVSync(QPlatformSurface *surface) const override;
bool supportsPBuffers() const Q_DECL_OVERRIDE; bool supportsPBuffers() const override;
QKmsDevice *device() const; QKmsDevice *device() const;
QKmsScreenConfig *screenConfig() const; QKmsScreenConfig *screenConfig() const;

26
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
View File

@ -60,21 +60,21 @@ public:
void setVirtualPosition(const QPoint &pos); void setVirtualPosition(const QPoint &pos);
QRect rawGeometry() const Q_DECL_OVERRIDE; QRect rawGeometry() const override;
int depth() const Q_DECL_OVERRIDE; int depth() const override;
QImage::Format format() const Q_DECL_OVERRIDE; QImage::Format format() const override;
QSizeF physicalSize() const Q_DECL_OVERRIDE; QSizeF physicalSize() const override;
QDpi logicalDpi() const Q_DECL_OVERRIDE; QDpi logicalDpi() const override;
Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE; Qt::ScreenOrientation nativeOrientation() const override;
Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; Qt::ScreenOrientation orientation() const override;
QString name() const Q_DECL_OVERRIDE; QString name() const override;
qreal refreshRate() const Q_DECL_OVERRIDE; qreal refreshRate() const override;
QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; } QList<QPlatformScreen *> virtualSiblings() const override { return m_siblings; }
void setVirtualSiblings(QList<QPlatformScreen *> sl) { m_siblings = sl; } void setVirtualSiblings(QList<QPlatformScreen *> sl) { m_siblings = sl; }
QKmsDevice *device() const { return m_device; } QKmsDevice *device() const { return m_device; }
@ -88,10 +88,10 @@ public:
QKmsOutput &output() { return m_output; } QKmsOutput &output() { return m_output; }
void restoreMode(); void restoreMode();
SubpixelAntialiasingType subpixelAntialiasingTypeHint() const Q_DECL_OVERRIDE; SubpixelAntialiasingType subpixelAntialiasingTypeHint() const override;
QPlatformScreen::PowerState powerState() const Q_DECL_OVERRIDE; QPlatformScreen::PowerState powerState() const override;
void setPowerState(QPlatformScreen::PowerState state) Q_DECL_OVERRIDE; void setPowerState(QPlatformScreen::PowerState state) override;
protected: protected:
QKmsDevice *m_device; QKmsDevice *m_device;

6
src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.h
View File

@ -47,9 +47,9 @@ QT_BEGIN_NAMESPACE
class QEglFSMaliIntegration : public QEglFSDeviceIntegration class QEglFSMaliIntegration : public QEglFSDeviceIntegration
{ {
public: public:
void platformInit() Q_DECL_OVERRIDE; void platformInit() override;
EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) Q_DECL_OVERRIDE; EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE; void destroyNativeWindow(EGLNativeWindowType window) override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmalimain.cpp
View File

@ -48,7 +48,7 @@ class QEglFSMaliIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_mali.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_mali.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSMaliIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSMaliIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

10
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.h
View File

@ -47,11 +47,11 @@ QT_BEGIN_NAMESPACE
class QEglFSVivIntegration : public QEglFSDeviceIntegration class QEglFSVivIntegration : public QEglFSDeviceIntegration
{ {
public: public:
void platformInit() Q_DECL_OVERRIDE; void platformInit() override;
QSize screenSize() const Q_DECL_OVERRIDE; QSize screenSize() const override;
EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) Q_DECL_OVERRIDE; EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE; void destroyNativeWindow(EGLNativeWindowType window) override;
EGLNativeDisplayType platformDisplay() const Q_DECL_OVERRIDE; EGLNativeDisplayType platformDisplay() const override;
private: private:
QSize mScreenSize; QSize mScreenSize;

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivmain.cpp
View File

@ -48,7 +48,7 @@ class QEglFSVivIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_viv.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_viv.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSVivIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSVivIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

12
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/qeglfsvivwlintegration.h
View File

@ -48,13 +48,13 @@ QT_BEGIN_NAMESPACE
class QEglFSVivWaylandIntegration : public QEglFSDeviceIntegration class QEglFSVivWaylandIntegration : public QEglFSDeviceIntegration
{ {
public: public:
void platformInit() Q_DECL_OVERRIDE; void platformInit() override;
QSize screenSize() const Q_DECL_OVERRIDE; QSize screenSize() const override;
EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) Q_DECL_OVERRIDE; EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE; void destroyNativeWindow(EGLNativeWindowType window) override;
EGLNativeDisplayType platformDisplay() const Q_DECL_OVERRIDE; EGLNativeDisplayType platformDisplay() const override;
void *wlDisplay() const Q_DECL_OVERRIDE; void *wlDisplay() const override;
private: private:
QSize mScreenSize; QSize mScreenSize;
EGLNativeDisplayType mNativeDisplay; EGLNativeDisplayType mNativeDisplay;

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/qeglfsvivwlmain.cpp
View File

@ -48,7 +48,7 @@ class QEglFSVivWaylandIntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_viv_wl.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_viv_wl.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSVivWaylandIntegration; } QEglFSDeviceIntegration *create() override { return new QEglFSVivWaylandIntegration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

14
src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.h
View File

@ -69,15 +69,15 @@ class QEglFSX11Integration : public QEglFSDeviceIntegration
public: public:
QEglFSX11Integration() : m_connection(0), m_window(0), m_eventReader(0) {} QEglFSX11Integration() : m_connection(0), m_window(0), m_eventReader(0) {}
void platformInit() Q_DECL_OVERRIDE; void platformInit() override;
void platformDestroy() Q_DECL_OVERRIDE; void platformDestroy() override;
EGLNativeDisplayType platformDisplay() const Q_DECL_OVERRIDE; EGLNativeDisplayType platformDisplay() const override;
QSize screenSize() const Q_DECL_OVERRIDE; QSize screenSize() const override;
EGLNativeWindowType createNativeWindow(QPlatformWindow *window, EGLNativeWindowType createNativeWindow(QPlatformWindow *window,
const QSize &size, const QSize &size,
const QSurfaceFormat &format) Q_DECL_OVERRIDE; const QSurfaceFormat &format) override;
void destroyNativeWindow(EGLNativeWindowType window) Q_DECL_OVERRIDE; void destroyNativeWindow(EGLNativeWindowType window) override;
bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; bool hasCapability(QPlatformIntegration::Capability cap) const override;
xcb_connection_t *connection() { return m_connection; } xcb_connection_t *connection() { return m_connection; }
const xcb_atom_t *atoms() const { return m_atoms; } const xcb_atom_t *atoms() const { return m_atoms; }

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11main.cpp
View File

@ -48,7 +48,7 @@ class QEglFSX11IntegrationPlugin : public QEglFSDeviceIntegrationPlugin
Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_x11.json") Q_PLUGIN_METADATA(IID QEglFSDeviceIntegrationFactoryInterface_iid FILE "eglfs_x11.json")
public: public:
QEglFSDeviceIntegration *create() Q_DECL_OVERRIDE { return new QEglFSX11Integration; } QEglFSDeviceIntegration *create() override { return new QEglFSX11Integration; }
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/eglfs/qeglfsmain.cpp
View File

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