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

Session: Remove addProjects(...) method

Browse Source 
It is unused. Also remove singleProjectAdded signal, and replace
the only use with the projectAdded signal.

The singleProjectAdded signal was emitted for each project that was
ever added, simply because nobody ever used addProjects(...) with
more than one project.

Change-Id: I5aee315c64a2cfb721471d580989a6a02d44fefc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-06-13 11:41:35 +02:00
parent a5a6206e92
commit 4d617c8102
3 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -210,7 +210,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent)
this, &ProjectTreeWidget::showContextMenu); this, &ProjectTreeWidget::showContextMenu);
SessionManager *sessionManager = SessionManager::instance(); SessionManager *sessionManager = SessionManager::instance();
connect(sessionManager, &SessionManager::singleProjectAdded, connect(sessionManager, &SessionManager::projectAdded,
this, &ProjectTreeWidget::handleProjectAdded); this, &ProjectTreeWidget::handleProjectAdded);
connect(sessionManager, &SessionManager::startupProjectChanged, connect(sessionManager, &SessionManager::startupProjectChanged,
this, &ProjectTreeWidget::startupProjectChanged); this, &ProjectTreeWidget::startupProjectChanged);

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

@@ -373,42 +373,25 @@ Project *SessionManager::startupProject()
return d->m_startupProject; return d->m_startupProject;
} }
void SessionManager::addProject(Project *project) void SessionManager::addProject(Project *pro)
{ {
QTC_ASSERT(project, return); QTC_ASSERT(pro, return);
addProjects(QList<Project*>() << project);
}
void SessionManager::addProjects(const QList<Project*> &projects)
{
d->m_virginSession = false; d->m_virginSession = false;
QList<Project*> clearedList; QTC_ASSERT(!d->m_projects.contains(pro), return);
foreach (Project *pro, projects) {
QTC_ASSERT(pro, continue);
if (!d->m_projects.contains(pro)) {
clearedList.append(pro);
d->m_projects.append(pro);
d->m_sessionNode->addProjectNodes(QList<ProjectNode *>() << pro->rootProjectNode());
connect(pro, &Project::fileListChanged, d->m_projects.append(pro);
m_instance, &SessionManager::clearProjectFileCache); d->m_sessionNode->addProjectNodes(QList<ProjectNode *>() << pro->rootProjectNode());
connect(pro, &Project::displayNameChanged, connect(pro, &Project::fileListChanged,
m_instance, &SessionManager::handleProjectDisplayNameChanged); m_instance, &SessionManager::clearProjectFileCache);
}
}
foreach (Project *pro, clearedList) { connect(pro, &Project::displayNameChanged,
emit m_instance->projectAdded(pro); m_instance, &SessionManager::handleProjectDisplayNameChanged);
configureEditors(pro);
connect(pro, &Project::fileListChanged,
[pro](){
configureEditors(pro);
});
}
if (clearedList.count() == 1) emit m_instance->projectAdded(pro);
emit m_instance->singleProjectAdded(clearedList.first()); configureEditors(pro);
connect(pro, &Project::fileListChanged, [pro](){ configureEditors(pro); });
} }
void SessionManager::removeProject(Project *project) void SessionManager::removeProject(Project *project)

2
src/plugins/projectexplorer/session.h
View File

@@ -76,7 +76,6 @@ public:
static void closeAllProjects(); static void closeAllProjects();
static void addProject(Project *project); static void addProject(Project *project);
static void addProjects(const QList<Project*> &projects);
static void removeProject(Project *project); static void removeProject(Project *project);
static void removeProjects(QList<Project *> remove); static void removeProjects(QList<Project *> remove);
@@ -125,7 +124,6 @@ public:
signals: signals:
void projectAdded(ProjectExplorer::Project *project); void projectAdded(ProjectExplorer::Project *project);
void singleProjectAdded(ProjectExplorer::Project *project);
void aboutToRemoveProject(ProjectExplorer::Project *project); void aboutToRemoveProject(ProjectExplorer::Project *project);
void projectDisplayNameChanged(ProjectExplorer::Project *project); void projectDisplayNameChanged(ProjectExplorer::Project *project);
void projectRemoved(ProjectExplorer::Project *project); void projectRemoved(ProjectExplorer::Project *project);