Explorar el Código

Replace foo.size() pattern with !foo.empty().

Stephen Kelly hace 10 años
padre
commit
44ffb9cdb4

+ 2 - 2
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)

+ 1 - 1
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);
     }

+ 1 - 1
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: " <<

+ 1 - 1
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);
     }

+ 1 - 1
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)

+ 3 - 3
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;
     }

+ 1 - 1
Source/cmGlobalVisualStudioGenerator.cxx

@@ -81,7 +81,7 @@ bool cmGlobalVisualStudioGenerator::Compute()
     {
     std::vector<cmLocalGenerator*>& 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.

+ 3 - 3
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()));

+ 1 - 1
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;
         }

+ 4 - 4
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;

+ 1 - 1
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;
         }

+ 2 - 2
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 += ";";
         }

+ 3 - 3
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",