From 5b1c2047a4d136451c9e5be363a8b6622abfecb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Blanchon?= <benoit.blanchon@gmail.com>
Date: Thu, 3 Jul 2014 13:38:58 +0200
Subject: [PATCH] Renamed Print::write() into print()

---
 JsonGenerator/JsonArray.h                 |  6 +++---
 JsonGenerator/JsonValue.cpp               | 20 ++++++++++----------
 JsonGenerator/Print.h                     |  4 ++--
 JsonGeneratorTests/Print.cpp              |  6 +++---
 JsonGeneratorTests/StringBuilderTests.cpp |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/JsonGenerator/JsonArray.h b/JsonGenerator/JsonArray.h
index 213976b1..c851a21f 100644
--- a/JsonGenerator/JsonArray.h
+++ b/JsonGenerator/JsonArray.h
@@ -41,19 +41,19 @@ private:
     {
         size_t n = 0;
         
-        n += p.write("[");
+        n += p.write('[');
 
         for (int i = 0; i < itemCount; i++)
         {
             if (i > 0)
             {
-                n += p.write(",");
+                n += p.write(',');
             }
 
             n += items[i].printTo(p);
         }
 
-        n += p.write("]");
+        n += p.write(']');
 
         return n;
     }
diff --git a/JsonGenerator/JsonValue.cpp b/JsonGenerator/JsonValue.cpp
index 1f983897..6021fda1 100644
--- a/JsonGenerator/JsonValue.cpp
+++ b/JsonGenerator/JsonValue.cpp
@@ -7,7 +7,7 @@
 
 size_t JsonValue::printBoolTo(Print& p) const
 {
-    return p.write(content.asBool ? "true" : "false");
+    return p.print(content.asBool ? "true" : "false");
 }
 
 size_t JsonValue::printDoubleTo(Print& p) const
@@ -30,7 +30,7 @@ size_t JsonValue::printPrintableTo(Print& p) const
     if (content.asPrintable)
         return ((Printable*) content.asPrintable)->printTo(p);
     else
-        return p.write("null");
+        return p.print("null");
 }
 
 size_t JsonValue::printStringTo(Print& p) const
@@ -39,7 +39,7 @@ size_t JsonValue::printStringTo(Print& p) const
 
     if (!s)
     {
-        return p.write("null");
+        return p.print("null");
     }
 
     size_t n = 0;
@@ -51,31 +51,31 @@ size_t JsonValue::printStringTo(Print& p) const
         switch (*s)
         {
         case '"':
-            n += p.write("\\\"");
+            n += p.print("\\\"");
             break;
 
         case '\\':
-            n += p.write("\\\\");
+            n += p.print("\\\\");
             break;
 
         case '\b':
-            n += p.write("\\b");
+            n += p.print("\\b");
             break;
 
         case '\f':
-            n += p.write("\\f");
+            n += p.print("\\f");
             break;
 
         case '\n':
-            n += p.write("\\n");
+            n += p.print("\\n");
             break;
 
         case '\r':
-            n += p.write("\\r");
+            n += p.print("\\r");
             break;
 
         case '\t':
-            n += p.write("\\t");
+            n += p.print("\\t");
             break;
 
         default:
diff --git a/JsonGenerator/Print.h b/JsonGenerator/Print.h
index a277a51b..85bd8e7d 100644
--- a/JsonGenerator/Print.h
+++ b/JsonGenerator/Print.h
@@ -14,9 +14,9 @@ class Print
 {
 public:
 
-    virtual size_t write(uint8_t c) = 0;
+    virtual size_t write(uint8_t) = 0;
 
-    size_t write(const char* s);
+    size_t print(const char[]);
     size_t print(double, int = 2);
     size_t print(long);
 };
diff --git a/JsonGeneratorTests/Print.cpp b/JsonGeneratorTests/Print.cpp
index ad56c340..39df0b36 100644
--- a/JsonGeneratorTests/Print.cpp
+++ b/JsonGeneratorTests/Print.cpp
@@ -9,7 +9,7 @@
 #include <cstdio>
 //#include <cstring>
 
-size_t Print::write(const char* s)
+size_t Print::print(const char s[])
 {
     size_t n = 0;
     while (*s)
@@ -23,14 +23,14 @@ size_t Print::print(double value, int digits)
 {
     char tmp[32];
     sprintf(tmp, "%.*lg", digits+1, value);
-    return write(tmp);
+    return print(tmp);
 }
 
 size_t Print::print(long value)
 {
     char tmp[32];
     sprintf(tmp, "%ld", value);
-    return write(tmp);
+    return print(tmp);
 }
 
 #endif
\ No newline at end of file
diff --git a/JsonGeneratorTests/StringBuilderTests.cpp b/JsonGeneratorTests/StringBuilderTests.cpp
index 8548f9b9..aeab00f5 100644
--- a/JsonGeneratorTests/StringBuilderTests.cpp
+++ b/JsonGeneratorTests/StringBuilderTests.cpp
@@ -64,7 +64,7 @@ namespace JsonGeneratorTests
 
         void write(const char* value)
         {
-            returnValue = sb->write(value);
+            returnValue = sb->print(value);
         }
 
         void assertResultIs(const char* expected)