From f0a40991fa5a77bb6e09976a3c041f93cbf44347 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Mon, 12 Sep 2022 16:29:38 +0200 Subject: [PATCH] Simplify obtaining of parent in isWindowBlocked MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new way is more readable as it uses an existing API Change-Id: Id253c9e6405d11f16bdb5f55288dcfcf4b1641c6 Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qguiapplication.cpp | 10 ++-------- src/widgets/kernel/qapplication.cpp | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 3dcb22c8400..cc532401b49 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -898,15 +898,9 @@ bool QGuiApplicationPrivate::isWindowBlocked(QWindow *window, QWindow **blocking *blockingWindow = m; return true; } - QWindow *p = m->parent(); - if (!p) - p = m->transientParent(); - m = p; + m = m->parent(QWindow::IncludeTransients); } while (m); - QWindow *p = w->parent(); - if (!p) - p = w->transientParent(); - w = p; + w = w->parent(QWindow::IncludeTransients); } while (w); break; } diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index af4de687010..a075182969c 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -2225,15 +2225,9 @@ bool QApplicationPrivate::isWindowBlocked(QWindow *window, QWindow **blockingWin *blockingWindow = m; return true; } - QWindow *p = m->parent(); - if (!p) - p = m->transientParent(); - m = p; + m = m->parent(QWindow::IncludeTransients); } while (m); - QWindow *p = w->parent(); - if (!p) - p = w->transientParent(); - w = p; + w = w->parent(QWindow::IncludeTransients); } while (w); break; }