whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xcb: Replace Q_DECL_OVERRIDE by override 

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

Change-Id: Ia40be0e1e60e51f9d043ab575fd6b9305ea620b0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
bb10
Alexander Volkov 2016-11-30 13:15:38 +03:00
parent 7183fc8f0d
commit 15b0b3db29
23 changed files with 171 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h
View File

@ -62,13 +62,13 @@ public:
QXcbEglIntegration();
~QXcbEglIntegration();
bool initialize(QXcbConnection *connection) Q_DECL_OVERRIDE;
bool initialize(QXcbConnection *connection) override;
QXcbWindow *createWindow(QWindow *window) const Q_DECL_OVERRIDE;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE;
QXcbWindow *createWindow(QWindow *window) const override;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; }
bool supportsThreadedOpenGL() const override { return true; }
EGLDisplay eglDisplay() const { return m_egl_display; }
void *xlib_display() const;

6
src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglnativeinterfacehandler.h
View File

@ -55,9 +55,9 @@ public:
QXcbEglNativeInterfaceHandler(QXcbNativeInterface *nativeInterface);
QPlatformNativeInterface::NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) const Q_DECL_OVERRIDE;
QPlatformNativeInterface::NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) const Q_DECL_OVERRIDE;
QPlatformNativeInterface::NativeResourceForWindowFunction nativeResourceFunctionForWindow(const QByteArray &resource) const Q_DECL_OVERRIDE;
QPlatformNativeInterface::NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) const override;
QPlatformNativeInterface::NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) const override;
QPlatformNativeInterface::NativeResourceForWindowFunction nativeResourceFunctionForWindow(const QByteArray &resource) const override;
private:
static void *eglDisplay();
static void *eglDisplayForWindow(QWindow *window);

6
src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.h
View File

@ -59,11 +59,11 @@ public:
QXcbEglIntegration *glIntegration() const { return m_glIntegration; }
protected:
void create() Q_DECL_OVERRIDE;
void resolveFormat(const QSurfaceFormat &format) Q_DECL_OVERRIDE;
void create() override;
void resolveFormat(const QSurfaceFormat &format) override;
#ifdef XCB_USE_XLIB
const xcb_visualtype_t *createVisual() Q_DECL_OVERRIDE;
const xcb_visualtype_t *createVisual() override;
#endif
private:

18
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h
View File

@ -60,14 +60,14 @@ public:
const QVariant &nativeHandle);
~QGLXContext();
bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
void doneCurrent() Q_DECL_OVERRIDE;
void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
bool makeCurrent(QPlatformSurface *surface) override;
void doneCurrent() override;
void swapBuffers(QPlatformSurface *surface) override;
QFunctionPointer getProcAddress(const char *procName) override;
QSurfaceFormat format() const Q_DECL_OVERRIDE;
bool isSharing() const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QSurfaceFormat format() const override;
bool isSharing() const override;
bool isValid() const override;
GLXContext glxContext() const { return m_context; }
GLXFBConfig glxConfig() const { return m_config; }
@ -100,8 +100,8 @@ public:
explicit QGLXPbuffer(QOffscreenSurface *offscreenSurface);
~QGLXPbuffer();
QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
bool isValid() const Q_DECL_OVERRIDE { return m_pbuffer != 0; }
QSurfaceFormat format() const override { return m_format; }
bool isValid() const override { return m_pbuffer != 0; }
GLXPbuffer pbuffer() const { return m_pbuffer; }

14
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h
View File

@ -52,15 +52,15 @@ public:
QXcbGlxIntegration();
~QXcbGlxIntegration();
bool initialize(QXcbConnection *connection) Q_DECL_OVERRIDE;
bool handleXcbEvent(xcb_generic_event_t *event, uint responseType) Q_DECL_OVERRIDE;
bool initialize(QXcbConnection *connection) override;
bool handleXcbEvent(xcb_generic_event_t *event, uint responseType) override;
QXcbWindow *createWindow(QWindow *window) const Q_DECL_OVERRIDE;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE;
QXcbWindow *createWindow(QWindow *window) const override;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
virtual bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE;
virtual bool supportsSwitchableWidgetComposition() const Q_DECL_OVERRIDE;
bool supportsThreadedOpenGL() const override;
bool supportsSwitchableWidgetComposition() const override;
private:
QXcbConnection *m_connection;

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxnativeinterfacehandler.h
View File

@ -53,7 +53,7 @@ public:
};
QXcbGlxNativeInterfaceHandler(QXcbNativeInterface *nativeInterface);
QPlatformNativeInterface::NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) const Q_DECL_OVERRIDE;
QPlatformNativeInterface::NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) const override;
private:
static void *glxContextForContext(QOpenGLContext *context);

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.h
View File

@ -52,7 +52,7 @@ public:
~QXcbGlxWindow();
protected:
const xcb_visualtype_t *createVisual() Q_DECL_OVERRIDE;
const xcb_visualtype_t *createVisual() override;
};
QT_END_NAMESPACE

12
src/plugins/platforms/xcb/qxcbbackingstore.cpp
View File

@ -122,7 +122,7 @@ public:
, m_image(image)
{ }
bool doLock(AccessTypes access, const QRect &rect) Q_DECL_OVERRIDE
bool doLock(AccessTypes access, const QRect &rect) override
{
Q_UNUSED(rect);
if (access & ~(QPlatformGraphicsBuffer::SWReadAccess | QPlatformGraphicsBuffer::SWWriteAccess))
@ -131,13 +131,13 @@ public:
m_access_lock |= access;
return true;
}
void doUnlock() Q_DECL_OVERRIDE { m_access_lock = None; }
void doUnlock() override { m_access_lock = None; }
const uchar *data() const Q_DECL_OVERRIDE { return m_image->bits(); }
uchar *data() Q_DECL_OVERRIDE { return m_image->bits(); }
int bytesPerLine() const Q_DECL_OVERRIDE { return m_image->bytesPerLine(); }
const uchar *data() const override { return m_image->bits(); }
uchar *data() override { return m_image->bits(); }
int bytesPerLine() const override { return m_image->bytesPerLine(); }
Origin origin() const Q_DECL_OVERRIDE { return QPlatformGraphicsBuffer::OriginTopLeft; }
Origin origin() const override { return QPlatformGraphicsBuffer::OriginTopLeft; }
private:
AccessTypes m_access_lock;
QImage *m_image;

18
src/plugins/platforms/xcb/qxcbbackingstore.h
View File

@ -57,22 +57,22 @@ public:
QXcbBackingStore(QWindow *widget);
~QXcbBackingStore();
QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
QPaintDevice *paintDevice() override;
void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
#ifndef QT_NO_OPENGL
void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
QPlatformTextureList *textures, QOpenGLContext *context,
bool translucentBackground) Q_DECL_OVERRIDE;
bool translucentBackground) override;
#endif
QImage toImage() const Q_DECL_OVERRIDE;
QImage toImage() const override;
QPlatformGraphicsBuffer *graphicsBuffer() const Q_DECL_OVERRIDE;
QPlatformGraphicsBuffer *graphicsBuffer() const override;
void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE;
void resize(const QSize &size, const QRegion &staticContents) override;
bool scroll(const QRegion &area, int dx, int dy) override;
void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
void endPaint() Q_DECL_OVERRIDE;
void beginPaint(const QRegion &) override;
void endPaint() override;
private:
QXcbShmImage *m_image;

8
src/plugins/platforms/xcb/qxcbclipboard.cpp
View File

@ -90,7 +90,7 @@ public:
}
protected:
QStringList formats_sys() const Q_DECL_OVERRIDE
QStringList formats_sys() const override
{
if (isEmpty())
return QStringList();
@ -120,13 +120,13 @@ protected:
return formatList;
}
bool hasFormat_sys(const QString &format) const Q_DECL_OVERRIDE
bool hasFormat_sys(const QString &format) const override
{
QStringList list = formats();
return list.contains(format);
}
QVariant retrieveData_sys(const QString &fmt, QVariant::Type requestedType) const Q_DECL_OVERRIDE
QVariant retrieveData_sys(const QString &fmt, QVariant::Type requestedType) const override
{
if (fmt.isEmpty() || isEmpty())
return QByteArray();
@ -238,7 +238,7 @@ public:
}
protected:
void timerEvent(QTimerEvent *ev) Q_DECL_OVERRIDE
void timerEvent(QTimerEvent *ev) override
{
if (ev->timerId() == abort_timer) {
// this can happen when the X client we are sending data

8
src/plugins/platforms/xcb/qxcbclipboard.h
View File

@ -59,11 +59,11 @@ public:
QXcbClipboard(QXcbConnection *connection);
~QXcbClipboard();
QMimeData *mimeData(QClipboard::Mode mode) Q_DECL_OVERRIDE;
void setMimeData(QMimeData *data, QClipboard::Mode mode) Q_DECL_OVERRIDE;
QMimeData *mimeData(QClipboard::Mode mode) override;
void setMimeData(QMimeData *data, QClipboard::Mode mode) override;
bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE;
bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE;
bool supportsMode(QClipboard::Mode mode) const override;
bool ownsMode(QClipboard::Mode mode) const override;
QXcbScreen *screen() const;

4
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -315,7 +315,7 @@ class QXcbEventReader : public QThread
public:
QXcbEventReader(QXcbConnection *connection);
void run() Q_DECL_OVERRIDE;
void run() override;
QXcbEventArray *lock();
void unlock();
@ -519,7 +519,7 @@ public:
#endif
protected:
bool event(QEvent *e) Q_DECL_OVERRIDE;
bool event(QEvent *e) override;
public slots:
void flush() { xcb_flush(m_connection); }

6
src/plugins/platforms/xcb/qxcbcursor.h
View File

@ -76,10 +76,10 @@ public:
QXcbCursor(QXcbConnection *conn, QXcbScreen *screen);
~QXcbCursor();
#ifndef QT_NO_CURSOR
void changeCursor(QCursor *cursor, QWindow *widget) Q_DECL_OVERRIDE;
void changeCursor(QCursor *cursor, QWindow *widget) override;
#endif
QPoint pos() const Q_DECL_OVERRIDE;
void setPos(const QPoint &pos) Q_DECL_OVERRIDE;
QPoint pos() const override;
void setPos(const QPoint &pos) override;
static void queryPointer(QXcbConnection *c, QXcbVirtualDesktop **virtualDesktop, QPoint *pos, int *keybMask = 0);

6
src/plugins/platforms/xcb/qxcbdrag.cpp
View File

@ -130,9 +130,9 @@ public:
~QXcbDropData();
protected:
bool hasFormat_sys(const QString &mimeType) const Q_DECL_OVERRIDE;
QStringList formats_sys() const Q_DECL_OVERRIDE;
QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE;
bool hasFormat_sys(const QString &mimeType) const override;
QStringList formats_sys() const override;
QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const override;
QVariant xdndObtainData(const QByteArray &format, QVariant::Type requestedType) const;

18
src/plugins/platforms/xcb/qxcbdrag.h
View File

@ -74,14 +74,14 @@ public:
QXcbDrag(QXcbConnection *c);
~QXcbDrag();
virtual QMimeData *platformDropData() Q_DECL_OVERRIDE;
bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
QMimeData *platformDropData() override;
bool eventFilter(QObject *o, QEvent *e) override;
void startDrag() Q_DECL_OVERRIDE;
void cancel() Q_DECL_OVERRIDE;
void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
void endDrag() Q_DECL_OVERRIDE;
void startDrag() override;
void cancel() override;
void move(const QPoint &globalPos) override;
void drop(const QPoint &globalPos) override;
void endDrag() override;
void handleEnter(QPlatformWindow *window, const xcb_client_message_event_t *event, xcb_window_t proxy = 0);
void handlePosition(QPlatformWindow *w, const xcb_client_message_event_t *event);
@ -93,13 +93,13 @@ public:
void handleFinished(const xcb_client_message_event_t *event);
bool dndEnable(QXcbWindow *win, bool on);
bool ownsDragObject() const Q_DECL_OVERRIDE;
bool ownsDragObject() const override;
void updatePixmap();
xcb_timestamp_t targetTime() { return target_time; }
protected:
void timerEvent(QTimerEvent* e) Q_DECL_OVERRIDE;
void timerEvent(QTimerEvent* e) override;
private:
friend class QXcbDropData;

44
src/plugins/platforms/xcb/qxcbintegration.h
View File

@ -60,57 +60,57 @@ public:
QXcbIntegration(const QStringList &parameters, int &argc, char **argv);
~QXcbIntegration();
QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE;
QPlatformWindow *createPlatformWindow(QWindow *window) const override;
#ifndef QT_NO_OPENGL
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
#endif
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE;
QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
bool hasCapability(Capability cap) const Q_DECL_OVERRIDE;
QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
void initialize() Q_DECL_OVERRIDE;
bool hasCapability(Capability cap) const override;
QAbstractEventDispatcher *createEventDispatcher() const override;
void initialize() override;
void moveToScreen(QWindow *window, int screen);
QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
QPlatformFontDatabase *fontDatabase() const override;
QPlatformNativeInterface *nativeInterface()const Q_DECL_OVERRIDE;
QPlatformNativeInterface *nativeInterface()const override;
#ifndef QT_NO_CLIPBOARD
QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
QPlatformClipboard *clipboard() const override;
#endif
#ifndef QT_NO_DRAGANDDROP
QPlatformDrag *drag() const Q_DECL_OVERRIDE;
QPlatformDrag *drag() const override;
#endif
QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
QPlatformInputContext *inputContext() const override;
#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
QPlatformAccessibility *accessibility() const override;
#endif
QPlatformServices *services() const Q_DECL_OVERRIDE;
QPlatformServices *services() const override;
Qt::KeyboardModifiers queryKeyboardModifiers() const Q_DECL_OVERRIDE;
QList<int> possibleKeys(const QKeyEvent *e) const Q_DECL_OVERRIDE;
Qt::KeyboardModifiers queryKeyboardModifiers() const override;
QList<int> possibleKeys(const QKeyEvent *e) const override;
QStringList themeNames() const Q_DECL_OVERRIDE;
QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE;
QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
QStringList themeNames() const override;
QPlatformTheme *createPlatformTheme(const QString &name) const override;
QVariant styleHint(StyleHint hint) const override;
QXcbConnection *defaultConnection() const { return m_connections.first(); }
QByteArray wmClass() const;
#if !defined(QT_NO_SESSIONMANAGER) && defined(XCB_USE_SM)
QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const Q_DECL_OVERRIDE;
QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const override;
#endif
void sync() Q_DECL_OVERRIDE;
void sync() override;
void beep() const Q_DECL_OVERRIDE;
void beep() const override;
static QXcbIntegration *instance() { return m_instance; }

2
src/plugins/platforms/xcb/qxcbmain.cpp
View File

@ -47,7 +47,7 @@ class QXcbIntegrationPlugin : public QPlatformIntegrationPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "xcb.json")
public:
QPlatformIntegration *create(const QString&, const QStringList&, int &, char **) Q_DECL_OVERRIDE;
QPlatformIntegration *create(const QString&, const QStringList&, int &, char **) override;
};
QPlatformIntegration* QXcbIntegrationPlugin::create(const QString& system, const QStringList& parameters, int &argc, char **argv)

24
src/plugins/platforms/xcb/qxcbnativeinterface.h
View File

@ -78,22 +78,22 @@ public:
QXcbNativeInterface();
void *nativeResourceForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE;
void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context) Q_DECL_OVERRIDE;
void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) Q_DECL_OVERRIDE;
void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) Q_DECL_OVERRIDE;
void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *backingStore) Q_DECL_OVERRIDE;
void *nativeResourceForIntegration(const QByteArray &resource) override;
void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context) override;
void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) override;
void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) override;
void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *backingStore) override;
#ifndef QT_NO_CURSOR
void *nativeResourceForCursor(const QByteArray &resource, const QCursor &cursor) Q_DECL_OVERRIDE;
void *nativeResourceForCursor(const QByteArray &resource, const QCursor &cursor) override;
#endif
NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE;
NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) Q_DECL_OVERRIDE;
NativeResourceForScreenFunction nativeResourceFunctionForScreen(const QByteArray &resource) Q_DECL_OVERRIDE;
NativeResourceForWindowFunction nativeResourceFunctionForWindow(const QByteArray &resource) Q_DECL_OVERRIDE;
NativeResourceForBackingStoreFunction nativeResourceFunctionForBackingStore(const QByteArray &resource) Q_DECL_OVERRIDE;
NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) override;
NativeResourceForContextFunction nativeResourceFunctionForContext(const QByteArray &resource) override;
NativeResourceForScreenFunction nativeResourceFunctionForScreen(const QByteArray &resource) override;
NativeResourceForWindowFunction nativeResourceFunctionForWindow(const QByteArray &resource) override;
NativeResourceForBackingStoreFunction nativeResourceFunctionForBackingStore(const QByteArray &resource) override;
QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE;
QFunctionPointer platformFunction(const QByteArray &function) const override;
inline const QByteArray &genericEventFilterType() const { return m_genericEventFilterType; }

28
src/plugins/platforms/xcb/qxcbscreen.h
View File

@ -115,24 +115,24 @@ public:
QString getOutputName(xcb_randr_get_output_info_reply_t *outputInfo);
QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
QPixmap grabWindow(WId window, int x, int y, int width, int height) const override;
QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE;
QWindow *topLevelAt(const QPoint &point) const override;
QRect geometry() const Q_DECL_OVERRIDE { return m_geometry; }
QRect availableGeometry() const Q_DECL_OVERRIDE {return m_availableGeometry;}
int depth() const Q_DECL_OVERRIDE { return screen()->root_depth; }
QImage::Format format() const Q_DECL_OVERRIDE;
QSizeF physicalSize() const Q_DECL_OVERRIDE { return m_sizeMillimeters; }
QRect geometry() const override { return m_geometry; }
QRect availableGeometry() const override {return m_availableGeometry;}
int depth() const override { return screen()->root_depth; }
QImage::Format format() const override;
QSizeF physicalSize() const override { return m_sizeMillimeters; }
QSize virtualSize() const { return m_virtualSize; }
QSizeF physicalVirtualSize() const { return m_virtualSizeMillimeters; }
QDpi virtualDpi() const;
QDpi logicalDpi() const Q_DECL_OVERRIDE;
qreal pixelDensity() const Q_DECL_OVERRIDE;
QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
qreal refreshRate() const Q_DECL_OVERRIDE { return m_refreshRate; }
Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE { return m_orientation; }
QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE { return m_virtualDesktop->screens(); }
QDpi logicalDpi() const override;
qreal pixelDensity() const override;
QPlatformCursor *cursor() const override;
qreal refreshRate() const override { return m_refreshRate; }
Qt::ScreenOrientation orientation() const override { return m_orientation; }
QList<QPlatformScreen *> virtualSiblings() const override { return m_virtualDesktop->screens(); }
QXcbVirtualDesktop *virtualDesktop() const { return m_virtualDesktop; }
void setPrimary(bool primary) { m_primary = primary; }
@ -161,7 +161,7 @@ public:
const xcb_visualtype_t *visualForId(xcb_visualid_t) const;
quint8 depthOfVisual(xcb_visualid_t) const;
QString name() const Q_DECL_OVERRIDE { return m_outputName; }
QString name() const override { return m_outputName; }
void handleScreenChange(xcb_randr_screen_change_notify_event_t *change_event);
void updateGeometry(const QRect &geom, uint8_t rotation);

16
src/plugins/platforms/xcb/qxcbsessionmanager.h
View File

@ -69,17 +69,17 @@ public:
void setSessionId(const QString &id) { m_sessionId = id; }
void setSessionKey(const QString &key) { m_sessionKey = key; }
bool allowsInteraction() Q_DECL_OVERRIDE;
bool allowsErrorInteraction() Q_DECL_OVERRIDE;
void release() Q_DECL_OVERRIDE;
bool allowsInteraction() override;
bool allowsErrorInteraction() override;
void release() override;
void cancel() Q_DECL_OVERRIDE;
void cancel() override;
void setManagerProperty(const QString &name, const QString &value) Q_DECL_OVERRIDE;
void setManagerProperty(const QString &name, const QStringList &value) Q_DECL_OVERRIDE;
void setManagerProperty(const QString &name, const QString &value) override;
void setManagerProperty(const QString &name, const QStringList &value) override;
bool isPhase2() const Q_DECL_OVERRIDE;
void requestPhase2() Q_DECL_OVERRIDE;
bool isPhase2() const override;
void requestPhase2() override;
void exitEventLoop();

2
src/plugins/platforms/xcb/qxcbsystemtraytracker.h
View File

@ -61,7 +61,7 @@ public:
void notifyManagerClientMessageEvent(const xcb_client_message_event_t *);
void handleDestroyNotifyEvent(const xcb_destroy_notify_event_t *) Q_DECL_OVERRIDE;
void handleDestroyNotifyEvent(const xcb_destroy_notify_event_t *) override;
bool visualHasAlphaChannel();
signals:

86
src/plugins/platforms/xcb/qxcbwindow.h
View File

@ -76,75 +76,75 @@ public:
QXcbWindow(QWindow *window);
~QXcbWindow();
void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
void setGeometry(const QRect &rect) override;
QMargins frameMargins() const Q_DECL_OVERRIDE;
QMargins frameMargins() const override;
void setVisible(bool visible) Q_DECL_OVERRIDE;
void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
WId winId() const Q_DECL_OVERRIDE;
void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
void setVisible(bool visible) override;
void setWindowFlags(Qt::WindowFlags flags) override;
void setWindowState(Qt::WindowState state) override;
WId winId() const override;
void setParent(const QPlatformWindow *window) override;
bool isExposed() const Q_DECL_OVERRIDE;
bool isEmbedded(const QPlatformWindow *parentWindow = 0) const Q_DECL_OVERRIDE;
QPoint mapToGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
QPoint mapFromGlobal(const QPoint &pos) const Q_DECL_OVERRIDE;
bool isExposed() const override;
bool isEmbedded(const QPlatformWindow *parentWindow = 0) const override;
QPoint mapToGlobal(const QPoint &pos) const override;
QPoint mapFromGlobal(const QPoint &pos) const override;
void setWindowTitle(const QString &title) Q_DECL_OVERRIDE;
void setWindowTitle(const QString &title) override;
void setWindowIconText(const QString &title);
void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE;
void raise() Q_DECL_OVERRIDE;
void lower() Q_DECL_OVERRIDE;
void propagateSizeHints() Q_DECL_OVERRIDE;
void setWindowIcon(const QIcon &icon) override;
void raise() override;
void lower() override;
void propagateSizeHints() override;
void requestActivateWindow() Q_DECL_OVERRIDE;
void requestActivateWindow() override;
bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE;
bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
bool setKeyboardGrabEnabled(bool grab) override;
bool setMouseGrabEnabled(bool grab) override;
void setCursor(xcb_cursor_t cursor, bool isBitmapCursor);
QSurfaceFormat format() const Q_DECL_OVERRIDE;
QSurfaceFormat format() const override;
void windowEvent(QEvent *event) Q_DECL_OVERRIDE;
void windowEvent(QEvent *event) override;
bool startSystemResize(const QPoint &pos, Qt::Corner corner) Q_DECL_OVERRIDE;
bool startSystemResize(const QPoint &pos, Qt::Corner corner) override;
void setOpacity(qreal level) Q_DECL_OVERRIDE;
void setMask(const QRegion &region) Q_DECL_OVERRIDE;
void setOpacity(qreal level) override;
void setMask(const QRegion &region) override;
void setAlertState(bool enabled) Q_DECL_OVERRIDE;
bool isAlertState() const Q_DECL_OVERRIDE { return m_alertState; }
void setAlertState(bool enabled) override;
bool isAlertState() const override { return m_alertState; }
xcb_window_t xcb_window() const { return m_window; }
uint depth() const { return m_depth; }
QImage::Format imageFormat() const { return m_imageFormat; }
bool imageNeedsRgbSwap() const { return m_imageRgbSwap; }
bool handleGenericEvent(xcb_generic_event_t *event, long *result) Q_DECL_OVERRIDE;
bool handleGenericEvent(xcb_generic_event_t *event, long *result) override;
void handleExposeEvent(const xcb_expose_event_t *event) Q_DECL_OVERRIDE;
void handleClientMessageEvent(const xcb_client_message_event_t *event) Q_DECL_OVERRIDE;
void handleConfigureNotifyEvent(const xcb_configure_notify_event_t *event) Q_DECL_OVERRIDE;
void handleMapNotifyEvent(const xcb_map_notify_event_t *event) Q_DECL_OVERRIDE;
void handleUnmapNotifyEvent(const xcb_unmap_notify_event_t *event) Q_DECL_OVERRIDE;
void handleButtonPressEvent(const xcb_button_press_event_t *event) Q_DECL_OVERRIDE;
void handleButtonReleaseEvent(const xcb_button_release_event_t *event) Q_DECL_OVERRIDE;
void handleMotionNotifyEvent(const xcb_motion_notify_event_t *event) Q_DECL_OVERRIDE;
void handleExposeEvent(const xcb_expose_event_t *event) override;
void handleClientMessageEvent(const xcb_client_message_event_t *event) override;
void handleConfigureNotifyEvent(const xcb_configure_notify_event_t *event) override;
void handleMapNotifyEvent(const xcb_map_notify_event_t *event) override;
void handleUnmapNotifyEvent(const xcb_unmap_notify_event_t *event) override;
void handleButtonPressEvent(const xcb_button_press_event_t *event) override;
void handleButtonReleaseEvent(const xcb_button_release_event_t *event) override;
void handleMotionNotifyEvent(const xcb_motion_notify_event_t *event) override;
void handleEnterNotifyEvent(const xcb_enter_notify_event_t *event) Q_DECL_OVERRIDE;
void handleLeaveNotifyEvent(const xcb_leave_notify_event_t *event) Q_DECL_OVERRIDE;
void handleFocusInEvent(const xcb_focus_in_event_t *event) Q_DECL_OVERRIDE;
void handleFocusOutEvent(const xcb_focus_out_event_t *event) Q_DECL_OVERRIDE;
void handlePropertyNotifyEvent(const xcb_property_notify_event_t *event) Q_DECL_OVERRIDE;
void handleEnterNotifyEvent(const xcb_enter_notify_event_t *event) override;
void handleLeaveNotifyEvent(const xcb_leave_notify_event_t *event) override;
void handleFocusInEvent(const xcb_focus_in_event_t *event) override;
void handleFocusOutEvent(const xcb_focus_out_event_t *event) override;
void handlePropertyNotifyEvent(const xcb_property_notify_event_t *event) override;
#ifdef XCB_USE_XINPUT22
void handleXIMouseButtonState(const xcb_ge_event_t *);
void handleXIMouseEvent(xcb_ge_event_t *, Qt::MouseEventSource source = Qt::MouseEventNotSynthesized) Q_DECL_OVERRIDE;
void handleXIEnterLeave(xcb_ge_event_t *) Q_DECL_OVERRIDE;
void handleXIMouseEvent(xcb_ge_event_t *, Qt::MouseEventSource source = Qt::MouseEventNotSynthesized) override;
void handleXIEnterLeave(xcb_ge_event_t *) override;
#endif
QXcbWindow *toWindow() Q_DECL_OVERRIDE;
QXcbWindow *toWindow() override;
void handleMouseEvent(xcb_timestamp_t time, const QPoint &local, const QPoint &global,
Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source);

2
src/plugins/platforms/xcb/qxcbxsettings.h
View File

@ -61,7 +61,7 @@ public:
void removeCallbackForHandle(const QByteArray &property, void *handle);
void removeCallbackForHandle(void *handle);
void handlePropertyNotifyEvent(const xcb_property_notify_event_t *event) Q_DECL_OVERRIDE;
void handlePropertyNotifyEvent(const xcb_property_notify_event_t *event) override;
private:
QXcbXSettingsPrivate *d_ptr;
};