From 35fdfb2fcbdc7aca64639cf18e9ac40a42d59873 Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Sat, 8 Oct 2016 20:27:53 +0200 Subject: [PATCH] A loop can run zero times without another check. While at it, constify and adjust coding style. --- src/SessionManager.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp index b76b1cf4a..2cb1bdbfe 100644 --- a/src/SessionManager.cpp +++ b/src/SessionManager.cpp @@ -295,21 +295,20 @@ int SessionManager::getRestoreId(Session* session) void SessionManager::restoreSessions(KConfig* config) { KConfigGroup group(config, "Number"); - int sessions; + const int sessions = group.readEntry("NumberOfSessions", 0); // Any sessions saved? - if ((sessions = group.readEntry("NumberOfSessions", 0)) > 0) { - for (int n = 1; n <= sessions; n++) { - QString name = QLatin1String("Session") + QString::number(n); - KConfigGroup sessionGroup(config, name); + for (int n = 1; n <= sessions; n++) { + const QString name = QLatin1String("Session") + QString::number(n); + KConfigGroup sessionGroup(config, name); - QString profile = sessionGroup.readPathEntry("Profile", QString()); - Profile::Ptr ptr = ProfileManager::instance()->defaultProfile(); - if (!profile.isEmpty()) ptr = ProfileManager::instance()->loadProfile(profile); - - Session* session = createSession(ptr); - session->restoreSession(sessionGroup); + const QString profile = sessionGroup.readPathEntry("Profile", QString()); + Profile::Ptr ptr = ProfileManager::instance()->defaultProfile(); + if (!profile.isEmpty()) { + ptr = ProfileManager::instance()->loadProfile(profile); } + Session* session = createSession(ptr); + session->restoreSession(sessionGroup); } }