From 524610f967e5289810a0d67a2942493d8f61d1dd Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 16 Jan 2015 01:12:53 +0100 Subject: Replace 'foo.size() == 0' pattern with foo.empty(). --- Source/CPack/cmCPackNSISGenerator.cxx | 4 ++-- Source/cmGlobalVisualStudio6Generator.cxx | 2 +- Source/cmGlobalVisualStudio71Generator.cxx | 2 +- Source/cmGlobalVisualStudio7Generator.cxx | 4 ++-- Source/cmLocalVisualStudio6Generator.cxx | 6 +++--- Source/cmLocalVisualStudio7Generator.cxx | 2 +- Source/cmVisualStudio10TargetGenerator.cxx | 2 +- Source/cmXCode21Object.cxx | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 2de2bc4..49aad97 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -49,7 +49,7 @@ int cmCPackNSISGenerator::PackageFiles() // TODO: Fix nsis to force out file name std::string nsisInFileName = this->FindTemplate("NSIS.template.in"); - if ( nsisInFileName.size() == 0 ) + if (nsisInFileName.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack error: Could not find NSIS installer template file." @@ -58,7 +58,7 @@ int cmCPackNSISGenerator::PackageFiles() } std::string nsisInInstallOptions = this->FindTemplate("NSIS.InstallOptions.ini.in"); - if ( nsisInInstallOptions.size() == 0 ) + if (nsisInInstallOptions.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack error: Could not find NSIS installer options file." diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index 65a15ee..b7c897c 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -255,7 +255,7 @@ void cmGlobalVisualStudio6Generator ::OutputDSWFile(cmLocalGenerator* root, std::vector& generators) { - if(generators.size() == 0) + if(generators.empty()) { return; } diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index f7b6470..607642c 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -212,7 +212,7 @@ cmGlobalVisualStudio71Generator { const char* name = di->c_str(); std::string guid = this->GetGUID(name); - if(guid.size() == 0) + if(guid.empty()) { std::string m = "Target: "; m += target.GetName(); diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index f8d882c..2660d23 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -359,7 +359,7 @@ void cmGlobalVisualStudio7Generator ::OutputSLNFile(cmLocalGenerator* root, std::vector& generators) { - if(generators.size() == 0) + if(generators.empty()) { return; } @@ -736,7 +736,7 @@ cmGlobalVisualStudio7Generator { const char* name = di->c_str(); std::string guid = this->GetGUID(name); - if(guid.size() == 0) + if(guid.empty()) { std::string m = "Target: "; m += target.GetName(); diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 29e1034..5b78f0d 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -988,7 +988,7 @@ void cmLocalVisualStudio6Generator { std::string lpath = this->ConvertToOutputFormat(libPath.c_str(), SHELL); - if(lpath.size() == 0) + if(lpath.empty()) { lpath = "."; } @@ -1021,7 +1021,7 @@ void cmLocalVisualStudio6Generator { std::string lpath = this->ConvertToOutputFormat(exePath.c_str(), SHELL); - if(lpath.size() == 0) + if(lpath.empty()) { lpath = "."; } @@ -1062,7 +1062,7 @@ void cmLocalVisualStudio6Generator } std::string lpath = this->ConvertToOutputFormat(path.c_str(), SHELL); - if(lpath.size() == 0) + if(lpath.empty()) { lpath = "."; } diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index a38a061..2445995 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -2331,7 +2331,7 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID( cmVS7XMLParser parser; parser.ParseFile(path); // if we can not find a GUID then we will generate one later - if(parser.GUID.size() == 0) + if(parser.GUID.empty()) { return; } diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 80b8591..a6568f1 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2783,7 +2783,7 @@ void cmVisualStudio10TargetGenerator::WriteEvent( std::vector const& commands, std::string const& configName) { - if(commands.size() == 0) + if(commands.empty()) { return; } diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx index f30f700..3973540 100644 --- a/Source/cmXCode21Object.cxx +++ b/Source/cmXCode21Object.cxx @@ -22,7 +22,7 @@ cmXCode21Object::cmXCode21Object(PBXType ptype, Type type) //---------------------------------------------------------------------------- void cmXCode21Object::PrintComment(std::ostream& out) { - if(this->Comment.size() == 0) + if(this->Comment.empty()) { cmXCodeObject* n = this->GetObject("name"); if(n) -- cgit v0.12