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

micro-optimizations

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-06-08 13:57:23 +02:00
parent be1e0d2dba
commit fc421df12d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,9 +522,9 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
newFilePaths += readerCumulative->absoluteFileValues(qmakeVariable, projectDir, vPathsCumulative, includeFileCumlative); newFilePaths += readerCumulative->absoluteFileValues(qmakeVariable, projectDir, vPathsCumulative, includeFileCumlative);
} }
newFilePaths.removeDuplicates();
if (!newFilePaths.isEmpty()) { if (!newFilePaths.isEmpty()) {
newFilePaths.removeDuplicates();
InternalNode *subfolder = new InternalNode; InternalNode *subfolder = new InternalNode;
subfolder->type = type; subfolder->type = type;
subfolder->icon = fileTypes.at(i).icon; subfolder->icon = fileTypes.at(i).icon;
@@ -1444,14 +1444,14 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
} }
if (QFile::exists(realFile)) { if (QFile::exists(realFile)) {
if (!subProjectPaths.contains(realFile)) subProjectPaths << realFile;
subProjectPaths << realFile;
} else { } else {
m_project->proFileParseError(tr("Could not find .pro file for sub dir '%1' in '%2'") m_project->proFileParseError(tr("Could not find .pro file for sub dir '%1' in '%2'")
.arg(subDirVar).arg(realDir)); .arg(subDirVar).arg(realDir));
} }
} }
subProjectPaths.removeDuplicates();
return subProjectPaths; return subProjectPaths;
} }

2
src/shared/proparser/profileevaluator.cpp
View File

@@ -2468,7 +2468,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
#endif #endif
case T_EVAL: { case T_EVAL: {
ProBlock *pro = new ProBlock(); ProBlock *pro = new ProBlock();
QString buf = args.join(QLatin1String(" ")); QString buf = args.join(statics.field_sep);
if (!readInternal(pro, buf, (ushort*)buf.data())) { if (!readInternal(pro, buf, (ushort*)buf.data())) {
delete pro; delete pro;
return ProItem::ReturnFalse; return ProItem::ReturnFalse;