From a88273873586c123e7db0d17b34ceea58d175e06 Mon Sep 17 00:00:00 2001 From: Syping Date: Tue, 25 Aug 2020 15:47:08 +0200 Subject: [PATCH] [skip ci] fix indent spelling --- qjson4/QJsonDocument.cpp | 26 +++++++++++++------------- qjson4/QJsonDocument.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qjson4/QJsonDocument.cpp b/qjson4/QJsonDocument.cpp index 857f3f6..7f8ad18 100644 --- a/qjson4/QJsonDocument.cpp +++ b/qjson4/QJsonDocument.cpp @@ -199,7 +199,7 @@ QString QJsonDocument::escapeString(const QString &s) const { //------------------------------------------------------------------------------ // Name: toJson //------------------------------------------------------------------------------ -QString QJsonDocument::toJson(const QJsonValue &v, JsonFormat format, int intend) const { +QString QJsonDocument::toJson(const QJsonValue &v, JsonFormat format, int indent) const { QString b; QTextStream ss(&b, QIODevice::WriteOnly | QIODevice::Text); @@ -234,17 +234,17 @@ QString QJsonDocument::toJson(const QJsonValue &v, JsonFormat format, int intend QJsonArray::const_iterator it = a.begin(); QJsonArray::const_iterator e = a.end(); - if (!compact) ss << QByteArray(4*intend, ' '); - ss << toJson(*it++, format, intend+1); + if (!compact) ss << QByteArray(4*indent, ' '); + ss << toJson(*it++, format, indent+1); for(;it != e; ++it) { ss << (compact ? "," : ",\n"); - if (!compact) ss << QByteArray(4*intend, ' '); - ss << toJson(*it, format, intend+1); + if (!compact) ss << QByteArray(4*indent, ' '); + ss << toJson(*it, format, indent+1); } } - intend--; - ss << (compact ? "]" : QString("\n%1]").arg(QString(4*intend, ' '))); + indent--; + ss << (compact ? "]" : QString("\n%1]").arg(QString(4*indent, ' '))); } break; case QJsonValue::Object: @@ -255,17 +255,17 @@ QString QJsonDocument::toJson(const QJsonValue &v, JsonFormat format, int intend QJsonObject::const_iterator it = o.begin(); QJsonObject::const_iterator e = o.end(); - if (!compact) ss << QByteArray(4*intend, ' '); - ss << '"' << escapeString(it.key()) << (compact ? "\":" : "\": ") << toJson(it.value(), format, intend+1); + if (!compact) ss << QByteArray(4*indent, ' '); + ss << '"' << escapeString(it.key()) << (compact ? "\":" : "\": ") << toJson(it.value(), format, indent+1); ++it; for(;it != e; ++it) { ss << (compact ? "," : ",\n"); - if (!compact) ss << QByteArray(4*intend, ' '); - ss << '"' << escapeString(it.key()) << (compact ? "\":" : "\": ") << toJson(it.value(), format, intend+1); + if (!compact) ss << QByteArray(4*indent, ' '); + ss << '"' << escapeString(it.key()) << (compact ? "\":" : "\": ") << toJson(it.value(), format, indent+1); } } - intend--; - ss << (compact ? "}" : QString("\n%1}").arg(QString(4*intend, ' '))); + indent--; + ss << (compact ? "}" : QString("\n%1}").arg(QString(4*indent, ' '))); } break; case QJsonValue::Undefined: diff --git a/qjson4/QJsonDocument.h b/qjson4/QJsonDocument.h index 79a0afd..3731f62 100644 --- a/qjson4/QJsonDocument.h +++ b/qjson4/QJsonDocument.h @@ -88,7 +88,7 @@ public: private: void setRoot(const QJsonRoot &root); - QString toJson(const QJsonValue &v, JsonFormat format, int intend = 1) const; + QString toJson(const QJsonValue &v, JsonFormat format, int indent = 1) const; QString escapeString(const QString &s) const; private: