forked from qt-creator/qt-creator
Simply SessionFile::m_failedProjects handling
Remove the functions and access the variable directly. Change-Id: Ic35d971a618299b6ccf26f9fb0d76de498268cc1 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
@@ -86,9 +86,6 @@ class SessionFile : QObject
|
|||||||
public:
|
public:
|
||||||
SessionFile();
|
SessionFile();
|
||||||
|
|
||||||
QStringList failedProjectFileNames() const;
|
|
||||||
void clearFailedProjectFileNames();
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void sessionLoadingProgress();
|
void sessionLoadingProgress();
|
||||||
|
|
||||||
@@ -121,16 +118,6 @@ SessionFile::SessionFile()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList SessionFile::failedProjectFileNames() const
|
|
||||||
{
|
|
||||||
return m_failedProjects;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SessionFile::clearFailedProjectFileNames()
|
|
||||||
{
|
|
||||||
m_failedProjects.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class ProjectExplorer::SessionManager
|
\class ProjectExplorer::SessionManager
|
||||||
|
|
||||||
@@ -509,7 +496,7 @@ bool SessionManager::loadImpl(const QString &fileName)
|
|||||||
// but doesn't emit this signal, so we do it here
|
// but doesn't emit this signal, so we do it here
|
||||||
emit startupProjectChanged(m_file->m_startupProject);
|
emit startupProjectChanged(m_file->m_startupProject);
|
||||||
|
|
||||||
QStringList failedProjects = m_file->failedProjectFileNames();
|
QStringList failedProjects = m_file->m_failedProjects;
|
||||||
if (!failedProjects.isEmpty()) {
|
if (!failedProjects.isEmpty()) {
|
||||||
QString fileList =
|
QString fileList =
|
||||||
QDir::toNativeSeparators(failedProjects.join(QLatin1String("<br>")));
|
QDir::toNativeSeparators(failedProjects.join(QLatin1String("<br>")));
|
||||||
@@ -525,7 +512,7 @@ bool SessionManager::loadImpl(const QString &fileName)
|
|||||||
box->exec();
|
box->exec();
|
||||||
|
|
||||||
if (box->clickedButton() == removeButton)
|
if (box->clickedButton() == removeButton)
|
||||||
m_file->clearFailedProjectFileNames();
|
m_file->m_failedProjects.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
// restore the active mode
|
// restore the active mode
|
||||||
|
|||||||
Reference in New Issue
Block a user