From 11dc9ca32426cb6879022b588c5aacf3f63c0366 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Wed, 11 Jul 2012 16:36:47 +0200
Subject: QNX: Extract and move adjustBufferSize() function

Change-Id: Ia1719314460b9c51d6eba04ab1c43f02be1777b6
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
---
 src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp | 6 +-----
 src/plugins/platforms/qnx/qqnxwindow.cpp             | 7 +++++++
 src/plugins/platforms/qnx/qqnxwindow.h               | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/plugins/platforms/qnx')

diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
index ad8c50b63b..70af4b3579 100644
--- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
+++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
@@ -142,11 +142,7 @@ void QQnxRasterBackingStore::beginPaint(const QRegion &region)
 
     qRasterBackingStoreDebug() << Q_FUNC_INFO << "w =" << window();
 
-    // resize window buffers if surface resized
-    QSize s = window()->size();
-    if (s != m_platformWindow->bufferSize()) {
-        m_platformWindow->setBufferSize(s);
-    }
+    m_platformWindow->adjustBufferSize();
 }
 
 void QQnxRasterBackingStore::endPaint(const QRegion &region)
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 29ef5241c4..572dff7289 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -303,6 +303,13 @@ QSize QQnxWindow::requestedBufferSize() const
     return m_requestedBufferSize;
 }
 
+void QQnxWindow::adjustBufferSize()
+{
+    const QSize windowSize = window()->size();
+    if (windowSize != bufferSize())
+        setBufferSize(windowSize);
+}
+
 void QQnxWindow::setBufferSize(const QSize &size)
 {
     qWindowDebug() << Q_FUNC_INFO << "window =" << window() << "size =" << size;
diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h
index 54d54fb5b2..2ee15ab96b 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.h
+++ b/src/plugins/platforms/qnx/qqnxwindow.h
@@ -86,6 +86,7 @@ public:
     // Called by QQnxGLContext::createSurface()
     QSize requestedBufferSize() const;
 
+    void adjustBufferSize();
     void setBufferSize(const QSize &size);
     QSize bufferSize() const { return m_bufferSize; }
     bool hasBuffers() const { return !m_bufferSize.isEmpty(); }
-- 
cgit v1.2.3