[nostalgia] Switch to strong int Error

This commit is contained in:
2019-07-28 00:32:42 -05:00
parent f4b336dd77
commit b107dc756b
21 changed files with 204 additions and 133 deletions
+12 -12
View File
@@ -18,7 +18,7 @@ ox::Error JsonReader::field(QString fieldName, int *dest) {
if (m_src.contains(fieldName)) {
return field(m_src[fieldName], dest);
} else {
return JSON_ERR_FIELD_MISSING;
return OxError(JSON_ERR_FIELD_MISSING);
}
}
@@ -26,7 +26,7 @@ ox::Error JsonReader::field(QString fieldName, bool *dest) {
if (m_src.contains(fieldName)) {
return field(m_src[fieldName], dest);
} else {
return JSON_ERR_FIELD_MISSING;
return OxError(JSON_ERR_FIELD_MISSING);
}
}
@@ -34,7 +34,7 @@ ox::Error JsonReader::field(QString fieldName, double *dest) {
if (m_src.contains(fieldName)) {
return field(m_src[fieldName], dest);
} else {
return JSON_ERR_FIELD_MISSING;
return OxError(JSON_ERR_FIELD_MISSING);
}
}
@@ -42,7 +42,7 @@ ox::Error JsonReader::field(QString fieldName, QString *dest) {
if (m_src.contains(fieldName)) {
return field(m_src[fieldName], dest);
} else {
return JSON_ERR_FIELD_MISSING;
return OxError(JSON_ERR_FIELD_MISSING);
}
}
@@ -51,36 +51,36 @@ ox::Error JsonReader::field(QString fieldName, QString *dest) {
ox::Error JsonReader::field(QJsonValueRef src, int *dest) {
if (src.isDouble()) {
*dest = src.toInt();
return 0;
return OxError(0);
} else {
return JSON_ERR_UNEXPECTED_TYPE;
return OxError(JSON_ERR_UNEXPECTED_TYPE);
}
}
ox::Error JsonReader::field(QJsonValueRef src, bool *dest) {
if (src.isBool()) {
*dest = src.toBool();
return 0;
return OxError(0);
} else {
return JSON_ERR_UNEXPECTED_TYPE;
return OxError(JSON_ERR_UNEXPECTED_TYPE);
}
}
ox::Error JsonReader::field(QJsonValueRef src, double *dest) {
if (src.isDouble()) {
*dest = src.toDouble();
return 0;
return OxError(0);
} else {
return JSON_ERR_UNEXPECTED_TYPE;
return OxError(JSON_ERR_UNEXPECTED_TYPE);
}
}
ox::Error JsonReader::field(QJsonValueRef src, QString *dest) {
if (src.isString()) {
*dest = src.toString();
return 0;
return OxError(0);
} else {
return JSON_ERR_UNEXPECTED_TYPE;
return OxError(JSON_ERR_UNEXPECTED_TYPE);
}
}