diff options
author | Brad King <brad.king@kitware.com> | 2014-11-25 15:18:49 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-25 15:18:49 (GMT) |
commit | 4987b3716583504442bb737c9d1f170ba99feed8 (patch) | |
tree | d9004aecaea8d55209790acd6773f072bed0db8b /Source/cmQtAutoGenerators.cxx | |
parent | 623a06a6f3bb2ce4a55f319207116271eb054c72 (diff) | |
parent | 5eb4d7590e0e721b56fc735ab6da35d55ad339d0 (diff) | |
download | CMake-4987b3716583504442bb737c9d1f170ba99feed8.zip CMake-4987b3716583504442bb737c9d1f170ba99feed8.tar.gz CMake-4987b3716583504442bb737c9d1f170ba99feed8.tar.bz2 |
Merge topic 'remove-c_str'
5eb4d759 Remove some unneeded c_str calls.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index c71e739..0c38366 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -178,7 +178,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, command.push_back("--list"); std::string absFile = cmsys::SystemTools::GetRealPath( - sf->GetFullPath().c_str()); + sf->GetFullPath()); command.push_back(absFile); @@ -394,7 +394,7 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target) { cmSourceFile* sf = *fileIt; std::string absFile = cmsys::SystemTools::GetRealPath( - sf->GetFullPath().c_str()); + sf->GetFullPath()); std::string ext = sf->GetExtension(); @@ -2322,8 +2322,8 @@ bool cmQtAutoGenerators::InputFilesNewerThanQrc(const std::string& qrcFile, it != files.end(); ++it) { int inputNewerThanQrc = 0; - bool success = cmsys::SystemTools::FileTimeCompare(it->c_str(), - rccOutput.c_str(), + bool success = cmsys::SystemTools::FileTimeCompare(*it, + rccOutput, &inputNewerThanQrc); if (!success || inputNewerThanQrc >= 0) { @@ -2356,7 +2356,7 @@ bool cmQtAutoGenerators::GenerateQrc() int sourceNewerThanQrc = 0; bool generateQrc = !cmsys::SystemTools::FileTimeCompare(*si, - rcc_output_file.c_str(), + rcc_output_file, &sourceNewerThanQrc); generateQrc = generateQrc || (sourceNewerThanQrc >= 0); generateQrc = generateQrc || this->InputFilesNewerThanQrc(*si, |