1 files changed, 26 insertions, 26 deletions

diff --git a/src/qjsondocument.cpp b/src/qjsondocument.cpp
index a5c39ab..376770d 100644
--- a/src/qjsondocument.cpp
+++ b/src/qjsondocument.cpp
@@ -68,7 +68,7 @@ JsonDocument::JsonDocument(const JsonArray &array)
     setArray(array);
 }
 
-JsonDocument::JsonDocument(Data *data)
+JsonDocument::JsonDocument(Private::Data *data)
     : d(data)
 {
     Q_ASSERT(d);
@@ -104,16 +104,16 @@ JsonDocument &JsonDocument::operator =(const JsonDocument &other)
 
 JsonDocument JsonDocument::fromBinaryData(const QByteArray &data)
 {
-    Header *h = (Header *) data.constData();
+    Private::Header *h = (Private::Header *) data.constData();
 
-    if (data.size() < (int)(sizeof(Header) + sizeof(Base)) ||
+    if (data.size() < (int)(sizeof(Private::Header) + sizeof(Private::Base)) ||
         h->tag != QBJS_Tag || h->version != 1u ||
-        sizeof(Header) + h->root()->size > (uint)data.size())
+        sizeof(Private::Header) + h->root()->size > (uint)data.size())
         return JsonDocument();
 
     char *raw = (char *)malloc(data.size());
     memcpy(raw, data.constData(), data.size());
-    Data *d = new Data(raw, data.size());
+    Private::Data *d = new Private::Data(raw, data.size());
 
     return JsonDocument(d);
 }
@@ -137,9 +137,9 @@ QVariant JsonDocument::toVariant() const
         return QVariant();
 
     if (d->header->root()->isArray())
-        return JsonArray(d, static_cast<Array *>(d->header->root())).toVariantList();
+        return JsonArray(d, static_cast<Private::Array *>(d->header->root())).toVariantList();
     else
-        return JsonObject(d, static_cast<Object *>(d->header->root())).toVariantMap();
+        return JsonObject(d, static_cast<Private::Object *>(d->header->root())).toVariantMap();
 }
 
 QByteArray JsonDocument::toJson() const
@@ -150,9 +150,9 @@ QByteArray JsonDocument::toJson() const
     QByteArray json;
 
     if (d->header->root()->isArray())
-        QJsonWriter::arrayToJson(static_cast<Array *>(d->header->root()), json, 0);
+        QJsonWriter::arrayToJson(static_cast<Private::Array *>(d->header->root()), json, 0);
     else
-        QJsonWriter::objectToJson(static_cast<Object *>(d->header->root()), json, 0);
+        QJsonWriter::objectToJson(static_cast<Private::Object *>(d->header->root()), json, 0);
 
     return json;
 }
@@ -176,24 +176,24 @@ QByteArray JsonDocument::toBinaryData() const
     if (!d || !d->rawData)
         return QByteArray();
 
-    return QByteArray(d->rawData, d->header->root()->size + sizeof(Header));
+    return QByteArray(d->rawData, d->header->root()->size + sizeof(Private::Header));
 }
 
-ValueType JsonDocument::type() const
+JsonValue::ValueType JsonDocument::type() const
 {
     if (!d)
-        return NullValue;
+        return JsonValue::Null;
 
-    Header *h = (Header *)d->rawData;
-    return h->root()->isArray() ? ArrayValue : ObjectValue;
+    Private::Header *h = (Private::Header *)d->rawData;
+    return h->root()->isArray() ? JsonValue::Array : JsonValue::Object;
 }
 
 JsonObject JsonDocument::object() const
 {
     if (d) {
-        Base *b = d->header->root();
+        Private::Base *b = d->header->root();
         if (b->isObject())
-            return JsonObject(d, static_cast<Object *>(b));
+            return JsonObject(d, static_cast<Private::Object *>(b));
     }
     return JsonObject();
 }
@@ -201,9 +201,9 @@ JsonObject JsonDocument::object() const
 JsonArray JsonDocument::array() const
 {
     if (d) {
-        Base *b = d->header->root();
+        Private::Base *b = d->header->root();
         if (b->isArray())
-            return JsonArray(d, static_cast<Array *>(b));
+            return JsonArray(d, static_cast<Private::Array *>(b));
     }
     return JsonArray();
 }
@@ -215,7 +215,7 @@ void JsonDocument::setObject(const JsonObject &object)
 
     d = object.d;
     if (!d) {
-        d = new Data(0, ObjectValue);
+        d = new Private::Data(0, JsonValue::Object);
     } else if (d->compactionCounter) {
         object.compact();
         d = object.d;
@@ -237,7 +237,7 @@ void JsonDocument::setArray(const JsonArray &array)
     d = array.d;
 
     if (!d) {
-        d = new Data(0, ArrayValue);
+        d = new Private::Data(0, JsonValue::Array);
     } else if (d->compactionCounter) {
         array.compact();
         d = array.d;
@@ -264,11 +264,11 @@ bool JsonDocument::operator==(const JsonDocument &other) const
         return false;
 
     if (d->header->root()->isObject())
-        return JsonObject(d, static_cast<Object *>(d->header->root()))
-                == JsonObject(other.d, static_cast<Object *>(other.d->header->root()));
+        return JsonObject(d, static_cast<Private::Object *>(d->header->root()))
+                == JsonObject(other.d, static_cast<Private::Object *>(other.d->header->root()));
     else
-        return JsonArray(d, static_cast<Array *>(d->header->root()))
-                == JsonArray(other.d, static_cast<Array *>(other.d->header->root()));
+        return JsonArray(d, static_cast<Private::Array *>(d->header->root()))
+                == JsonArray(other.d, static_cast<Private::Array *>(other.d->header->root()));
 }
 
 bool JsonDocument::operator!=(const JsonDocument &other) const
@@ -281,11 +281,11 @@ bool JsonDocument::isValid()
     if (!d)
         return false;
 
-    if (d->valid == Data::Unchecked)
+    if (d->valid == Private::Data::Unchecked)
         // Unchecked, check for validity
         d->validate();
 
-    if (d->valid != Data::Validated) {
+    if (d->valid != Private::Data::Validated) {
         if (!d->ref.deref())
             delete d;
         d = 0;