diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-25 13:19:03 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-29 08:39:33 +0200 |
| commit | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (patch) | |
| tree | ca04418b4cc59548dfeb8133af948c5e583afc57 /src/plugins/platforms/direct2d | |
| parent | 87242756d44b6c1b697290b583484550694a9695 (diff) | |
Windows/Direct2D platform plugins: Add Q_DECL_OVERRIDE.
Replace old virtual declarations by Q_DECL_OVERRIDE where
applicable.
Errors discovered: QWindowsScreen::primaryOrientation() did not
overwrite any method, changed to orientation().
Task-number: QTBUG-38858
Task-number: QTBUG-38993
Change-Id: Ie85d5235f3cd35c7a24cac3c1c7693c6508b1009
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/plugins/platforms/direct2d')
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h b/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h index 1936ef0622..702ef7af92 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h @@ -60,22 +60,22 @@ public: QWindowsDirect2DPlatformPixmap(PixelType pixelType, QWindowsDirect2DBitmap *bitmap); ~QWindowsDirect2DPlatformPixmap(); - virtual void resize(int width, int height); + void resize(int width, int height) Q_DECL_OVERRIDE; virtual void fromImage(const QImage &image, Qt::ImageConversionFlags flags); - virtual int metric(QPaintDevice::PaintDeviceMetric metric) const; - virtual void fill(const QColor &color); + int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + void fill(const QColor &color) Q_DECL_OVERRIDE; - virtual bool hasAlphaChannel() const; + bool hasAlphaChannel() const Q_DECL_OVERRIDE; - virtual QImage toImage() const; - virtual QImage toImage(const QRect &rect) const; + QImage toImage() const Q_DECL_OVERRIDE; + QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE; - virtual QPaintEngine* paintEngine() const; + QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; - virtual qreal devicePixelRatio() const; - virtual void setDevicePixelRatio(qreal scaleFactor); + qreal devicePixelRatio() const Q_DECL_OVERRIDE; + void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; QWindowsDirect2DBitmap *bitmap() const; |