Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

build fix for older Boost.JSON versions

Browse source
This commit is contained in:
Syping 2023-05-11 21:51:51 +02:00
parent 392f35a96d
commit 13fa4331fb
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/JsonEditorDialog.cpp
View file

@ -74,9 +74,14 @@ JsonEditorDialog::JsonEditorDialog(SnapmaticPicture *picture, QWidget *parent) :
ui->txtJSON->setTabStopWidth(fontMetrics.width(" ")); ui->txtJSON->setTabStopWidth(fontMetrics.width(" "));
#endif #endif
const boost::json::value jsonValue = boost::json::parse(jsonCode);
ui->txtJSON->setStyleSheet("QPlainTextEdit{background-color:rgb(46,47,48);color:rgb(238,231,172);}"); ui->txtJSON->setStyleSheet("QPlainTextEdit{background-color:rgb(46,47,48);color:rgb(238,231,172);}");
ui->txtJSON->setPlainText(QString::fromUtf8(SnapmaticJson::serialize(jsonValue, true).c_str()));
boost::json::error_code ec;
const boost::json::value jsonValue = boost::json::parse(jsonCode, ec);
if (jsonValue.is_object()) {
const boost::json::object jsonObject = jsonValue.get_object();
ui->txtJSON->setPlainText(QString::fromUtf8(SnapmaticJson::serialize(jsonObject, true).c_str()));
}
jsonHl = new JSHighlighter(ui->txtJSON->document()); jsonHl = new JSHighlighter(ui->txtJSON->document());
// DPI calculation // DPI calculation
@ -107,7 +112,7 @@ JsonEditorDialog::~JsonEditorDialog()
void JsonEditorDialog::closeEvent(QCloseEvent *ev) void JsonEditorDialog::closeEvent(QCloseEvent *ev)
{ {
const QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", ""); const QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", "");
std::error_code ec; boost::json::error_code ec;
const boost::json::value jsonNew = boost::json::parse(jsonPatched.toUtf8().constData(), ec); const boost::json::value jsonNew = boost::json::parse(jsonPatched.toUtf8().constData(), ec);
const boost::json::value jsonOriginal = boost::json::parse(jsonCode, ec); const boost::json::value jsonOriginal = boost::json::parse(jsonCode, ec);
const std::string newCode = SnapmaticJson::serialize(jsonNew); const std::string newCode = SnapmaticJson::serialize(jsonNew);
@ -137,7 +142,7 @@ void JsonEditorDialog::closeEvent(QCloseEvent *ev)
bool JsonEditorDialog::saveJsonContent() bool JsonEditorDialog::saveJsonContent()
{ {
const QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", ""); const QString jsonPatched = QString(ui->txtJSON->toPlainText()).replace("\t", "");
std::error_code ec; boost::json::error_code ec;
const boost::json::value jsonNew = boost::json::parse(jsonPatched.toUtf8().constData(), ec); const boost::json::value jsonNew = boost::json::parse(jsonPatched.toUtf8().constData(), ec);
if (jsonNew.is_object()) { if (jsonNew.is_object()) {
const boost::json::value jsonOriginal = boost::json::parse(jsonCode, ec); const boost::json::value jsonOriginal = boost::json::parse(jsonCode, ec);

2
src/SnapmaticPicture.cpp
View file

@ -568,7 +568,7 @@ bool SnapmaticPicture::preloadFile()
if (!picFilePath.endsWith(".g5e", Qt::CaseInsensitive) && p_ragePhoto.format() == G5EPhotoFormat::G5EX) if (!picFilePath.endsWith(".g5e", Qt::CaseInsensitive) && p_ragePhoto.format() == G5EPhotoFormat::G5EX)
isFormatSwitch = true; isFormatSwitch = true;
std::error_code ec; boost::json::error_code ec;
const boost::json::value jsonValue = boost::json::parse(p_ragePhoto.json(), ec); const boost::json::value jsonValue = boost::json::parse(p_ragePhoto.json(), ec);
if (ec) if (ec)
return false; return false;