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

Session: Remove projectContainsFile

Browse Source 
Use Project::isKnownFile instead.

Change-Id: If69e413e4603fe6d7dc359ecd55d6233d9a3a642
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-12-04 13:02:15 +01:00
parent 43f57d3f31
commit 9d3c5c6ff5
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/testcodeparser.cpp
View File

@@ -208,7 +208,7 @@ void TestCodeParser::onDocumentUpdated(const QString &fileName, bool isQmlFile)
if (!project) if (!project)
return; return;
// Quick tests: qml files aren't necessarily listed inside project files // Quick tests: qml files aren't necessarily listed inside project files
if (!isQmlFile && !SessionManager::projectContainsFile(project, Utils::FileName::fromString(fileName))) if (!isQmlFile && !project->isKnownFile(Utils::FileName::fromString(fileName)))
return; return;
scanForTests(QStringList(fileName)); scanForTests(QStringList(fileName));

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

@@ -666,18 +666,13 @@ Project *SessionManager::projectForFile(const Utils::FileName &fileName)
{ {
const QList<Project *> &projectList = projects(); const QList<Project *> &projectList = projects();
foreach (Project *p, projectList) { foreach (Project *p, projectList) {
if (projectContainsFile(p, fileName)) if (p->isKnownFile(fileName))
return p; return p;
} }
return nullptr; return nullptr;
} }
bool SessionManager::projectContainsFile(Project *p, const Utils::FileName &fileName)
{
return p && p->isKnownFile(fileName);
}
void SessionManager::configureEditor(IEditor *editor, const QString &fileName) void SessionManager::configureEditor(IEditor *editor, const QString &fileName)
{ {
if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) { if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) {
@@ -691,7 +686,7 @@ void SessionManager::configureEditor(IEditor *editor, const QString &fileName)
void SessionManager::configureEditors(Project *project) void SessionManager::configureEditors(Project *project)
{ {
foreach (IDocument *document, DocumentModel::openedDocuments()) { foreach (IDocument *document, DocumentModel::openedDocuments()) {
if (projectContainsFile(project, document->filePath())) { if (project->isKnownFile(document->filePath())) {
foreach (IEditor *editor, DocumentModel::editorsForDocument(document)) { foreach (IEditor *editor, DocumentModel::editorsForDocument(document)) {
if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) { if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) {
project->editorConfiguration()->configureEditor(textEditor); project->editorConfiguration()->configureEditor(textEditor);

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

@@ -115,7 +115,6 @@ public:
static Project *projectForNode(Node *node); static Project *projectForNode(Node *node);
static Node *nodeForFile(const Utils::FileName &fileName); static Node *nodeForFile(const Utils::FileName &fileName);
static Project *projectForFile(const Utils::FileName &fileName); static Project *projectForFile(const Utils::FileName &fileName);
static bool projectContainsFile(Project *p, const Utils::FileName &fileName);
static QStringList projectsForSessionName(const QString &session); static QStringList projectsForSessionName(const QString &session);