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

De-noise some ProjectExplorer/Utils qualifications

Browse Source 
Change-Id: Iaec01ca0e7a43592528bcaf4252540561e109919
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-01 18:44:47 +02:00
committed by Orgad Shaneh
parent 74ce6e409d
commit 98723e4557
8 changed files with 181 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/projecttree.cpp
View File

@@ -52,6 +52,7 @@ namespace {
const char EXTERNAL_FILE_WARNING[] = "ExternalFile";
}
using namespace Utils;
using namespace ProjectExplorer;
using namespace Internal;
@@ -133,8 +134,7 @@ void ProjectTree::updateFromFocus(bool invalidCurrentNode)
{
ProjectTreeWidget *focus = m_focusForContextMenu;
if (!focus)
focus = Utils::findOrDefault(m_projectTreeWidgets,
&ProjectTree::hasFocus);
focus = Utils::findOrDefault(m_projectTreeWidgets, &ProjectTree::hasFocus);
if (focus)
updateFromProjectTreeWidget(focus);
@@ -413,12 +413,12 @@ void ProjectTree::updateExternalFileWarning()
}
if (!infoBar->canInfoBeAdded(externalFileId))
return;
const Utils::FileName fileName = document->filePath();
const FileName fileName = document->filePath();
const QList<Project *> projects = SessionManager::projects();
if (projects.isEmpty())
return;
foreach (Project *project, projects) {
Utils::FileName projectDir = project->projectDirectory();
FileName projectDir = project->projectDirectory();
if (projectDir.isEmpty())
continue;
if (fileName.isChildOf(projectDir))
@@ -426,7 +426,7 @@ void ProjectTree::updateExternalFileWarning()
// External file. Test if it under the same VCS
QString topLevel;
if (Core::VcsManager::findVersionControlForDirectory(projectDir.toString(), &topLevel)
&& fileName.isChildOf(Utils::FileName::fromString(topLevel))) {
&& fileName.isChildOf(FileName::fromString(topLevel))) {
return;
}
}