summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGen.cxx
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2019-04-05 19:34:42 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2019-04-06 14:17:40 (GMT)
commit95de172b68b23124d8dfa3fb238876b8f2ecd3e7 (patch)
tree3d76f680b11b893ec935e6aeae56c46a71c67fe6 /Source/cmQtAutoGen.cxx
parent521475b41b06d6f99edeeb9a36edb2bde8b55579 (diff)
downloadCMake-95de172b68b23124d8dfa3fb238876b8f2ecd3e7.zip
CMake-95de172b68b23124d8dfa3fb238876b8f2ecd3e7.tar.gz
CMake-95de172b68b23124d8dfa3fb238876b8f2ecd3e7.tar.bz2
AutoRcc: Make rcc parsing function private
The `.qrc` parsing functions in `cmQtAutoGen` are no longer needed outside the private implementation of `cmQtAutoGen::RccLister`. This makes them private, too.
Diffstat (limited to 'Source/cmQtAutoGen.cxx')
-rw-r--r--Source/cmQtAutoGen.cxx24
1 files changed, 9 insertions, 15 deletions
diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx
index 9880c02..9918c35 100644
--- a/Source/cmQtAutoGen.cxx
+++ b/Source/cmQtAutoGen.cxx
@@ -240,8 +240,8 @@ void cmQtAutoGen::RccMergeOptions(std::vector<std::string>& baseOpts,
MergeOptions(baseOpts, newOpts, valueOpts, isQt5);
}
-void cmQtAutoGen::RccListParseContent(std::string const& content,
- std::vector<std::string>& files)
+static void RccListParseContent(std::string const& content,
+ std::vector<std::string>& files)
{
cmsys::RegularExpression fileMatchRegex("(<file[^<]+)");
cmsys::RegularExpression fileReplaceRegex("(^<file[^>]*>)");
@@ -258,10 +258,10 @@ void cmQtAutoGen::RccListParseContent(std::string const& content,
}
}
-bool cmQtAutoGen::RccListParseOutput(std::string const& rccStdOut,
- std::string const& rccStdErr,
- std::vector<std::string>& files,
- std::string& error)
+static bool RccListParseOutput(std::string const& rccStdOut,
+ std::string const& rccStdErr,
+ std::vector<std::string>& files,
+ std::string& error)
{
// Lambda to strip CR characters
auto StripCR = [](std::string& line) {
@@ -308,14 +308,6 @@ bool cmQtAutoGen::RccListParseOutput(std::string const& rccStdOut,
return true;
}
-void cmQtAutoGen::RccListConvertFullPath(std::string const& qrcFileDir,
- std::vector<std::string>& files)
-{
- for (std::string& entry : files) {
- entry = cmSystemTools::CollapseFullPath(entry, qrcFileDir);
- }
-}
-
cmQtAutoGen::RccLister::RccLister() = default;
cmQtAutoGen::RccLister::RccLister(std::string rccExecutable,
@@ -412,6 +404,8 @@ bool cmQtAutoGen::RccLister::list(std::string const& qrcFile,
}
// Convert relative paths to absolute paths
- RccListConvertFullPath(fileDir, files);
+ for (std::string& entry : files) {
+ entry = cmSystemTools::CollapseFullPath(entry, fileDir);
+ }
return true;
}