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

Don't begin global paths with '/' on windows.

Browse Source 
Doing it creates huge delays, because it resolves to a network path.
Also rename FolderNode::setFolderName to FolderNode::setDisplayName,
because that's the name of the property.

Task-number: QTCREATORBUG-695
This commit is contained in:
con
2010-02-24 15:03:54 +01:00
parent 9087e2ff86
commit 8c6fc0c454
7 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -36,6 +36,7 @@
#include <utils/qtcassert.h>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtGui/QApplication>
#include <QtGui/QIcon>
#include <QtGui/QStyle>
@@ -151,7 +152,7 @@ bool FileNode::isGenerated() const
*/
FolderNode::FolderNode(const QString &folderPath) :
Node(FolderNodeType, folderPath),
m_folderName(folderPath),
m_displayName(QDir::toNativeSeparators(folderPath)),
m_icon(QApplication::style()->standardIcon(QStyle::SP_DirIcon))
{
}
@@ -170,7 +171,7 @@ FolderNode::~FolderNode()
*/
QString FolderNode::displayName() const
{
return m_folderName;
return m_displayName;
}
/*
@@ -199,9 +200,9 @@ void FolderNode::accept(NodesVisitor *visitor)
subFolder->accept(visitor);
}
void FolderNode::setFolderName(const QString &name)
void FolderNode::setDisplayName(const QString &name)
{
m_folderName = name;
m_displayName = name;
}
void FolderNode::setIcon(const QIcon &icon)
@@ -228,7 +229,7 @@ ProjectNode::ProjectNode(const QString &projectFilePath)
setNodeType(ProjectNodeType);
// project node "manages" itself
setProjectNode(this);
setFolderName(QFileInfo(m_folderName).fileName());
setDisplayName(QFileInfo(projectFilePath).fileName());
}
QList<ProjectNode*> ProjectNode::subProjectNodes() const