From 8b1d83ff338a9cc147816ae81eb723844bea51db Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 22 Jun 2022 12:18:55 +0100
Subject: [PATCH] [ksmserver] Rename restoreSession(QString)

It doesn't actually restore a session merely queues up which session
ksmserver should be using when restoreSession is externally invoked.
---
 ksmserver/main.cpp   | 6 +++---
 ksmserver/server.cpp | 4 +---
 ksmserver/server.h   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index b78c8ce18..dc08ed27a 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -294,11 +294,11 @@ int main(int argc, char *argv[])
     QString loginMode = config.readEntry("loginMode", "restorePreviousLogout");
 
     if (parser.isSet(restoreOption))
-        server->restoreSession(QStringLiteral(SESSION_BY_USER));
+        server->setRestoreSession(QStringLiteral(SESSION_BY_USER));
     else if (loginMode == QLatin1String("restorePreviousLogout"))
-        server->restoreSession(QStringLiteral(SESSION_PREVIOUS_LOGOUT));
+        server->setRestoreSession(QStringLiteral(SESSION_PREVIOUS_LOGOUT));
     else if (loginMode == QLatin1String("restoreSavedSession"))
-        server->restoreSession(QStringLiteral(SESSION_BY_USER));
+        server->setRestoreSession(QStringLiteral(SESSION_BY_USER));
     else
         server->startDefaultSession();
 
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index eba952d0b..33842225d 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -894,9 +894,7 @@ void KSMServer::setupShortcuts()
     }
 }
 
-/*!  Restores the previous session.
- */
-void KSMServer::restoreSession(const QString &sessionName)
+void KSMServer::setRestoreSession(const QString &sessionName)
 {
     if (state != Idle)
         return;
diff --git a/ksmserver/server.h b/ksmserver/server.h
index 5ce61ead5..95784d603 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -98,7 +98,7 @@ public:
     // public API
     void performLogout();
     void restoreSession();
-    void restoreSession(const QString &sessionName);
+    void setRestoreSession(const QString &sessionName);
     void startDefaultSession();
     void shutdown(KWorkSpace::ShutdownConfirm confirm, KWorkSpace::ShutdownType sdtype, KWorkSpace::ShutdownMode sdmode);