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

ProjectExplorer: Use FileName for Node::path

Browse Source 
Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-02 00:37:38 +02:00
committed by Orgad Shaneh
parent 033a628cdc
commit 88e7f935f4
86 changed files with 616 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
View File

@@ -42,7 +42,7 @@ namespace QmlProjectManager {
namespace Internal {
QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile)
: ProjectExplorer::ProjectNode(projectFile->filePath().toString()),
: ProjectExplorer::ProjectNode(projectFile->filePath()),
m_project(project),
m_projectFile(projectFile)
{
@@ -80,7 +80,7 @@ void QmlProjectNode::refresh()
/* generated = */ false);
QStringList files = m_project->files();
files.removeAll(m_project->filesFileName());
files.removeAll(m_project->filesFileName().toString());
addFileNodes(QList<FileNode *>()
<< projectFilesNode);
@@ -114,7 +114,8 @@ void QmlProjectNode::refresh()
QList<FileNode *> fileNodes;
foreach (const QString &file, it.value()) {
FileType fileType = SourceType; // ### FIXME
FileNode *fileNode = new FileNode(file, fileType, /*generated = */ false);
FileNode *fileNode = new FileNode(Utils::FileName::fromString(file),
fileType, /*generated = */ false);
fileNodes.append(fileNode);
}
@@ -129,7 +130,7 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr
if (! end)
return 0;
QString baseDir = QFileInfo(path()).path();
Utils::FileName folderPath = path().parentDir();
QString folderName;
for (int i = 0; i < end; ++i) {
@@ -145,7 +146,8 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr
else if (FolderNode *folder = m_folderByName.value(folderName))
return folder;
FolderNode *folder = new FolderNode(baseDir + QLatin1Char('/') + folderName);
folderPath.appendPath(folderName);
FolderNode *folder = new FolderNode(folderPath);
folder->setDisplayName(component);
m_folderByName.insert(folderName, folder);