[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.
wilder-5.26
David Edmundson 4 years ago
parent a22ff36edf
commit 8b1d83ff33
  1. 6
      ksmserver/main.cpp
  2. 4
      ksmserver/server.cpp
  3. 2
      ksmserver/server.h

@ -294,11 +294,11 @@ int main(int argc, char *argv[])
QString loginMode = config.readEntry("loginMode", "restorePreviousLogout"); QString loginMode = config.readEntry("loginMode", "restorePreviousLogout");
if (parser.isSet(restoreOption)) if (parser.isSet(restoreOption))
server->restoreSession(QStringLiteral(SESSION_BY_USER)); server->setRestoreSession(QStringLiteral(SESSION_BY_USER));
else if (loginMode == QLatin1String("restorePreviousLogout")) else if (loginMode == QLatin1String("restorePreviousLogout"))
server->restoreSession(QStringLiteral(SESSION_PREVIOUS_LOGOUT)); server->setRestoreSession(QStringLiteral(SESSION_PREVIOUS_LOGOUT));
else if (loginMode == QLatin1String("restoreSavedSession")) else if (loginMode == QLatin1String("restoreSavedSession"))
server->restoreSession(QStringLiteral(SESSION_BY_USER)); server->setRestoreSession(QStringLiteral(SESSION_BY_USER));
else else
server->startDefaultSession(); server->startDefaultSession();

@ -894,9 +894,7 @@ void KSMServer::setupShortcuts()
} }
} }
/*! Restores the previous session. void KSMServer::setRestoreSession(const QString &sessionName)
*/
void KSMServer::restoreSession(const QString &sessionName)
{ {
if (state != Idle) if (state != Idle)
return; return;

@ -98,7 +98,7 @@ public:
// public API // public API
void performLogout(); void performLogout();
void restoreSession(); void restoreSession();
void restoreSession(const QString &sessionName); void setRestoreSession(const QString &sessionName);
void startDefaultSession(); void startDefaultSession();
void shutdown(KWorkSpace::ShutdownConfirm confirm, KWorkSpace::ShutdownType sdtype, KWorkSpace::ShutdownMode sdmode); void shutdown(KWorkSpace::ShutdownConfirm confirm, KWorkSpace::ShutdownType sdtype, KWorkSpace::ShutdownMode sdmode);

Loading…
Cancel
Save