Prepare for Wires-X encoding.

This commit is contained in:
Jonathan Naylor 2016-06-06 18:19:56 +01:00
parent d9c0bb27c9
commit bbb7fc6c2c
12 changed files with 97 additions and 177 deletions

View file

@ -46,9 +46,8 @@ m_power(0U),
m_latitude(0.0F),
m_longitude(0.0F),
m_height(0),
m_location(),
m_name(),
m_description(),
m_url(),
m_logDisplayLevel(0U),
m_logFileLevel(0U),
m_logFilePath(),
@ -128,12 +127,10 @@ bool CConf::read()
m_longitude = float(::atof(value));
else if (::strcmp(key, "Height") == 0)
m_height = ::atoi(value);
else if (::strcmp(key, "Location") == 0)
m_location = value;
else if (::strcmp(key, "Name") == 0)
m_name = value;
else if (::strcmp(key, "Description") == 0)
m_description = value;
else if (::strcmp(key, "URL") == 0)
m_url = value;
} else if (section == SECTION_LOG) {
if (::strcmp(key, "FilePath") == 0)
m_logFilePath = value;
@ -214,9 +211,9 @@ int CConf::getHeight() const
return m_height;
}
std::string CConf::getLocation() const
std::string CConf::getName() const
{
return m_location;
return m_name;
}
std::string CConf::getDescription() const
@ -224,11 +221,6 @@ std::string CConf::getDescription() const
return m_description;
}
std::string CConf::getURL() const
{
return m_url;
}
unsigned int CConf::getLogDisplayLevel() const
{
return m_logDisplayLevel;