diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/gui/painting | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) |
Add Q_DECL_OVERRIDE in the src subdirectory
Done automatically with clang-modernize on linux
(But does not add Q_DECL_OVERRIDE to the function that are marked
as inline because it a compilation error with MSVC2010)
Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qpaintbuffer.cpp | 6 | ||||
-rw-r--r-- | src/gui/painting/qpaintengineex_p.h | 26 | ||||
-rw-r--r-- | src/gui/painting/qpdf_p.h | 26 | ||||
-rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 6 |
4 files changed, 32 insertions, 32 deletions
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp index be147ec842..56b3e37762 100644 --- a/src/gui/painting/qpaintbuffer.cpp +++ b/src/gui/painting/qpaintbuffer.cpp @@ -545,7 +545,7 @@ class QPaintBufferEnginePrivate : public QPaintEngineExPrivate { Q_DECLARE_PUBLIC(QPaintBufferEngine) public: - void systemStateChanged() { + void systemStateChanged() Q_DECL_OVERRIDE { Q_Q(QPaintBufferEngine); q->buffer->addCommand(QPaintBufferPrivate::Cmd_SystemStateChanged, QVariant(systemClip)); } @@ -1327,8 +1327,8 @@ public: QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); } void setDpiX(int dpi) { dpi_x = dpi; } void setDpiY(int dpi) { dpi_y = dpi; } - QPaintEngine *paintEngine() const { return 0; } - int metric(PaintDeviceMetric m) const + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE { return 0; } + int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE { switch(m) { case PdmPhysicalDpiX: diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index 82fcd9765a..8a273a6b86 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -98,22 +98,22 @@ public: virtual void drawRoundedRect(const QRectF &rect, qreal xrad, qreal yrad, Qt::SizeMode mode); - virtual void drawRects(const QRect *rects, int rectCount); - virtual void drawRects(const QRectF *rects, int rectCount); + virtual void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE; + virtual void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; - virtual void drawLines(const QLine *lines, int lineCount); - virtual void drawLines(const QLineF *lines, int lineCount); + virtual void drawLines(const QLine *lines, int lineCount) Q_DECL_OVERRIDE; + virtual void drawLines(const QLineF *lines, int lineCount) Q_DECL_OVERRIDE; - virtual void drawEllipse(const QRectF &r); - virtual void drawEllipse(const QRect &r); + virtual void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE; + virtual void drawEllipse(const QRect &r) Q_DECL_OVERRIDE; - virtual void drawPath(const QPainterPath &path); + virtual void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; - virtual void drawPoints(const QPointF *points, int pointCount); - virtual void drawPoints(const QPoint *points, int pointCount); + virtual void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; + virtual void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE; - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); + virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; + virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) = 0; virtual void drawPixmap(const QPointF &pos, const QPixmap &pm); @@ -122,12 +122,12 @@ public: Qt::ImageConversionFlags flags = Qt::AutoColor) = 0; virtual void drawImage(const QPointF &pos, const QImage &image); - virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); + virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, QFlags<QPainter::PixmapFragmentHint> hints); - virtual void updateState(const QPaintEngineState &state); + virtual void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; virtual void drawStaticTextItem(QStaticTextItem *); diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h index 0fffa608ac..5547a28bcd 100644 --- a/src/gui/painting/qpdf_p.h +++ b/src/gui/painting/qpdf_p.h @@ -177,26 +177,26 @@ public: int resolution() const; // reimplementations QPaintEngine - bool begin(QPaintDevice *pdev); - bool end(); + bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; + bool end() Q_DECL_OVERRIDE; - void drawPoints(const QPointF *points, int pointCount); - void drawLines(const QLineF *lines, int lineCount); - void drawRects(const QRectF *rects, int rectCount); - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - void drawPath (const QPainterPath & path); + void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; + void drawLines(const QLineF *lines, int lineCount) Q_DECL_OVERRIDE; + void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; + void drawPath (const QPainterPath & path) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &p, const QTextItem &textItem); + void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; - void drawPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QRectF & sr); + void drawPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QRectF & sr) Q_DECL_OVERRIDE; void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor); - void drawTiledPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QPointF & point); + Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; + void drawTiledPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QPointF & point) Q_DECL_OVERRIDE; - void updateState(const QPaintEngineState &state); + void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; int metric(QPaintDevice::PaintDeviceMetric metricType) const; - Type type() const; + Type type() const Q_DECL_OVERRIDE; // end reimplementations QPaintEngine // Printer stuff... diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index 50c2c9dcc6..2963c41f5c 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -157,9 +157,9 @@ class Q_GUI_EXPORT QImageTextureGlyphCache : public QTextureGlyphCache public: QImageTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix) : QTextureGlyphCache(format, matrix) { } - virtual void createTextureData(int width, int height); - virtual void resizeTextureData(int width, int height); - virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition); + virtual void createTextureData(int width, int height) Q_DECL_OVERRIDE; + virtual void resizeTextureData(int width, int height) Q_DECL_OVERRIDE; + virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; inline const QImage &image() const { return m_image; } |