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/opengl | |
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/opengl')
-rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 4 | ||||
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 56 | ||||
-rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 16 | ||||
-rw-r--r-- | src/opengl/qgl.h | 8 | ||||
-rw-r--r-- | src/opengl/qgl_p.h | 8 | ||||
-rw-r--r-- | src/opengl/qglframebufferobject.h | 6 | ||||
-rw-r--r-- | src/opengl/qglframebufferobject_p.h | 10 | ||||
-rw-r--r-- | src/opengl/qglfunctions.cpp | 4 | ||||
-rw-r--r-- | src/opengl/qglpaintdevice_p.h | 14 | ||||
-rw-r--r-- | src/opengl/qglpixelbuffer.h | 6 | ||||
-rw-r--r-- | src/opengl/qgraphicsshadereffect.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qgraphicsshadereffect_p.h | 2 |
12 files changed, 68 insertions, 68 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index cc7c839abd..eba5dff8d4 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -60,13 +60,13 @@ public: delete m_shaders; } - void invalidateResource() + void invalidateResource() Q_DECL_OVERRIDE { delete m_shaders; m_shaders = 0; } - void freeResource(QOpenGLContext *) + void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE { } diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index ac1d63df17..162b6a6bd9 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -102,37 +102,37 @@ public: QGL2PaintEngineEx(); ~QGL2PaintEngineEx(); - bool begin(QPaintDevice *device); + bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; void ensureActive(); - bool end(); - - virtual void clipEnabledChanged(); - virtual void penChanged(); - virtual void brushChanged(); - virtual void brushOriginChanged(); - virtual void opacityChanged(); - virtual void compositionModeChanged(); - virtual void renderHintsChanged(); - virtual void transformChanged(); - - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); + bool end() Q_DECL_OVERRIDE; + + virtual void clipEnabledChanged() Q_DECL_OVERRIDE; + virtual void penChanged() Q_DECL_OVERRIDE; + virtual void brushChanged() Q_DECL_OVERRIDE; + virtual void brushOriginChanged() Q_DECL_OVERRIDE; + virtual void opacityChanged() Q_DECL_OVERRIDE; + virtual void compositionModeChanged() Q_DECL_OVERRIDE; + virtual void renderHintsChanged() Q_DECL_OVERRIDE; + virtual void transformChanged() Q_DECL_OVERRIDE; + + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, - QPainter::PixmapFragmentHints hints); + QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE; virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor); - virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); - virtual void fill(const QVectorPath &path, const QBrush &brush); - virtual void stroke(const QVectorPath &path, const QPen &pen); - virtual void clip(const QVectorPath &path, Qt::ClipOperation op); + Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; + virtual void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; + virtual void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; + virtual void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; - virtual void drawStaticTextItem(QStaticTextItem *textItem); + virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); - Type type() const { return OpenGL2; } + Type type() const Q_DECL_OVERRIDE { return OpenGL2; } - virtual void setState(QPainterState *s); - virtual QPainterState *createState(QPainterState *orig) const; + virtual void setState(QPainterState *s) Q_DECL_OVERRIDE; + virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; inline QGL2PaintEngineState *state() { return static_cast<QGL2PaintEngineState *>(QPaintEngineEx::state()); } @@ -140,16 +140,16 @@ public: return static_cast<const QGL2PaintEngineState *>(QPaintEngineEx::state()); } - void beginNativePainting(); - void endNativePainting(); + void beginNativePainting() Q_DECL_OVERRIDE; + void endNativePainting() Q_DECL_OVERRIDE; void invalidateState(); void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const { return false; } - bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const; + bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; } + bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE; void setTranslateZ(GLfloat z); @@ -238,7 +238,7 @@ public: void updateClipScissorTest(); void setScissor(const QRect &rect); void regenerateClip(); - void systemStateChanged(); + void systemStateChanged() Q_DECL_OVERRIDE; static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; } diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index fe6f777af5..652cea8151 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -73,7 +73,7 @@ struct QGLGlyphTexture : public QOpenGLSharedResource #endif } - void freeResource(QOpenGLContext *context) + void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE { const QGLContext *ctx = QGLContext::fromOpenGLContext(context); #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG @@ -87,7 +87,7 @@ struct QGLGlyphTexture : public QOpenGLSharedResource ctx->contextHandle()->functions()->glDeleteTextures(1, &m_texture); } - void invalidateResource() + void invalidateResource() Q_DECL_OVERRIDE { m_texture = 0; m_fbo = 0; @@ -107,12 +107,12 @@ public: QGLTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix); ~QGLTextureGlyphCache(); - 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 int glyphPadding() const; - virtual int maxTextureWidth() const; - virtual int maxTextureHeight() const; + 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; + virtual int glyphPadding() const Q_DECL_OVERRIDE; + virtual int maxTextureWidth() const Q_DECL_OVERRIDE; + virtual int maxTextureHeight() const Q_DECL_OVERRIDE; inline GLuint texture() const { QGLTextureGlyphCache *that = const_cast<QGLTextureGlyphCache *>(this); diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 482c215b51..cf35dc7e20 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -398,7 +398,7 @@ public: const QFont & fnt = QFont()); void renderText(double x, double y, double z, const QString & str, const QFont & fnt = QFont()); - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; GLuint bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options); @@ -422,7 +422,7 @@ public Q_SLOTS: virtual void updateOverlayGL(); protected: - bool event(QEvent *); + bool event(QEvent *) Q_DECL_OVERRIDE; virtual void initializeGL(); virtual void resizeGL(int w, int h); virtual void paintGL(); @@ -434,8 +434,8 @@ protected: void setAutoBufferSwap(bool on); bool autoBufferSwap() const; - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); + void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; virtual void glInit(); virtual void glDraw(); diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 4cf656fd86..20b17fb4ae 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -134,7 +134,7 @@ public: void initContext(QGLContext *context, const QGLWidget* shareWidget); bool renderCxPm(QPixmap *pixmap); void cleanupColormaps(); - void aboutToDestroy() { + void aboutToDestroy() Q_DECL_OVERRIDE { if (glcx && !parent_changing) glcx->reset(); } @@ -482,12 +482,12 @@ public: } protected: - void invalidateResource() + void invalidateResource() Q_DECL_OVERRIDE { m_id = 0; } - void freeResource(QOpenGLContext *context) + void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE { if (m_id) { freeResource(QGLContext::fromOpenGLContext(context), m_id); @@ -511,7 +511,7 @@ public: } protected: - void freeResource(QGLContext *ctx, GLuint id) + void freeResource(QGLContext *ctx, GLuint id) Q_DECL_OVERRIDE { m_func(ctx, id); } diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 2382145da1..009254c903 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -78,7 +78,7 @@ public: QImage toImage() const; Attachment attachment() const; - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; GLuint handle() const; static bool bindDefault(); @@ -95,8 +95,8 @@ public: GLenum filter = GL_NEAREST); protected: - int metric(PaintDeviceMetric metric) const; - int devType() const { return QInternal::FramebufferObject; } + int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + int devType() const Q_DECL_OVERRIDE { return QInternal::FramebufferObject; } private: Q_DISABLE_COPY(QGLFramebufferObject) diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index 95a64a1665..bf4bfef0b2 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -100,11 +100,11 @@ public: class QGLFBOGLPaintDevice : public QGLPaintDevice { public: - virtual QPaintEngine* paintEngine() const {return fbo->paintEngine();} - virtual QSize size() const {return fbo->size();} - virtual QGLContext* context() const; - virtual QGLFormat format() const {return fboFormat;} - virtual bool alphaRequested() const { return reqAlpha; } + virtual QPaintEngine* paintEngine() const Q_DECL_OVERRIDE {return fbo->paintEngine();} + virtual QSize size() const Q_DECL_OVERRIDE {return fbo->size();} + virtual QGLContext* context() const Q_DECL_OVERRIDE; + virtual QGLFormat format() const Q_DECL_OVERRIDE {return fboFormat;} + virtual bool alphaRequested() const Q_DECL_OVERRIDE { return reqAlpha; } void setFBO(QGLFramebufferObject* f, QGLFramebufferObject::Attachment attachment); diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp index a397adbb60..8024d7e422 100644 --- a/src/opengl/qglfunctions.cpp +++ b/src/opengl/qglfunctions.cpp @@ -153,12 +153,12 @@ struct QGLFunctionsPrivateEx : public QGLFunctionsPrivate, public QOpenGLSharedR delete funcs; } - void invalidateResource() + void invalidateResource() Q_DECL_OVERRIDE { m_features = -1; } - void freeResource(QOpenGLContext *) + void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE { // no gl resources to free } diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h index f0855317ea..624cfacd89 100644 --- a/src/opengl/qglpaintdevice_p.h +++ b/src/opengl/qglpaintdevice_p.h @@ -58,7 +58,7 @@ public: QGLPaintDevice(); virtual ~QGLPaintDevice(); - int devType() const {return QInternal::OpenGL;} + int devType() const Q_DECL_OVERRIDE {return QInternal::OpenGL;} virtual void beginPaint(); virtual void ensureActiveTarget(); @@ -74,7 +74,7 @@ public: static QGLPaintDevice* getDevice(QPaintDevice*); protected: - int metric(QPaintDevice::PaintDeviceMetric metric) const; + int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; GLuint m_previousFBO; GLuint m_thisFBO; }; @@ -87,13 +87,13 @@ class Q_OPENGL_EXPORT QGLWidgetGLPaintDevice : public QGLPaintDevice public: QGLWidgetGLPaintDevice(); - virtual QPaintEngine* paintEngine() const; + virtual QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; // QGLWidgets need to do swapBufers in endPaint: - virtual void beginPaint(); - virtual void endPaint(); - virtual QSize size() const; - virtual QGLContext* context() const; + virtual void beginPaint() Q_DECL_OVERRIDE; + virtual void endPaint() Q_DECL_OVERRIDE; + virtual QSize size() const Q_DECL_OVERRIDE; + virtual QGLContext* context() const Q_DECL_OVERRIDE; void setWidget(QGLWidget*); diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index d4b88598af..975fe4706e 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -75,14 +75,14 @@ public: Qt::HANDLE handle() const; QImage toImage() const; - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QGLFormat format() const; static bool hasOpenGLPbuffers(); protected: - int metric(PaintDeviceMetric metric) const; - int devType() const { return QInternal::Pbuffer; } + int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + int devType() const Q_DECL_OVERRIDE { return QInternal::Pbuffer; } private: Q_DISABLE_COPY(QGLPixelBuffer) diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index 928504ac73..07ae10bd30 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -139,7 +139,7 @@ public: setSource(source); } - void setUniforms(QGLShaderProgram *program); + void setUniforms(QGLShaderProgram *program) Q_DECL_OVERRIDE; QGraphicsShaderEffect *effect; }; diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index 794a9177fd..de00e28dc4 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -69,7 +69,7 @@ public: void setPixelShaderFragment(const QByteArray& code); protected: - void draw(QPainter *painter); + void draw(QPainter *painter) Q_DECL_OVERRIDE; void setUniformsDirty(); virtual void setUniforms(QGLShaderProgram *program); |