From 6a283ed4cb001a8f9a912666059c0e02b6037ef5 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 28 Oct 2024 14:25:52 +0200 Subject: [PATCH] xwayland: Rename XwaylandLauncher::started to ready "ready" better describes what the signal notifies about. --- src/xwayland/xwayland.cpp | 2 +- src/xwayland/xwaylandlauncher.cpp | 4 ++-- src/xwayland/xwaylandlauncher.h | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/xwayland/xwayland.cpp b/src/xwayland/xwayland.cpp index ca22c794ca..a04618dffe 100644 --- a/src/xwayland/xwayland.cpp +++ b/src/xwayland/xwayland.cpp @@ -485,7 +485,7 @@ Xwayland::Xwayland(Application *app) : m_app(app) , m_launcher(new XwaylandLauncher(this)) { - connect(m_launcher, &XwaylandLauncher::started, this, &Xwayland::handleXwaylandReady); + connect(m_launcher, &XwaylandLauncher::ready, this, &Xwayland::handleXwaylandReady); connect(m_launcher, &XwaylandLauncher::finished, this, &Xwayland::handleXwaylandFinished); connect(m_launcher, &XwaylandLauncher::errorOccurred, this, &Xwayland::errorOccurred); } diff --git a/src/xwayland/xwaylandlauncher.cpp b/src/xwayland/xwaylandlauncher.cpp index 9b291c5421..f9b20e6b1b 100644 --- a/src/xwayland/xwaylandlauncher.cpp +++ b/src/xwayland/xwaylandlauncher.cpp @@ -96,7 +96,7 @@ void XwaylandLauncher::enable() start(); } }); - connect(this, &XwaylandLauncher::started, notifier, [notifier]() { + connect(this, &XwaylandLauncher::ready, notifier, [notifier]() { notifier->setEnabled(false); }); connect(this, &XwaylandLauncher::finished, notifier, [this, notifier]() { @@ -212,7 +212,7 @@ bool XwaylandLauncher::start() m_readyNotifier = new QSocketNotifier(displayfd[0], QSocketNotifier::Read, this); connect(m_readyNotifier, &QSocketNotifier::activated, this, [this]() { maybeDestroyReadyNotifier(); - Q_EMIT started(); + Q_EMIT ready(); }); m_xwaylandProcess->start(); diff --git a/src/xwayland/xwaylandlauncher.h b/src/xwayland/xwaylandlauncher.h index 3c58e81696..67c4cccb63 100644 --- a/src/xwayland/xwaylandlauncher.h +++ b/src/xwayland/xwaylandlauncher.h @@ -71,11 +71,9 @@ public: QProcess *process() const; Q_SIGNALS: /** - * This signal is emitted when the Xwayland server has been started successfully and it is - * ready to accept and manage X11 clients. - * For restarts it may be emitted multiple times + * This signal is emitted when the Xwayland server is ready to accept connections. */ - void started(); + void ready(); /** * This signal is emitted when the Xwayland server quits or crashes */