From 10c88faf79de45f86a0826d104e202b4e12eba6b Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Fri, 13 Apr 2012 09:25:23 -0700 Subject: api: remove QWindow::visible() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The correct api is QWindow::isVisible(). Removing the api is safe since QWindow is not even released yet. Only qtdeclarative needed to be fixed with 71c8fe296fe5aa7e79033dd8f5b539852d4276e0. Change-Id: Ie571ed4802fe89132419e402acdb854446f4578f Reviewed-by: Samuel Rødal --- src/gui/kernel/qwindow.cpp | 9 --------- src/gui/kernel/qwindow.h | 2 -- src/plugins/platforms/directfb/qdirectfbwindow.cpp | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index b042283071..2117835609 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -264,15 +264,6 @@ void QWindow::setVisible(bool visible) } } -/*! - Returns true if the window is set to visible. - \obsolete -*/ -bool QWindow::visible() const -{ - return isVisible(); -} - bool QWindow::isVisible() const { Q_D(const QWindow); diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 118e3ec25f..e99c062158 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -102,8 +102,6 @@ public: void setSurfaceType(SurfaceType surfaceType); SurfaceType surfaceType() const; - QT_DEPRECATED bool visible() const; - bool isVisible() const; void create(); diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp index dd2d4e488c..a830f1e3db 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.cpp +++ b/src/plugins/platforms/directfb/qdirectfbwindow.cpp @@ -87,7 +87,7 @@ QDirectFbWindow::QDirectFbWindow(QWindow *tlw, QDirectFbInput *inputhandler) m_dfbWindow->SetOpacity(m_dfbWindow.data(), 0xff); - setVisible(window()->visible()); + setVisible(window()->isVisible()); m_inputHandler->addWindow(m_dfbWindow.data(), tlw); } @@ -103,7 +103,7 @@ void QDirectFbWindow::setGeometry(const QRect &rect) // bool isMoveOnly = (rect.topLeft() != geometry().topLeft()) && (rect.size() == geometry().size()); QPlatformWindow::setGeometry(rect); - if (window()->visible()) { + if (window()->isVisible()) { m_dfbWindow->SetBounds(m_dfbWindow.data(), rect.x(),rect.y(), rect.width(), rect.height()); // ### TODO port, verify if this is needed -- cgit v1.2.3