feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Minor cleanup to session.h

Browse Source 
Change-Id: Ic3a9280529946247e5e4526676c5e979ccb17c48
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-10-02 18:24:45 +02:00
parent f734ba4461
commit c732c137f7
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/session.cpp
View File

@@ -118,8 +118,10 @@ SessionManager::SessionManager()
d->restoreStartupSession(); d->restoreStartupSession();
}); });
connect(ModeManager::instance(), &ModeManager::currentModeChanged, connect(ModeManager::instance(), &ModeManager::currentModeChanged, [](Id mode) {
this, &SessionManager::saveActiveMode); if (mode != Core::Constants::MODE_WELCOME)
setValue("ActiveMode", mode.toString());
});
connect(ICore::instance(), &ICore::saveSettingsRequested, this, [] { connect(ICore::instance(), &ICore::saveSettingsRequested, this, [] {
if (!SessionManager::isLoadingSession()) if (!SessionManager::isLoadingSession())
@@ -194,12 +196,6 @@ bool SessionManager::isDefaultSession(const QString &session)
return session == QLatin1String(DEFAULT_SESSION); return session == QLatin1String(DEFAULT_SESSION);
} }
void SessionManager::saveActiveMode(Id mode)
{
if (mode != Core::Constants::MODE_WELCOME)
setValue("ActiveMode", mode.toString());
}
bool SessionManager::isLoadingSession() bool SessionManager::isLoadingSession()
{ {
return d->m_loadingSession; return d->m_loadingSession;

12
src/plugins/coreplugin/session.h
View File

@@ -5,13 +5,16 @@
#include "core_global.h" #include "core_global.h"
#include <utils/id.h>
#include <utils/persistentsettings.h>
#include <QDateTime> #include <QDateTime>
#include <QObject>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
namespace Utils {
class FilePath;
class Key;
} // Utils
namespace Core { namespace Core {
class CORE_EXPORT SessionManager : public QObject class CORE_EXPORT SessionManager : public QObject
@@ -79,9 +82,6 @@ signals:
void sessionCreated(const QString &name); void sessionCreated(const QString &name);
void sessionRenamed(const QString &oldName, const QString &newName); void sessionRenamed(const QString &oldName, const QString &newName);
void sessionRemoved(const QString &name); void sessionRemoved(const QString &name);
private:
static void saveActiveMode(Utils::Id mode);
}; };
} // namespace Core } // namespace Core

4
src/plugins/projectexplorer/projectmanager.cpp
View File

@@ -3,7 +3,6 @@
#include "projectmanager.h" #include "projectmanager.h"
#include "buildconfiguration.h" #include "buildconfiguration.h"
#include "editorconfiguration.h" #include "editorconfiguration.h"
#include "project.h" #include "project.h"
@@ -27,10 +26,9 @@
#include <texteditor/texteditor.h> #include <texteditor/texteditor.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/filepath.h> #include <utils/persistentsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <utils/qtcassert.h>
#include <QDebug> #include <QDebug>
#include <QMessageBox> #include <QMessageBox>