From f4ecc48112c3084c8f031e2c036acf329ed5d780 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 4 Jun 2014 10:51:31 +0300 Subject: [PATCH] Android: Rename image method to toImage. toImage is a virtual method declared in QPlatformBackingStore and is useful when you need to access the image buffer from outside the QPA plugin. (e.g. you can use QPlatformBackingStore::toImage().save("bs.png") to save it). Change-Id: I7cc70ed295070707ed0ef3ce208129f174f68cfb Reviewed-by: Paul Olav Tvete --- src/plugins/platforms/android/qandroidplatformbackingstore.h | 2 +- src/plugins/platforms/android/qandroidplatformscreen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/android/qandroidplatformbackingstore.h b/src/plugins/platforms/android/qandroidplatformbackingstore.h index 4c24e129c3..c51ebe879d 100644 --- a/src/plugins/platforms/android/qandroidplatformbackingstore.h +++ b/src/plugins/platforms/android/qandroidplatformbackingstore.h @@ -55,7 +55,7 @@ public: virtual QPaintDevice *paintDevice(); virtual void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); virtual void resize(const QSize &size, const QRegion &staticContents); - const QImage image() { return m_image; } + QImage toImage() const { return m_image; } void setBackingStore(QWindow *window); protected: QImage m_image; diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index 678f4e6b5a..f03f551d8a 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -308,7 +308,7 @@ void QAndroidPlatformScreen::doRedraw() QRect windowRect = targetRect.translated(-window->geometry().topLeft()); QAndroidPlatformBackingStore *backingStore = static_cast(window)->backingStore(); if (backingStore) - compositePainter.drawImage(targetRect.topLeft(), backingStore->image(), windowRect); + compositePainter.drawImage(targetRect.topLeft(), backingStore->toImage(), windowRect); } }