From 45c9ba11916ec8449fee03e0f6a40a8d30d10629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Blanchon?= <benoit.blanchon@gmail.com>
Date: Thu, 17 Jul 2014 13:16:14 +0200
Subject: [PATCH] Renamed JsonObjectBase into JsonPrintable

---
 JsonGenerator/JsonArrayBase.h                         | 6 +++---
 JsonGenerator/JsonHashTableBase.h                     | 6 +++---
 JsonGenerator/{JsonObjectBase.h => JsonPrintable.h}   | 2 +-
 JsonGeneratorTests/JsonArrayTests.cpp                 | 4 ++--
 JsonGeneratorTests/JsonGeneratorTests.vcxproj         | 2 +-
 JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters | 6 +++---
 JsonGeneratorTests/JsonHashTableTests.cpp             | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename JsonGenerator/{JsonObjectBase.h => JsonPrintable.h} (87%)

diff --git a/JsonGenerator/JsonArrayBase.h b/JsonGenerator/JsonArrayBase.h
index b01f7f97..1f1537b9 100644
--- a/JsonGenerator/JsonArrayBase.h
+++ b/JsonGenerator/JsonArrayBase.h
@@ -5,13 +5,13 @@
 
 #pragma once
 
-#include "JsonObjectBase.h"
+#include "JsonPrintable.h"
 
 namespace ArduinoJson
 {
     namespace Generator
     {
-        class JsonArrayBase : public JsonObjectBase
+        class JsonArrayBase : public JsonPrintable
         {
         public:
             JsonArrayBase(Internals::JsonValue* items, int capacity)
@@ -39,7 +39,7 @@ namespace ArduinoJson
 
             virtual size_t printTo(Print& p) const;
 
-            using JsonObjectBase::printTo;
+            using JsonPrintable::printTo;
 
         private:
             Internals::JsonValue* items;
diff --git a/JsonGenerator/JsonHashTableBase.h b/JsonGenerator/JsonHashTableBase.h
index 61fa22d8..ffb5b6db 100644
--- a/JsonGenerator/JsonHashTableBase.h
+++ b/JsonGenerator/JsonHashTableBase.h
@@ -5,14 +5,14 @@
 
 #pragma once
 
-#include "JsonObjectBase.h"
+#include "JsonPrintable.h"
 #include "EscapedString.h"
 
 namespace ArduinoJson
 {
     namespace Generator
     {
-        class JsonHashTableBase : public JsonObjectBase
+        class JsonHashTableBase : public JsonPrintable
         {
         public:
 
@@ -36,7 +36,7 @@ namespace ArduinoJson
                 count++;
             }
 
-            using JsonObjectBase::printTo;
+            using JsonPrintable::printTo;
 
             virtual size_t printTo(Print& p) const;
 
diff --git a/JsonGenerator/JsonObjectBase.h b/JsonGenerator/JsonPrintable.h
similarity index 87%
rename from JsonGenerator/JsonObjectBase.h
rename to JsonGenerator/JsonPrintable.h
index 7f164612..e29bf891 100644
--- a/JsonGenerator/JsonObjectBase.h
+++ b/JsonGenerator/JsonPrintable.h
@@ -13,7 +13,7 @@ namespace ArduinoJson
 {
     namespace Generator
     {
-        class JsonObjectBase : public Printable
+        class JsonPrintable : public Printable
         {
         public:
 
diff --git a/JsonGeneratorTests/JsonArrayTests.cpp b/JsonGeneratorTests/JsonArrayTests.cpp
index 5a217df0..f4886cf4 100644
--- a/JsonGeneratorTests/JsonArrayTests.cpp
+++ b/JsonGeneratorTests/JsonArrayTests.cpp
@@ -146,9 +146,9 @@ namespace JsonGeneratorTests
 
     private:
 
-        void addNested(JsonObjectBase& value)
+        void addNested(Printable& value)
         {
-            arr.add<JsonObjectBase&>(value);
+            arr.add<Printable&>(value);
         }
 
         template<typename T>
diff --git a/JsonGeneratorTests/JsonGeneratorTests.vcxproj b/JsonGeneratorTests/JsonGeneratorTests.vcxproj
index c0d34a6b..7be510b7 100644
--- a/JsonGeneratorTests/JsonGeneratorTests.vcxproj
+++ b/JsonGeneratorTests/JsonGeneratorTests.vcxproj
@@ -102,7 +102,7 @@
     <ClInclude Include="..\JsonGenerator\JsonArrayBase.h" />
     <ClInclude Include="..\JsonGenerator\JsonHashTable.h" />
     <ClInclude Include="..\JsonGenerator\JsonHashTableBase.h" />
-    <ClInclude Include="..\JsonGenerator\JsonObjectBase.h" />
+    <ClInclude Include="..\JsonGenerator\JsonPrintable.h" />
     <ClInclude Include="..\JsonGenerator\JsonValue.h" />
     <ClInclude Include="..\JsonGenerator\Print.h" />
     <ClInclude Include="..\JsonGenerator\Printable.h" />
diff --git a/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters b/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
index a5375d83..b736a0de 100644
--- a/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
+++ b/JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
@@ -56,9 +56,6 @@
     <ClInclude Include="..\JsonGenerator\JsonHashTable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\JsonGenerator\JsonObjectBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\JsonGenerator\JsonValue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -80,5 +77,8 @@
     <ClInclude Include="..\JsonGenerator\JsonArrayBase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\JsonGenerator\JsonPrintable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/JsonGeneratorTests/JsonHashTableTests.cpp b/JsonGeneratorTests/JsonHashTableTests.cpp
index 18831d53..f546efdb 100644
--- a/JsonGeneratorTests/JsonHashTableTests.cpp
+++ b/JsonGeneratorTests/JsonHashTableTests.cpp
@@ -97,9 +97,9 @@ namespace JsonGeneratorTests
 
     private:
         
-        void addNested(const char* key, JsonObjectBase& value)
+        void addNested(const char* key, Printable& value)
         {
-            hash.add<JsonObjectBase&>(key, value);
+            hash.add<Printable&>(key, value);
         }
 
         template<typename T>