From 954b58f3684431df5f39165023a9d216b92bbc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 12 Oct 2021 14:47:19 +0200 Subject: [PATCH] Remove unneeded function QGuiApplicationPrivate::emitLastWindowClosed It only has a single call site nowadays. Change-Id: I6f486dec51f76e1fb231fb7276bc8c856885bee1 Reviewed-by: Doris Verria Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qguiapplication.cpp | 10 ++-------- src/gui/kernel/qguiapplication_p.h | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 7e29d707ee..86ec5ad7b5 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3559,7 +3559,8 @@ void QGuiApplicationPrivate::maybeQuitOnLastWindowClosed(QWindow *closedWindow) return; } - emitLastWindowClosed(); + if (in_exec) + emit q_func()->lastWindowClosed(); if (QGuiApplication::quitOnLastWindowClosed()) maybeQuit(); @@ -3577,13 +3578,6 @@ void QGuiApplicationPrivate::maybeQuitOnLastWindowClosed(QWindow *closedWindow) \sa QWindow::close(), QWindow::isTopLevel() */ -void QGuiApplicationPrivate::emitLastWindowClosed() -{ - if (qGuiApp && qGuiApp->d_func()->in_exec) { - emit qGuiApp->lastWindowClosed(); - } -} - bool QGuiApplicationPrivate::shouldQuit() { const QWindowList processedWindows; diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 3450c6e36b..1c66e007db 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -205,8 +205,6 @@ public: return alignment; } - static void emitLastWindowClosed(); - QPixmap getPixmapCursor(Qt::CursorShape cshape); void _q_updateFocusObject(QObject *object);