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

vnc: Replace Q_DECL_OVERRIDE by override

Browse Source 
Change-Id: Id06dfc73d1ad41822b2f07b585f32e9e6e5d08f2
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Alexander Volkov 2017-01-06 13:40:04 +03:00
parent 6b7e633248
commit 7991a70d28
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/vnc/main.cpp
View File

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

18
src/plugins/platforms/vnc/qvncintegration.h
View File

@ -55,19 +55,19 @@ public:
QVncIntegration(const QStringList &paramList);
~QVncIntegration();
void initialize() Q_DECL_OVERRIDE;
bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE;
void initialize() override;
bool hasCapability(QPlatformIntegration::Capability cap) const override;
QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE;
QPlatformWindow *createPlatformWindow(QWindow *window) const override;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
QAbstractEventDispatcher *createEventDispatcher() const override;
QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
QPlatformServices *services() const Q_DECL_OVERRIDE;
QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; }
QPlatformFontDatabase *fontDatabase() const override;
QPlatformServices *services() const override;
QPlatformInputContext *inputContext() const override { return m_inputContext; }
QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
QPlatformNativeInterface *nativeInterface() const override;
QList<QPlatformScreen *> screens() const;

8
src/plugins/platforms/vnc/qvncscreen.h
View File

@ -61,16 +61,16 @@ public:
bool initialize() 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;
QRegion doRedraw() Q_DECL_OVERRIDE;
QRegion doRedraw() override;
QImage *image() { return &mScreenImage; }
void enableClientCursor(QVncClient *client);
void disableClientCursor(QVncClient *client);
QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
QPlatformCursor *cursor() const override;
Flags flags() const Q_DECL_OVERRIDE;
Flags flags() const override;
void clearDirty() { dirtyRegion = QRegion(); }