Removed "" around linux version number in hardware report,

compiler warning and windows line endings.
This commit is contained in:
hiker 2014-10-07 15:42:22 +11:00
parent 9de7d11ee4
commit 6a47c157d2

View File

@ -124,7 +124,6 @@ bool readEtcReleaseFile(const std::string &filename)
{ {
std::ifstream in(filename); std::ifstream in(filename);
std::string s, distro, version; std::string s, distro, version;
int bits = 0;
while( (distro.empty() || version.empty()) && while( (distro.empty() || version.empty()) &&
std::getline(in, s) ) std::getline(in, s) )
{ {
@ -135,6 +134,8 @@ bool readEtcReleaseFile(const std::string &filename)
} }
if(!distro.empty() && !version.empty()) if(!distro.empty() && !version.empty())
{ {
distro = StringUtils::replace(distro, "\"", "");
version = StringUtils::replace(version, "\"", "");
m_os_version = distro + " " + version; m_os_version = distro + " " + version;
return true; return true;
} }