From 71c8fe296fe5aa7e79033dd8f5b539852d4276e0 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Fri, 13 Apr 2012 13:09:28 -0700 Subject: [PATCH] Don't use QWindow::visible() since it's deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use QWindow::isVisible() instead. Change-Id: I7dcd70e69a070d66f97f300cc292c1bfc51cf09c Reviewed-by: Samuel Rødal Reviewed-by: Gunnar Sletta --- src/quick/items/qquickwindowmanager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp index 0a378f6..45a379a 100644 --- a/src/quick/items/qquickwindowmanager.cpp +++ b/src/quick/items/qquickwindowmanager.cpp @@ -404,7 +404,7 @@ void QQuickRenderThreadSingleContextWindowManager::handleAddedWindow(QQuickCanva CanvasData *data = new CanvasData; data->sizeWasChanged = false; data->windowSize = canvas->size(); - data->isVisible = canvas->visible(); + data->isVisible = canvas->isVisible(); m_rendered_windows[canvas] = data; isExternalUpdatePending = true; @@ -516,7 +516,7 @@ void QQuickRenderThreadSingleContextWindowManager::canvasVisibilityChanged() CanvasTracker &t = const_cast(m_tracked_windows.at(i)); QQuickCanvas *win = t.canvas; - Q_ASSERT(win->visible() || QQuickCanvasPrivate::get(win)->renderWithoutShowing || t.toBeRemoved); + Q_ASSERT(win->isVisible() || QQuickCanvasPrivate::get(win)->renderWithoutShowing || t.toBeRemoved); bool canvasVisible = win->width() > 0 && win->height() > 0; anyoneShowing |= (canvasVisible && !t.toBeRemoved); @@ -1173,11 +1173,11 @@ void QQuickTrivialWindowManager::renderCanvas(QQuickCanvas *canvas) CanvasData &data = const_cast(m_windows[canvas]); QQuickCanvas *masterCanvas = 0; - if (!canvas->visible()) { + if (!canvas->isVisible()) { // Find a "proper surface" to bind... for (QHash::const_iterator it = m_windows.constBegin(); it != m_windows.constEnd() && !masterCanvas; ++it) { - if (it.key()->visible()) + if (it.key()->isVisible()) masterCanvas = it.key(); } } else { @@ -1211,7 +1211,7 @@ void QQuickTrivialWindowManager::renderCanvas(QQuickCanvas *canvas) data.grabOnly = false; } - if (alsoSwap && canvas->visible()) { + if (alsoSwap && canvas->isVisible()) { gl->swapBuffers(canvas); cd->fireFrameSwapped(); } -- 2.7.4