GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +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/JSON.cpp
View file

@ -162,9 +162,8 @@ std::string json::literal::dump ()
////////////////////////////////////////////////////////////////////////////////
json::array::~array ()
{
std::vector <json::value*>::iterator i;
for (i = _data.begin (); i != _data.end (); ++i)
delete *i;
for (auto& i : _data)
delete i;
}
////////////////////////////////////////////////////////////////////////////////
@ -227,10 +226,7 @@ std::string json::array::dump ()
std::string output;
output += "[";
std::vector <json::value*>::iterator i;
for (i = _data.begin ();
i != _data.end ();
++i)
for (auto i = _data.begin (); i != _data.end (); ++i)
{
if (i != _data.begin ())
output += ",";
@ -245,9 +241,8 @@ std::string json::array::dump ()
////////////////////////////////////////////////////////////////////////////////
json::object::~object ()
{
std::map <std::string, json::value*>::iterator i;
for (i = _data.begin (); i != _data.end (); ++i)
delete i->second;
for (auto& i : _data)
delete i.second;
}
////////////////////////////////////////////////////////////////////////////////
@ -341,8 +336,7 @@ std::string json::object::dump ()
std::string output;
output += "{";
std::map <std::string, json::value*>::iterator i;
for (i = _data.begin (); i != _data.end (); ++i)
for (auto i = _data.begin (); i != _data.end (); ++i)
{
if (i != _data.begin ())
output += ",";
@ -384,9 +378,9 @@ std::string json::encode (const std::string& input)
{
std::string output;
for (std::string::size_type i = 0; i < input.length (); ++i)
for (auto& i : input)
{
switch (input[i])
switch (i)
{
// Simple translations.
case '"': output += "\\\""; break;
@ -399,7 +393,7 @@ std::string json::encode (const std::string& input)
case '\t': output += "\\t"; break;
// Default NOP.
default: output += input[i]; break;
default: output += i; break;
}
}