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

Session: Get rid of cache of all project file names

Browse Source 
Make the project responsible to provide information on which files
belong to it instead.

Change-Id: I80accf9104af33eaffc6b8f3e6024e9725697d37
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-12-04 12:58:10 +01:00
parent f542e24eca
commit 43f57d3f31
5 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/projectexplorer/session.cpp
View File

@@ -101,8 +101,6 @@ public:
mutable QStringList m_sessions;
mutable QHash<QString, QDateTime> m_sessionDateTimes;
mutable QHash<Project *, QStringList> m_projectFileCache;
Project *m_startupProject = nullptr;
QList<Project *> m_projects;
QStringList m_failedProjects;
@@ -178,17 +176,6 @@ void SessionManager::saveActiveMode(Id mode)
setValue(QLatin1String("ActiveMode"), mode.toString());
}
void SessionManager::clearProjectFileCache()
{
// If triggered by the fileListChanged signal of one project
// only invalidate cache for this project
auto pro = qobject_cast<Project*>(m_instance->sender());
if (pro)
d->m_projectFileCache.remove(pro);
else
d->m_projectFileCache.clear();
}
bool SessionManagerPrivate::recursiveDependencyCheck(const QString &newDep, const QString &checkDep) const
{
if (newDep == checkDep)
@@ -388,7 +375,6 @@ void SessionManager::addProject(Project *pro)
d->m_projects.append(pro);
connect(pro, &Project::fileListChanged, m_instance, &SessionManager::clearProjectFileCache);
connect(pro, &Project::displayNameChanged,
m_instance, [pro]() { m_instance->projectDisplayNameChanged(pro); });
@@ -689,10 +675,7 @@ Project *SessionManager::projectForFile(const Utils::FileName &fileName)
bool SessionManager::projectContainsFile(Project *p, const Utils::FileName &fileName)
{
if (!d->m_projectFileCache.contains(p))
d->m_projectFileCache.insert(p, Utils::transform(p->files(Project::AllFiles), &Utils::FileName::toString));
return d->m_projectFileCache.value(p).contains(fileName.toString());
return p && p->isKnownFile(fileName);
}
void SessionManager::configureEditor(IEditor *editor, const QString &fileName)
@@ -757,9 +740,6 @@ void SessionManager::removeProjects(const QList<Project *> &remove)
if (pro == d->m_startupProject)
changeStartupProject = true;
disconnect(pro, &Project::fileListChanged,
m_instance, &SessionManager::clearProjectFileCache);
d->m_projectFileCache.remove(pro);
emit m_instance->projectRemoved(pro);
FolderNavigationWidgetFactory::removeRootDirectory(projectFolderId(pro));
}