diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 09:17:41 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-06 14:59:24 (GMT) |
commit | d0283dc1859d61dc2cbdec0c8ee0b00214976c06 (patch) | |
tree | 3d1d982ece520f30413dc25c696146b7c27fbe7c /Source/cmQtAutoGeneratorInitializer.cxx | |
parent | 2c9667e897f0342c40afa5db5947d87f89e557b1 (diff) | |
download | CMake-d0283dc1859d61dc2cbdec0c8ee0b00214976c06.zip CMake-d0283dc1859d61dc2cbdec0c8ee0b00214976c06.tar.gz CMake-d0283dc1859d61dc2cbdec0c8ee0b00214976c06.tar.bz2 |
QtAutogen: Use shorter name for static function
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
-rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 27e9737..fb94e90 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -414,7 +414,7 @@ static void utilCopyTargetProperty(cmTarget* destinationTarget, } } -static std::string cmQtAutoGeneratorsStripCR(std::string const& line) +static std::string utilStripCR(std::string const& line) { // Strip CR characters rcc may have printed (possibly more than one!). std::string::size_type cr = line.find('\r'); @@ -486,7 +486,7 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target, std::istringstream ostr(rccStdOut); std::string oline; while (std::getline(ostr, oline)) { - oline = cmQtAutoGeneratorsStripCR(oline); + oline = utilStripCR(oline); if (!oline.empty()) { depends.push_back(oline); } @@ -497,7 +497,7 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target, std::istringstream estr(rccStdErr); std::string eline; while (std::getline(estr, eline)) { - eline = cmQtAutoGeneratorsStripCR(eline); + eline = utilStripCR(eline); if (cmHasLiteralPrefix(eline, "RCC: Error in")) { static std::string searchString = "Cannot find file '"; |