HaikuDepot: Cleanup JSON string builder.

This commit is contained in:
Stephan Aßmus
2014-05-23 20:29:43 +02:00
parent 5e36a367d7
commit bfb2fd4153
+6 -21
View File
@@ -39,8 +39,7 @@ public:
JsonBuilder& AddObject(const char* name) JsonBuilder& AddObject(const char* name)
{ {
_StartName(name); _StartName(name);
fString << '{';
fString << "\":{";
fInList = false; fInList = false;
return *this; return *this;
} }
@@ -55,11 +54,8 @@ public:
JsonBuilder& AddArray(const char* name) JsonBuilder& AddArray(const char* name)
{ {
_StartName(name); _StartName(name);
fString << '[';
fString << "\":[";
fInList = false; fInList = false;
return *this; return *this;
} }
@@ -73,42 +69,30 @@ public:
JsonBuilder& AddValue(const char* name, const char* value) JsonBuilder& AddValue(const char* name, const char* value)
{ {
_StartName(name); _StartName(name);
fString << '\"';
// TODO: Escape value // TODO: Escape value
fString << "\":\"";
fString << value; fString << value;
fString << "\""; fString << '\"';
fInList = true; fInList = true;
return *this; return *this;
} }
JsonBuilder& AddValue(const char* name, int value) JsonBuilder& AddValue(const char* name, int value)
{ {
_StartName(name); _StartName(name);
fString << "\":";
fString << value; fString << value;
fInList = true; fInList = true;
return *this; return *this;
} }
JsonBuilder& AddValue(const char* name, bool value) JsonBuilder& AddValue(const char* name, bool value)
{ {
_StartName(name); _StartName(name);
fString << "\":";
if (value) if (value)
fString << "true"; fString << "true";
else else
fString << "false"; fString << "false";
fInList = true; fInList = true;
return *this; return *this;
} }
@@ -125,8 +109,9 @@ private:
fString << ",\""; fString << ",\"";
else else
fString << '"'; fString << '"';
// TODO: Escape name
fString << name; fString << name;
fString << "\":";
} }
private: private: