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

Add FileName isChildOf/relativePath and endsWith and appendPath

Browse Source 
Needed by qtversionmanager

Change-Id: I4d455298e809b744ae3663493914db6e31f372a6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2011-11-25 13:17:52 +01:00
parent a082365d65
commit e9c079a648
3 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -309,14 +309,13 @@ struct InternalNode
void create(const QString &projectDir, const QSet<Utils::FileName> &newFilePaths, ProjectExplorer::FileType type)
{
static const QChar separator = QChar('/');
const QString projectDirWithSeparator = projectDir + separator;
int projectDirWithSeparatorLength = projectDirWithSeparator.length();
const Utils::FileName projectDirFileName = Utils::FileName::fromString(projectDir);
foreach (const Utils::FileName &file, newFilePaths) {
Utils::FileName fileWithoutPrefix;
bool isRelative;
if (file.startsWith(projectDirWithSeparator)) {
if (file.isChildOf(projectDirFileName)) {
isRelative = true;
fileWithoutPrefix = file.mid(projectDirWithSeparatorLength);
fileWithoutPrefix = file.relativeChildPath(projectDirFileName);
} else {
isRelative = false;
fileWithoutPrefix = file;
@@ -328,7 +327,7 @@ struct InternalNode
#endif
QStringListIterator it(parts);
InternalNode *currentNode = this;
QString path = (isRelative ? projectDirWithSeparator : "");
QString path = (isRelative ? (projectDirFileName.toString() + '/') : QString(""));
while (it.hasNext()) {
const QString &key = it.next();
if (it.hasNext()) { // key is directory
@@ -683,7 +682,7 @@ void Qt4PriFileNode::folderChanged(const QString &folder)
newFiles += recursiveEnumerate(changedFolder);
foreach (const Utils::FileName &file, m_recursiveEnumerateFiles) {
if (!file.startsWith(changedFolder))
if (!file.isChildOf(Utils::FileName::fromString(changedFolder)))
newFiles.insert(file);
}