AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify VCXProjectWriter::outputFileConfig a bit

Browse Source 
The fileAdded variable is used to save state between iterations.
There's no need for two variables.

Change-Id: I8144cf7c7b394255459295b82a7ca808bc3951da
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2014-09-24 15:32:10 +02:00
parent 8ee2e497ae
commit 9a2b588556
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1861,10 +1861,9 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
xmlFilter << closetag();
}
bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAllreadyAdded)
bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter,
const QString &filename, bool fileAdded)
{
bool fileAdded = false;
// Clearing each filter tool
filter.useCustomBuildTool = false;
filter.useCompilerTool = false;
@ -1906,8 +1905,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
if (filter.useCustomBuildTool)
{
if ( !fileAllreadyAdded ) {
if (!fileAdded) {
fileAdded = true;
xmlFilter << tag("CustomBuild")
@ -1927,7 +1925,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
filter.Project->projectWriter->write(xml, filter.CustomBuildTool);
}
if ( !fileAdded && !fileAllreadyAdded )
if (!fileAdded)
{
fileAdded = true;
outputFileConfig(xml, xmlFilter, filename, filter.Name);

2
qmake/generators/win32/msbuild_objectmodel.h
View File

@ -174,7 +174,7 @@ private:
static void addFilters(VCProject &project, XmlOutput &xmlFilter, const QString &filterName);
static void outputFilter(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filtername);
static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const VCFilterFile &info, const QString &filtername);
static bool outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAllreadyAdded);
static bool outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded);
static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName);
static QString generateCondition(const VCConfiguration &config);