From acd4f01fd81c4303cad37128a75ca390c1a42571 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 20 Apr 2015 16:41:37 -0400 Subject: cmQtAutoGenerators: Split CR stripping out to helper function --- Source/cmQtAutoGenerators.cxx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 329f9de..547be6e 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -170,6 +170,17 @@ static std::string getAutogenTargetDir(cmTarget const* target) return targetDir; } +static std::string cmQtAutoGeneratorsStripCR(std::string const& line) +{ + // Strip CR characters rcc may have printed (possibly more than one!). + std::string::size_type cr = line.find('\r'); + if (cr != line.npos) + { + return line.substr(0, cr); + } + return line; +} + std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, cmTarget const* target, std::vector& depends) @@ -202,13 +213,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf, std::string oline; while(std::getline(ostr, oline)) { - // Strip CR characters rcc may have printed (possibly more than one!). - std::string::size_type cr = oline.find('\r'); - if (cr != oline.npos) - { - oline = oline.substr(0, cr); - } - + oline = cmQtAutoGeneratorsStripCR(oline); if (oline.empty()) { // The output of rcc --list contains many empty lines. -- cgit v0.12