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/platformsupport/fbconvenience/qfbbackingstore.cpp | 9 --------- src/platformsupport/fbconvenience/qfbbackingstore_p.h | 3 --- 2 files changed, 12 deletions(-) (limited to 'src/platformsupport/fbconvenience') diff --git a/src/platformsupport/fbconvenience/qfbbackingstore.cpp b/src/platformsupport/fbconvenience/qfbbackingstore.cpp index b378434ef2..9ab212a998 100644 --- a/src/platformsupport/fbconvenience/qfbbackingstore.cpp +++ b/src/platformsupport/fbconvenience/qfbbackingstore.cpp @@ -77,14 +77,5 @@ void QFbBackingStore::resize(const QSize &size, const QRegion &staticContents) mImage = QImage(size, window()->screen()->handle()->format()); } -void QFbBackingStore::beginPaint(const QRegion ®ion) -{ - Q_UNUSED(region); -} - -void QFbBackingStore::endPaint() -{ -} - QT_END_NAMESPACE diff --git a/src/platformsupport/fbconvenience/qfbbackingstore_p.h b/src/platformsupport/fbconvenience/qfbbackingstore_p.h index c7f97deded..8e560ee46a 100644 --- a/src/platformsupport/fbconvenience/qfbbackingstore_p.h +++ b/src/platformsupport/fbconvenience/qfbbackingstore_p.h @@ -59,9 +59,6 @@ public: virtual QPaintDevice *paintDevice() { return &mImage; } virtual void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); - virtual void beginPaint(const QRegion ®ion); - virtual void endPaint(); - virtual void resize(const QSize &size, const QRegion ®ion); const QImage image() { return mImage; } -- cgit v1.2.3