diff options
author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-02 15:49:51 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 11:28:26 +0200 |
commit | aed9a8d49b7470de6809c3bf747b14c7150d7ae6 (patch) | |
tree | fb566c75ccccf7623170629b61c0ac760c295d98 /src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp | |
parent | e39d629ebe9044b505ac35eaae3ab9c214d452a2 (diff) |
Split QQnxWindow into QQnxEglWindow and QQnxRasterWindow
Change-Id: I2fb4096ccca54fa6631aa16c9b8d1308b0a6b918
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp index 5481b118e8..57914cf2fb 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp @@ -1,6 +1,6 @@ /*************************************************************************** ** -** Copyright (C) 2011 - 2012 Research In Motion +** Copyright (C) 2011 - 2013 BlackBerry Limited. All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of the plugins of the Qt Toolkit. @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qqnxrasterbackingstore.h" -#include "qqnxwindow.h" +#include "qqnxrasterwindow.h" #include <QtCore/QDebug> @@ -70,15 +70,16 @@ QQnxRasterBackingStore::~QQnxRasterBackingStore() QPaintDevice *QQnxRasterBackingStore::paintDevice() { - QQnxWindow *platformWindow = this->platformWindow(); - if (platformWindow->hasBuffers()) - return platformWindow->renderBuffer().image(); + if (platformWindow() && platformWindow()->hasBuffers()) + return platformWindow()->renderBuffer().image(); return 0; } void QQnxRasterBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) { + Q_UNUSED(offset) + qRasterBackingStoreDebug() << Q_FUNC_INFO << "w =" << this->window(); // Sometimes this method is called even though there is nothing to be @@ -96,8 +97,7 @@ void QQnxRasterBackingStore::flush(QWindow *window, const QRegion ®ion, const // child windows, are performed; conceptually ,child windows have no buffers // (actually they do have a 1x1 placeholder buffer due to libscreen limitations), // since Qt will only draw to the backing store of the top-level window. - QQnxWindow *platformWindow = this->platformWindow(); - if (!targetWindow || targetWindow == platformWindow) { + if (!targetWindow || targetWindow == platformWindow()) { // visit all pending scroll operations for (int i = m_scrollOpList.size() - 1; i >= 0; i--) { @@ -105,14 +105,14 @@ void QQnxRasterBackingStore::flush(QWindow *window, const QRegion ®ion, const // do the scroll operation ScrollOp &op = m_scrollOpList[i]; QRegion srcArea = op.totalArea.intersected( op.totalArea.translated(-op.dx, -op.dy) ); - platformWindow->scroll(srcArea, op.dx, op.dy); + platformWindow()->scroll(srcArea, op.dx, op.dy); } // clear all pending scroll operations m_scrollOpList.clear(); // update the display with newly rendered content - platformWindow->post(region); + platformWindow()->post(region); } m_hasUnflushedPaintOperations = false; @@ -174,10 +174,10 @@ void QQnxRasterBackingStore::endPaint() qRasterBackingStoreDebug() << Q_FUNC_INFO << "w =" << window(); } -QQnxWindow *QQnxRasterBackingStore::platformWindow() const +QQnxRasterWindow *QQnxRasterBackingStore::platformWindow() const { Q_ASSERT(m_window->handle()); - return static_cast<QQnxWindow*>(m_window->handle()); + return static_cast<QQnxRasterWindow*>(m_window->handle()); } QT_END_NAMESPACE |