chris/harbour-sailfin
chris/harbour-sailfin
1
0
Fork 0
mirror of https://github.com/HenkKalkwater/harbour-sailfin.git synced 2025-09-05 18:22:46 +00:00
Code Issues Releases Wiki Activity

WIP: Slowly bringing back viewmodels

Browse source
This commit is contained in:
Chris Josten 2021-03-29 23:48:16 +02:00
parent 9abee12658
commit 228f81984b
17 changed files with 292 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

44
core/src/support/jsonconv.cpp
View file

@ -149,8 +149,14 @@ QJsonValue toJsonValue<QStringList>(const QStringList &source, convertType<QStri
// QJsonObject
template <>
QJsonObject fromJsonValue<QJsonObject>(const QJsonValue &source, convertType<QJsonObject>) {
if (!source.isObject()) throw ParseException("Error parsing JSON value as object: not a double");
return source.toObject();
switch(source.type()) {
case QJsonValue::Null:
return QJsonObject();
case QJsonValue::Object:
return source.toObject();
default:
throw ParseException("Error parsing JSON value as object: not an object");
}
}
template <>
@ -161,7 +167,7 @@ QJsonValue toJsonValue<QJsonObject>(const QJsonObject &source, convertType<QJson
// Double
template <>
double fromJsonValue<double>(const QJsonValue &source, convertType<double>) {
if (!source.isDouble()) throw ParseException("Error parsing JSON value as integer: not a double");
if (!source.isDouble()) throw ParseException("Error parsing JSON value as double: not a double");
return source.toDouble();
}
@ -170,6 +176,18 @@ QJsonValue toJsonValue<double>(const double &source, convertType<double>) {
return QJsonValue(source);
}
// Float
template <>
float fromJsonValue<float>(const QJsonValue &source, convertType<float>) {
if (!source.isDouble()) throw ParseException("Error parsing JSON value as float: not a double");
return static_cast<float>(source.toDouble());
}
template <>
QJsonValue toJsonValue<float>(const float &source, convertType<float>) {
return QJsonValue(static_cast<double>(source));
}
// QDateTime
template <>
QDateTime fromJsonValue<QDateTime>(const QJsonValue &source, convertType<QDateTime>) {
@ -205,27 +223,37 @@ QJsonValue toJsonValue<QUuid>(const QUuid &source, convertType<QUuid>) {
// String types
template <>
QString toString(const QUuid &source) {
QString toString(const QUuid &source, convertType<QUuid>) {
return uuidToString(source);
}
template <>
QString toString(const qint32 &source) {
QString toString(const qint32 &source, convertType<qint32>) {
return QString::number(source);
}
template <>
QString toString(const qint64 &source) {
QString toString(const qint64 &source, convertType<qint64>) {
return QString::number(source);
}
template <>
QString toString(const bool &source) {
QString toString(const float &source, convertType<float>) {
return QString::number(source);
}
template <>
QString toString(const double &source, convertType<double>) {
return QString::number(source);
}
template <>
QString toString(const bool &source, convertType<bool>) {
return source ? QStringLiteral("true") : QStringLiteral("false");
}
template <>
QString toString(const QString &source) {
QString toString(const QString &source, convertType<QString>) {
return source;
}