From 3871ad93487d53c553480726869c70ae8a398eb6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 20 Aug 2025 15:38:49 +0900 Subject: [PATCH] kdesktop: rename some methods to better differentiate between the lock process terminating and the screen getting unlocked Signed-off-by: Michele Calgaro --- kdesktop/lockeng.cpp | 14 +++++++------- kdesktop/lockeng.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index 8cd6731f4..1392c9db3 100644 --- a/kdesktop/lockeng.cpp +++ b/kdesktop/lockeng.cpp @@ -63,7 +63,7 @@ static void sigusr1_handler(int) { if (gbl_saverEngineEventHandler) { - gbl_saverEngineEventHandler->lockProcessExited(); + gbl_saverEngineEventHandler->lockCompleted(); } } @@ -71,7 +71,7 @@ static void sigusr2_handler(int) { if (gbl_saverEngineEventHandler) { - gbl_saverEngineEventHandler->lockProcessFullyActivated(); + gbl_saverEngineEventHandler->lockFullyActivated(); } } @@ -79,7 +79,7 @@ static void sigttin_handler(int) { if (gbl_saverEngineEventHandler) { - gbl_saverEngineEventHandler->lockProcessReady(); + gbl_saverEngineEventHandler->lockReady(); } } @@ -728,9 +728,9 @@ void SaverEngineEventHandler::terminateLockProcess() m_lockProcess.detach(); // don't kill it if we crash } -void SaverEngineEventHandler::lockProcessExited() +void SaverEngineEventHandler::lockCompleted() { - kdDebug(1204) << "SaverEngineEventHandler: lock exited" << endl; + kdDebug(1204) << "SaverEngineEventHandler: lock completed" << endl; if (trinity_lockeng_sak_available) { @@ -745,13 +745,13 @@ void SaverEngineEventHandler::lockProcessExited() TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(stopLockProcessGUI())); } -void SaverEngineEventHandler::lockProcessFullyActivated() +void SaverEngineEventHandler::lockFullyActivated() { m_state = Saving; TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(lockProcessFullyActivatedGUI())); } -void SaverEngineEventHandler::lockProcessReady() +void SaverEngineEventHandler::lockReady() { m_saverProcessReady = true; } diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index 1dfff54c3..11806e73c 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -196,9 +196,9 @@ public: SaverState getState() const { return m_state; } - void lockProcessExited(); - void lockProcessFullyActivated(); - void lockProcessReady(); + void lockCompleted(); + void lockFullyActivated(); + void lockReady(); void terminateLockProcess(); public slots: