diff options
| author | Błażej Szczygieł <spaz16@wp.pl> | 2015-11-13 17:49:53 +0100 |
|---|---|---|
| committer | Błażej Szczygieł <spaz16@wp.pl> | 2016-02-24 14:56:47 +0000 |
| commit | c5687704e9b1e3f67c6a095c86368b8dc9809629 (patch) | |
| tree | c17aa08e4ab6a741757756c543c5bcfa19628ba3 /src/plugins/platforms/xcb/qxcbwindow.cpp | |
| parent | b736151c2bb6c68f700d38274d740a6e0cf59a49 (diff) | |
xcb: Remove unneeded null pointer checks
Since a094af001795c9651b299d700a992150d1aba33a we don't need any null
pointer checks for xcb screens.
This reverts patch 7532fb4e61fc4102fd11022f57f7d8195414167b
Change-Id: I8b90ed538aad4403650ef42aab6f39de5861d9ed
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 939fd5e5b4..11202944bd 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -667,7 +667,7 @@ void QXcbWindow::setGeometry(const QRect &rect) const QRect wmGeometry = windowToWmGeometry(rect); - if (newScreen && newScreen != currentScreen) + if (newScreen != currentScreen) QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->QPlatformScreen::screen()); if (qt_window_private(window())->positionAutomatic) { @@ -1660,7 +1660,7 @@ void QXcbWindow::requestActivateWindow() return; } - if (!m_mapped || !xcbScreen()) { + if (!m_mapped) { m_deferredActivation = true; return; } |