diff options
author | Simo Fält <simo.falt@nokia.com> | 2012-03-29 13:35:50 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@nokia.com> | 2012-03-29 13:35:50 +0300 |
commit | ca572c0b806388cbc58dcba4ab6d7cc25d89366a (patch) | |
tree | f0d6175666984d0184dfe2605e1bd9e91fb02157 /src/plugins/platforms/qnx/qqnxglbackingstore.h | |
parent | 064dc31b190f737e2ae83d3629c31512cb69435c (diff) | |
parent | 4451010026aa559ec0f88e096f7f6afe28c34b6f (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbaseqt-v5.0.0-alpha1
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxglbackingstore.h')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxglbackingstore.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/platforms/qnx/qqnxglbackingstore.h b/src/plugins/platforms/qnx/qqnxglbackingstore.h index d04fe22f5d..b694079f37 100644 --- a/src/plugins/platforms/qnx/qqnxglbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxglbackingstore.h @@ -58,11 +58,11 @@ class QQnxGLPaintDevice : public QGLPaintDevice { public: QQnxGLPaintDevice(QWindow *window); - virtual ~QQnxGLPaintDevice(); + ~QQnxGLPaintDevice(); - virtual QPaintEngine *paintEngine() const; - virtual QSize size() const; - virtual QGLContext *context() const { return m_glContext; } + QPaintEngine *paintEngine() const; + QSize size() const; + QGLContext *context() const { return m_glContext; } private: QQnxWindow *m_window; @@ -73,13 +73,13 @@ class QQnxGLBackingStore : public QPlatformBackingStore { public: QQnxGLBackingStore(QWindow *window); - virtual ~QQnxGLBackingStore(); + ~QQnxGLBackingStore(); - virtual QPaintDevice *paintDevice() { return m_paintDevice; } - virtual void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); - virtual void resize(const QSize &size, const QRegion &staticContents); - virtual void beginPaint(const QRegion ®ion); - virtual void endPaint(const QRegion ®ion); + QPaintDevice *paintDevice() { return m_paintDevice; } + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); + void resize(const QSize &size, const QRegion &staticContents); + void beginPaint(const QRegion ®ion); + void endPaint(const QRegion ®ion); void resizeSurface(const QSize &size); |