diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-01-16 00:17:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-24 18:47:18 (GMT) |
| commit | 44ffb9cdb4329c5ed9b724659f234d26da336b5a (patch) | |
| tree | 8f3d95ebc2c91465f071d37269b3c25f044fd5bb /Source/CPack/WiX | |
| parent | 8f89f8b1e9693abbc50d917c04846000bf14e189 (diff) | |
| download | CMake-44ffb9cdb4329c5ed9b724659f234d26da336b5a.zip CMake-44ffb9cdb4329c5ed9b724659f234d26da336b5a.tar.gz CMake-44ffb9cdb4329c5ed9b724659f234d26da336b5a.tar.bz2 | |
Replace foo.size() pattern with !foo.empty().
Diffstat (limited to 'Source/CPack/WiX')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmWIXAccessControlList.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmWIXPatch.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/WiX/cmWIXSourceWriter.cxx | 2 |
4 files changed, 5 insertions, 5 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); } |