From bfb2fd415312a5ea7bd7720d975d6d412da7c34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Thu, 24 Apr 2014 21:27:56 +0200
Subject: [PATCH] HaikuDepot: Cleanup JSON string builder.

---
 src/apps/haikudepot/WebAppInterface.cpp | 27 ++++++-------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/apps/haikudepot/WebAppInterface.cpp b/src/apps/haikudepot/WebAppInterface.cpp
index b2c937d0e1..c4bae2989a 100644
--- a/src/apps/haikudepot/WebAppInterface.cpp
+++ b/src/apps/haikudepot/WebAppInterface.cpp
@@ -39,8 +39,7 @@ public:
 	JsonBuilder& AddObject(const char* name)
 	{
 		_StartName(name);
-
-		fString << "\":{";
+		fString << '{';
 		fInList = false;
 		return *this;
 	}
@@ -55,11 +54,8 @@ public:
 	JsonBuilder& AddArray(const char* name)
 	{
 		_StartName(name);
-
-		fString << "\":[";
-		
+		fString << '[';
 		fInList = false;
-		
 		return *this;
 	}
 
@@ -73,42 +69,30 @@ public:
 	JsonBuilder& AddValue(const char* name, const char* value)
 	{
 		_StartName(name);
-
+		fString << '\"';
 		// TODO: Escape value
-
-		fString << "\":\"";
 		fString << value;
-		fString << "\"";
-		
+		fString << '\"';
 		fInList = true;
-		
 		return *this;
 	}
 
 	JsonBuilder& AddValue(const char* name, int value)
 	{
 		_StartName(name);
-
-		fString << "\":";
 		fString << value;
-		
 		fInList = true;
-		
 		return *this;
 	}
 
 	JsonBuilder& AddValue(const char* name, bool value)
 	{
 		_StartName(name);
-
-		fString << "\":";
 		if (value)
 			fString << "true";
 		else
 			fString << "false";
-		
 		fInList = true;
-		
 		return *this;
 	}
 
@@ -125,8 +109,9 @@ private:
 			fString << ",\"";
 		else
 			fString << '"';
-
+		// TODO: Escape name
 		fString << name;
+		fString << "\":";
 	}
 
 private: