From 44ffb9cdb4329c5ed9b724659f234d26da336b5a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 16 Jan 2015 01:17:32 +0100 Subject: Replace foo.size() pattern with !foo.empty(). --- Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 ++-- Source/CPack/WiX/cmWIXAccessControlList.cxx | 2 +- Source/CPack/WiX/cmWIXPatch.cxx | 2 +- Source/CPack/WiX/cmWIXSourceWriter.cxx | 2 +- Source/CPack/cmCPackNSISGenerator.cxx | 2 +- Source/cmGlobalMSYSMakefileGenerator.cxx | 6 +++--- Source/cmGlobalVisualStudioGenerator.cxx | 2 +- Source/cmGlobalXCodeGenerator.cxx | 6 +++--- Source/cmLocalVisualStudio10Generator.cxx | 2 +- Source/cmLocalVisualStudio6Generator.cxx | 8 ++++---- Source/cmLocalVisualStudio7Generator.cxx | 2 +- Source/cmVisualStudio10TargetGenerator.cxx | 4 ++-- Source/cmVisualStudioGeneratorOptions.cxx | 6 +++--- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index b3eb7b2..6f25e50 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -217,7 +217,7 @@ bool cmCPackWIXGenerator::InitializeWiXConfiguration() { std::string defaultRef = "WixUI_InstallDir"; - if(this->Components.size()) + if(!this->Components.empty()) { defaultRef = "WixUI_FeatureTree"; } @@ -1005,7 +1005,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons( shortcut.workingDirectoryId = directoryId; shortcuts.insert(cmWIXShortcuts::START_MENU, id, shortcut); - if(desktopExecutables.size() && + if(!desktopExecutables.empty() && std::find(desktopExecutables.begin(), desktopExecutables.end(), executableName) diff --git a/Source/CPack/WiX/cmWIXAccessControlList.cxx b/Source/CPack/WiX/cmWIXAccessControlList.cxx index aeec968..fc0d3d3 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.cxx +++ b/Source/CPack/WiX/cmWIXAccessControlList.cxx @@ -71,7 +71,7 @@ void cmWIXAccessControlList::CreatePermissionElement( this->SourceWriter.BeginElement("Permission"); this->SourceWriter.AddAttribute("User", user); - if(domain.size()) + if(!domain.empty()) { this->SourceWriter.AddAttribute("Domain", domain); } diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx index b5202e0..5a8dc63 100644 --- a/Source/CPack/WiX/cmWIXPatch.cxx +++ b/Source/CPack/WiX/cmWIXPatch.cxx @@ -79,7 +79,7 @@ bool cmWIXPatch::CheckForUnappliedFragments() fragmentList += "'"; } - if(fragmentList.size()) + if(!fragmentList.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Some XML patch fragments did not have matching IDs: " << diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx index 219fca8..8d38e9b 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx @@ -128,7 +128,7 @@ void cmWIXSourceWriter::AddAttribute( void cmWIXSourceWriter::AddAttributeUnlessEmpty( std::string const& key, std::string const& value) { - if(value.size()) + if(!value.empty()) { AddAttribute(key, value); } diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 49aad97..6cdda28 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -536,7 +536,7 @@ int cmCPackNSISGenerator::InitializeInternal() << ".lnk\"" << std::endl; // see if CPACK_CREATE_DESKTOP_LINK_ExeName is on // if so add a desktop link - if(cpackPackageDesktopLinksVector.size() && + if(!cpackPackageDesktopLinksVector.empty() && std::find(cpackPackageDesktopLinksVector.begin(), cpackPackageDesktopLinksVector.end(), execName) diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index a84923b..9a6f3ba 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -62,19 +62,19 @@ void cmGlobalMSYSMakefileGenerator locations.push_back("c:/mingw/bin"); std::string tgcc = cmSystemTools::FindProgram("gcc", locations); std::string gcc = "gcc.exe"; - if(tgcc.size()) + if(!tgcc.empty()) { gcc = tgcc; } std::string tgxx = cmSystemTools::FindProgram("g++", locations); std::string gxx = "g++.exe"; - if(tgxx.size()) + if(!tgxx.empty()) { gxx = tgxx; } std::string trc = cmSystemTools::FindProgram("windres", locations); std::string rc = "windres.exe"; - if(trc.size()) + if(!trc.empty()) { rc = trc; } diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 553d568..b0aa243 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -81,7 +81,7 @@ bool cmGlobalVisualStudioGenerator::Compute() { std::vector& gen = it->second; // add the ALL_BUILD to the first local generator of each project - if(gen.size()) + if(!gen.empty()) { // Use no actual command lines so that the target itself is not // considered always out of date. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 39933cb..4ba29f5 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -772,7 +772,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, sf->GetProperty("COMPILE_DEFINITIONS"), true); if (!flagsBuild.IsEmpty()) { - if (flags.size()) + if (!flags.empty()) { flags += ' '; } @@ -1874,7 +1874,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, { extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS"; } - if(extraLinkOptionsVar.size()) + if(!extraLinkOptionsVar.empty()) { this->CurrentLocalGenerator ->AddConfigVariableFlags(extraLinkOptions, @@ -2614,7 +2614,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target, config->SetComment(configVector[i].c_str()); config->AddAttribute("buildSettings", buildSettings); } - if(configVector.size()) + if(!configVector.empty()) { configlist->AddAttribute("defaultConfigurationName", this->CreateString(configVector[0].c_str())); diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index 9ded83a..9e3185c 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -33,7 +33,7 @@ class cmVS10XMLParser : public cmXMLParser virtual void StartElement(const std::string& name, const char**) { // once the GUID is found do nothing - if(this->GUID.size()) + if(!this->GUID.empty()) { return; } diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 5b78f0d..0d07536 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -984,7 +984,7 @@ void cmLocalVisualStudio6Generator std::string libMultiLineDebugOptions; std::string libMultiLineOptimizedOptions; - if(libPath.size()) + if(!libPath.empty()) { std::string lpath = this->ConvertToOutputFormat(libPath.c_str(), SHELL); @@ -1017,7 +1017,7 @@ void cmLocalVisualStudio6Generator libMultiLineOptionsForDebug += " \n"; } } - if(exePath.size()) + if(!exePath.empty()) { std::string lpath = this->ConvertToOutputFormat(exePath.c_str(), SHELL); @@ -1452,7 +1452,7 @@ void cmLocalVisualStudio6Generator #ifdef CM_USE_OLD_VS6 // Compute link information for the target. - if(extraLinkOptions.size()) + if(!extraLinkOptions.empty()) { libOptions += " "; libOptions += extraLinkOptions; @@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator std::string line; std::string libnameExports; - if(exportSymbol.size()) + if(!exportSymbol.empty()) { libnameExports = "/D \""; libnameExports += exportSymbol; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 2445995..5de6d37 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -2283,7 +2283,7 @@ public: virtual void StartElement(const std::string& name, const char** atts) { // once the GUID is found do nothing - if(this->GUID.size()) + if(!this->GUID.empty()) { return; } diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6344979..823b550 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1656,7 +1656,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( // for the first time we need a new line if there is something // produced here. const char* firstString = ">\n"; - if(objectName.size()) + if(!objectName.empty()) { (*this->BuildFileStream ) << firstString; firstString = ""; @@ -1675,7 +1675,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( defPropName += configUpper; if(const char* ccdefs = sf.GetProperty(defPropName.c_str())) { - if(configDefines.size()) + if(!configDefines.empty()) { configDefines += ";"; } diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index abd350e..bd4eb69 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -274,7 +274,7 @@ cmVisualStudioGeneratorOptions { // if there are configuration specific flags, then // use the configuration specific tag for PreprocessorDefinitions - if(this->Configuration.size()) + if(!this->Configuration.empty()) { fout << prefix; this->TargetGenerator->WritePlatformConfigTag( @@ -346,7 +346,7 @@ cmVisualStudioGeneratorOptions m != this->FlagMap.end(); ++m) { fout << indent; - if(this->Configuration.size()) + if(!this->Configuration.empty()) { this->TargetGenerator->WritePlatformConfigTag( m->first.c_str(), @@ -398,7 +398,7 @@ cmVisualStudioGeneratorOptions if(this->Version >= cmGlobalVisualStudioGenerator::VS10) { fout << prefix; - if(this->Configuration.size()) + if(!this->Configuration.empty()) { this->TargetGenerator->WritePlatformConfigTag( "AdditionalOptions", -- cgit v0.12