Remove var alias to JSONVar

Author: sandeepmistry

examples/JSONArray/JSONArray.ino

@@ -27,7 +27,7 @@ void demoParse() {
   Serial.println("parse");
   Serial.println("=====");
 
-  var myArray = JSON.parse(input);
+  JSONVar myArray = JSON.parse(input);
 
   // typeof(jsonVar) can be used to get the type of the var
   if (typeof(myArray) == "undefined") {
@@ -65,7 +65,7 @@ void demoCreation() {
   Serial.println("creation");
   Serial.println("========");
 
-  var myArray;
+  JSONVar myArray;
 
   myArray[0] = false;
   myArray[1] = 4242.5;
@@ -85,7 +85,7 @@ void demoCreation() {
   Serial.println();
 
   for (int i = 0; i < myArray.length(); i++) {
-    var value = myArray[i];
+    JSONVar value = myArray[i];
 
     Serial.print("typeof(myArray[");
     Serial.print(i);

examples/JSONKitchenSink/JSONKitchenSink.ino

@@ -34,7 +34,7 @@ void booleanDemo() {
   Serial.println("boolean");
   Serial.println("=======");
 
-  var myBoolean = true;
+  JSONVar myBoolean = true;
 
   Serial.print("typeof(myBoolean) = ");
   Serial.println(typeof(myBoolean)); // prints: boolean
@@ -54,7 +54,7 @@ void intDemo() {
   Serial.println("int");
   Serial.println("===");
 
-  var myInt = 42;
+  JSONVar myInt = 42;
 
   Serial.print("typeof(myInt) = ");
   Serial.println(typeof(myInt)); // prints: number
@@ -74,7 +74,7 @@ void doubleDemo() {
   Serial.println("double");
   Serial.println("======");
 
-  var myDouble = 42.5;
+  JSONVar myDouble = 42.5;
 
   Serial.print("typeof(myDouble) = ");
   Serial.println(typeof(myDouble)); // prints: number
@@ -94,7 +94,7 @@ void stringDemo() {
   Serial.println("string");
   Serial.println("======");
 
-  var myString = "Hello World!";
+  JSONVar myString = "Hello World!";
 
   Serial.print("typeof(myString) = ");
   Serial.println(typeof(myString)); // prints: string
@@ -114,7 +114,7 @@ void arrayDemo() {
   Serial.println("array");
   Serial.println("=====");
 
-  var myArray;
+  JSONVar myArray;
 
   myArray[0] = 42;
 
@@ -142,7 +142,7 @@ void objectDemo() {
   Serial.println("object");
   Serial.println("======");
 
-  var myObject;
+  JSONVar myObject;
 
   myObject["foo"] = "bar";
 

examples/JSONObject/JSONObject.ino

@@ -27,7 +27,7 @@ void demoParse() {
   Serial.println("parse");
   Serial.println("=====");
 
-  var myObject = JSON.parse(input);
+  JSONVar myObject = JSON.parse(input);
 
   // typeof(jsonVar) can be used to get the type of the var
   if (typeof(myObject) == "undefined") {
@@ -74,7 +74,7 @@ void demoCreation() {
   Serial.println("creation");
   Serial.println("========");
 
-  var myObject;
+  JSONVar myObject;
 
   myObject["hello"] = "world";
   myObject["true"] = true;
@@ -92,10 +92,10 @@ void demoCreation() {
   Serial.println();
 
   // myObject.keys() can be used to get an array of all the keys in the object
-  var keys = myObject.keys();
+  JSONVar keys = myObject.keys();
 
   for (int i = 0; i < keys.length(); i++) {
-    var value = myObject[keys[i]];
+    JSONVar value = myObject[keys[i]];
 
     Serial.print("typeof(myObject[");
     Serial.print(keys[i]);

src/JSONVar.h

@@ -91,10 +91,6 @@ class JSONVar : public Printable {
   struct cJSON* _parent;
 };
 
-#ifndef var
-typedef JSONVar var;
-#endif
-
 extern JSONVar undefined;
 
 #endif