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

Add override keyword to QPlatformSurface derived classes

Browse Source 
Change-Id: I9ce58fb48fd41f4fc340188c1df358d9ef215c3f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Jesus Fernandez 2017-08-04 17:06:30 +02:00 committed by Jesus Fernandez
parent 22998e64d9
commit a6c4d54eaf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qplatformoffscreensurface.h
View File

@ -64,13 +64,13 @@ class Q_GUI_EXPORT QPlatformOffscreenSurface : public QPlatformSurface
Q_DECLARE_PRIVATE(QPlatformOffscreenSurface) Q_DECLARE_PRIVATE(QPlatformOffscreenSurface)
public: public:
explicit QPlatformOffscreenSurface(QOffscreenSurface *offscreenSurface); explicit QPlatformOffscreenSurface(QOffscreenSurface *offscreenSurface);
virtual ~QPlatformOffscreenSurface(); ~QPlatformOffscreenSurface() override;
QOffscreenSurface *offscreenSurface() const; QOffscreenSurface *offscreenSurface() const;
QPlatformScreen *screen() const; QPlatformScreen *screen() const;
virtual QSurfaceFormat format() const Q_DECL_OVERRIDE; virtual QSurfaceFormat format() const override;
virtual bool isValid() const; virtual bool isValid() const;
protected: protected:

4
src/gui/kernel/qplatformwindow.h
View File

@ -72,7 +72,7 @@ class Q_GUI_EXPORT QPlatformWindow : public QPlatformSurface
Q_DECLARE_PRIVATE(QPlatformWindow) Q_DECLARE_PRIVATE(QPlatformWindow)
public: public:
explicit QPlatformWindow(QWindow *window); explicit QPlatformWindow(QWindow *window);
virtual ~QPlatformWindow(); ~QPlatformWindow() override;
virtual void initialize(); virtual void initialize();
@ -81,7 +81,7 @@ public:
QPlatformScreen *screen() const; QPlatformScreen *screen() const;
virtual QSurfaceFormat format() const Q_DECL_OVERRIDE; virtual QSurfaceFormat format() const override;
virtual void setGeometry(const QRect &rect); virtual void setGeometry(const QRect &rect);
virtual QRect geometry() const; virtual QRect geometry() const;