qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

introduce VCFilter::findFile 

Move common code into a function
and exit early from simple search loop.

Change-Id: I88d1227653e28badc213fbe4ebe1e2a19f6e5793
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2014-09-23 18:44:02 +02:00
parent a8aad121a2
commit 55027c23df
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -1872,14 +1872,8 @@ bool VCXProjectWriter::outputFileConfig(VCFilter filter, XmlOutput &xml, XmlOutp
filter.CompilerTool = VCCLCompilerTool(); filter.CompilerTool = VCCLCompilerTool();
filter.CompilerTool.config = filter.Config; filter.CompilerTool.config = filter.Config;
bool inBuild = false; bool inBuild;
VCFilterFile info; VCFilterFile info = filter.findFile(filename, &inBuild);
for (int i = 0; i < filter.Files.count(); ++i) {
if (filter.Files.at(i).file == filename) {
info = filter.Files.at(i);
inBuild = true;
}
}
inBuild &= !info.excludeFromBuild; inBuild &= !info.excludeFromBuild;
if (inBuild) { if (inBuild) {

23
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -2241,6 +2241,19 @@ void VCFilter::modifyPCHstage(QString str)
CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)"); CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)");
} }
VCFilterFile VCFilter::findFile(const QString &filePath, bool *found) const
{
for (int i = 0; i < Files.count(); ++i) {
const VCFilterFile &f = Files.at(i);
if (f.file == filePath) {
*found = true;
return f;
}
}
*found = false;
return VCFilterFile();
}
bool VCFilter::addExtraCompiler(const VCFilterFile &info) bool VCFilter::addExtraCompiler(const VCFilterFile &info)
{ {
const QStringList &extraCompilers = Project->extraCompilerSources.value(info.file); const QStringList &extraCompilers = Project->extraCompilerSources.value(info.file);
@ -2974,14 +2987,8 @@ void VCProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, const Q
filter.CompilerTool.WarningLevel = warningLevelUnknown; filter.CompilerTool.WarningLevel = warningLevelUnknown;
filter.CompilerTool.config = filter.Config; filter.CompilerTool.config = filter.Config;
bool inBuild = false; bool inBuild;
VCFilterFile info; VCFilterFile info = filter.findFile(filename, &inBuild);
for (int i = 0; i < filter.Files.count(); ++i) {
if (filter.Files.at(i).file == filename) {
info = filter.Files.at(i);
inBuild = true;
}
}
inBuild &= !info.excludeFromBuild; inBuild &= !info.excludeFromBuild;
if (inBuild) { if (inBuild) {

1
qmake/generators/win32/msvc_objectmodel.h
View File

@ -952,6 +952,7 @@ public:
void addFiles(const ProStringList& fileList); void addFiles(const ProStringList& fileList);
bool addExtraCompiler(const VCFilterFile &info); bool addExtraCompiler(const VCFilterFile &info);
void modifyPCHstage(QString str); void modifyPCHstage(QString str);
VCFilterFile findFile(const QString &filePath, bool *found) const;
// Variables // Variables
QString Name; QString Name;