Merge pull request #26 from phoenixsc18/json-compact-output

#25 Extend json() method in QJsonModel to take a parameter whether or…
This commit is contained in:
sacha schutz 2023-09-01 22:50:28 +02:00 committed by GitHub
commit ede66dd1ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -410,7 +410,7 @@ Qt::ItemFlags QJsonModel::flags(const QModelIndex &index) const
return QAbstractItemModel::flags(index);
}
QByteArray QJsonModel::json()
QByteArray QJsonModel::json(bool compact)
{
auto jsonValue = genJson(mRootItem);
QByteArray json;
@ -418,9 +418,9 @@ QByteArray QJsonModel::json()
return json;
if (jsonValue.isArray())
arrayToJson(jsonValue.toArray(), json, 0, false);
arrayToJson(jsonValue.toArray(), json, 0, compact);
else
objectToJson(jsonValue.toObject(), json, 0, false);
objectToJson(jsonValue.toObject(), json, 0, compact);
return json;
}

View File

@ -315,7 +315,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
QByteArray json();
QByteArray json(bool compact = false);
QByteArray jsonToByte(QJsonValue jsonValue);
void objectToJson(QJsonObject jsonObject, QByteArray &json, int indent, bool compact);
void arrayToJson(QJsonArray jsonArray, QByteArray &json, int indent, bool compact);