GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

C++11: Cleaned up program framework with range-based for

Browse source
This commit is contained in:
Paul Beckingham 2015-05-11 17:50:53 -04:00
parent 5a57dfd70d
commit e74c6963a9
28 changed files with 937 additions and 1221 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Msg.cpp
View file

@ -102,8 +102,7 @@ void Msg::setPayload (const std::string& payload)
////////////////////////////////////////////////////////////////////////////////
std::string Msg::get (const std::string& name) const
{
std::map <std::string, std::string>::const_iterator i;
i = _header.find (name);
auto i = _header.find (name);
if (i != _header.end ())
return i->second;
@ -119,9 +118,8 @@ std::string Msg::getPayload () const
////////////////////////////////////////////////////////////////////////////////
void Msg::all (std::vector <std::string>& names) const
{
std::map <std::string, std::string>::const_iterator i;
for (i = _header.begin (); i != _header.end (); ++i)
names.push_back (i->first);
for (auto& i : _header)
names.push_back (i.first);
}
////////////////////////////////////////////////////////////////////////////////
@ -129,9 +127,8 @@ std::string Msg::serialize () const
{
std::string output;
std::map <std::string, std::string>::const_iterator i;
for (i = _header.begin (); i != _header.end (); ++i)
output += i->first + ": " + i->second + "\n";
for (auto& i : _header)
output += i.first + ": " + i.second + "\n";
output += "\n" + _payload + "\n";
@ -144,21 +141,20 @@ bool Msg::parse (const std::string& input)
_header.clear ();
_payload = "";
std::string::size_type separator = input.find ("\n\n");
auto separator = input.find ("\n\n");
if (separator == std::string::npos)
throw std::string ("ERROR: Malformed message");
// Parse header.
std::vector <std::string> lines;
split (lines, input.substr (0, separator), '\n');
std::vector <std::string>::iterator i;
for (i = lines.begin (); i != lines.end (); ++i)
for (auto& i : lines)
{
std::string::size_type delimiter = i->find (':');
std::string::size_type delimiter = i.find (':');
if (delimiter == std::string::npos)
throw std::string ("ERROR: Malformed message header '") + *i + "'";
throw std::string ("ERROR: Malformed message header '") + i + "'";
_header[trim (i->substr (0, delimiter))] = trim (i->substr (delimiter + 1));
_header[trim (i.substr (0, delimiter))] = trim (i.substr (delimiter + 1));
}
// Parse payload.