From 4c19055cb1b077cf161d9cd5c031d711f42a3f25 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 29 Aug 2013 12:24:37 +0200 Subject: remove unnecessary beginPaint and endPaint overrides QPlatformBackingStore::endPaint does not take a QRegion parameter. 6ce6b8a378b0d97ba950240ffb048a4b7e485235 set the API, but the platform implementations were not all synced up since then. There was anyway no point in overriding beginPaint and endPaint on platforms which don't need to do anything there. This fixes clang warnings of the form QXcbBackingStore::endPaint hides overloaded virtual function Change-Id: Id6cd0fc2c831a34576ac2c73eeb0d5741d26e622 Reviewed-by: Gunnar Sletta --- src/plugins/platforms/directfb/qdirectfbbackingstore.cpp | 10 ---------- src/plugins/platforms/directfb/qdirectfbbackingstore.h | 3 --- src/plugins/platforms/eglfs/qeglfsbackingstore.cpp | 4 ---- src/plugins/platforms/eglfs/qeglfsbackingstore.h | 1 - src/plugins/platforms/ios/qiosbackingstore.h | 1 - src/plugins/platforms/ios/qiosbackingstore.mm | 6 ------ src/plugins/platforms/kms/qkmsbackingstore.cpp | 4 ---- src/plugins/platforms/kms/qkmsbackingstore.h | 1 - src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp | 3 +-- src/plugins/platforms/qnx/qqnxrasterbackingstore.h | 2 +- src/plugins/platforms/xcb/qxcbbackingstore.cpp | 4 ---- src/plugins/platforms/xcb/qxcbbackingstore.h | 1 - 12 files changed, 2 insertions(+), 38 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp b/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp index facc03247f..4f0537cba4 100644 --- a/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp +++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp @@ -119,14 +119,4 @@ bool QDirectFbBackingStore::scroll(const QRegion &area, int dx, int dy) return true; } -void QDirectFbBackingStore::beginPaint(const QRegion ®ion) -{ - Q_UNUSED(region); -} - -void QDirectFbBackingStore::endPaint(const QRegion ®ion) -{ - Q_UNUSED(region); -} - QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbbackingstore.h b/src/plugins/platforms/directfb/qdirectfbbackingstore.h index 3ed3e1223e..f311ffbf64 100644 --- a/src/plugins/platforms/directfb/qdirectfbbackingstore.h +++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.h @@ -61,9 +61,6 @@ public: void resize (const QSize &size, const QRegion &staticContents); bool scroll(const QRegion &area, int dx, int dy); - void beginPaint(const QRegion ®ion); - void endPaint(const QRegion ®ion); - private: void lockSurfaceToImage(); diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp b/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp index e09154bb59..5b83a76143 100644 --- a/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp +++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp @@ -203,10 +203,6 @@ void QEglFSBackingStore::beginPaint(const QRegion &rgn) m_dirty = m_dirty | rgn; } -void QEglFSBackingStore::endPaint() -{ -} - void QEglFSBackingStore::resize(const QSize &size, const QRegion &staticContents) { Q_UNUSED(staticContents); diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.h b/src/plugins/platforms/eglfs/qeglfsbackingstore.h index 9c5d694b90..5d86814df9 100644 --- a/src/plugins/platforms/eglfs/qeglfsbackingstore.h +++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.h @@ -62,7 +62,6 @@ public: QPaintDevice *paintDevice(); void beginPaint(const QRegion &); - void endPaint(); void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); void resize(const QSize &size, const QRegion &staticContents); diff --git a/src/plugins/platforms/ios/qiosbackingstore.h b/src/plugins/platforms/ios/qiosbackingstore.h index c110f0e4d1..4199530a01 100644 --- a/src/plugins/platforms/ios/qiosbackingstore.h +++ b/src/plugins/platforms/ios/qiosbackingstore.h @@ -55,7 +55,6 @@ public: QPaintDevice *paintDevice(); void beginPaint(const QRegion &); - void endPaint(); void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); void resize(const QSize &size, const QRegion &staticContents); diff --git a/src/plugins/platforms/ios/qiosbackingstore.mm b/src/plugins/platforms/ios/qiosbackingstore.mm index 6007e247f0..2dadc5672b 100644 --- a/src/plugins/platforms/ios/qiosbackingstore.mm +++ b/src/plugins/platforms/ios/qiosbackingstore.mm @@ -105,12 +105,6 @@ void QIOSBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoin m_context->swapBuffers(window); } -void QIOSBackingStore::endPaint() -{ - // Calling makeDone() on the context here would be an option, - // but is not needed, and would actually add some overhead. -} - void QIOSBackingStore::resize(const QSize &size, const QRegion &staticContents) { Q_UNUSED(staticContents); diff --git a/src/plugins/platforms/kms/qkmsbackingstore.cpp b/src/plugins/platforms/kms/qkmsbackingstore.cpp index 6cd280d719..29395f3b4f 100644 --- a/src/plugins/platforms/kms/qkmsbackingstore.cpp +++ b/src/plugins/platforms/kms/qkmsbackingstore.cpp @@ -78,10 +78,6 @@ void QKmsBackingStore::beginPaint(const QRegion &rgn) m_dirty |= rgn; } -void QKmsBackingStore::endPaint() -{ -} - void QKmsBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) { Q_UNUSED(region) diff --git a/src/plugins/platforms/kms/qkmsbackingstore.h b/src/plugins/platforms/kms/qkmsbackingstore.h index d9221d2d19..34ea49a346 100644 --- a/src/plugins/platforms/kms/qkmsbackingstore.h +++ b/src/plugins/platforms/kms/qkmsbackingstore.h @@ -59,7 +59,6 @@ public: QPaintDevice *paintDevice(); void beginPaint(const QRegion &); - void endPaint(); void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); void resize(const QSize &size, const QRegion &staticContents); diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp index 1da3cd5446..5481b118e8 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp @@ -169,9 +169,8 @@ void QQnxRasterBackingStore::beginPaint(const QRegion ®ion) platformWindow()->adjustBufferSize(); } -void QQnxRasterBackingStore::endPaint(const QRegion ®ion) +void QQnxRasterBackingStore::endPaint() { - Q_UNUSED(region); qRasterBackingStoreDebug() << Q_FUNC_INFO << "w =" << window(); } diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h index a344ff209d..4e682aa52d 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h @@ -61,7 +61,7 @@ public: void resize(const QSize &size, const QRegion &staticContents); bool scroll(const QRegion &area, int dx, int dy); void beginPaint(const QRegion ®ion); - void endPaint(const QRegion ®ion); + void endPaint(); private: class ScrollOp { diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp index dc677cd3be..e93b36cb99 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp +++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp @@ -283,10 +283,6 @@ void QXcbBackingStore::beginPaint(const QRegion ®ion) } } -void QXcbBackingStore::endPaint(const QRegion &) -{ -} - void QXcbBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) { if (!m_image || m_image->size().isEmpty()) diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h index 95199f3549..d2548242db 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.h +++ b/src/plugins/platforms/xcb/qxcbbackingstore.h @@ -64,7 +64,6 @@ public: bool scroll(const QRegion &area, int dx, int dy); void beginPaint(const QRegion &); - void endPaint(const QRegion &); private: QXcbShmImage *m_image; -- cgit v1.2.3