mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

QtAutogen: Remove and inline ReadAll function

Browse Source 
The function was only used once.
This commit is contained in:
Sebastian Holtermann
2016-11-30 10:04:19 +01:00
parent d0283dc185
commit 8de8d3b191
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmQtAutoGeneratorInitializer.cxx
View File

@@ -424,15 +424,6 @@ static std::string utilStripCR(std::string const& line)
return line;
}
static std::string ReadAll(const std::string& filename)
{
cmsys::ifstream file(filename.c_str());
std::ostringstream stream;
stream << file.rdbuf();
file.close();
return stream.str();
}
/// @brief Reads the resource files list from from a .qrc file - Qt5 version
/// @return True if the .qrc file was successfully parsed
static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target,
@@ -524,7 +515,13 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target,
static bool ListQt4RccInputs(cmSourceFile* sf,
std::vector<std::string>& depends)
{
const std::string qrcContents = ReadAll(sf->GetFullPath());
// Read file into string
std::string qrcContents;
{
std::ostringstream stream;
stream << cmsys::ifstream(sf->GetFullPath().c_str()).rdbuf();
qrcContents = stream.str();
}
cmsys::RegularExpression fileMatchRegex("(<file[^<]+)");