From 5a69b086a6efcdb848cdd9c6096a53581519253c Mon Sep 17 00:00:00 2001 From: Rafael Date: Wed, 14 Dec 2016 00:43:31 +0100 Subject: [PATCH] Qt4 build fix --- SnapmaticPicture.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index 812f59c..2109d48 100755 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -298,6 +298,7 @@ bool SnapmaticPicture::setPicture(const QImage &picture) if (snapmaticStream.seek(jpegStreamEditorBegin)) { bool saveSuccess; + Q_UNUSED(saveSuccess) QByteArray picByteArray1; QBuffer picStream1(&picByteArray1); picStream1.open(QIODevice::WriteOnly); @@ -400,7 +401,7 @@ QImage SnapmaticPicture::getPicture() } else if (writeEnabled) { - bool returnOk; + bool returnOk = 0; QImage returnPicture; QBuffer snapmaticStream(&rawPicContent); @@ -419,7 +420,7 @@ QImage SnapmaticPicture::getPicture() } else { - bool returnOk; + bool returnOk = 0; QImage returnPicture; QIODevice *picStream; @@ -475,6 +476,7 @@ void SnapmaticPicture::parseJsonContent() { QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonStr.toUtf8()); QJsonObject jsonObject = jsonDocument.object(); + QVariantMap jsonMap = jsonObject.toVariantMap(); // backward compatibility if (jsonObject.contains("loc")) { @@ -494,13 +496,13 @@ void SnapmaticPicture::parseJsonContent() if (jsonObject.contains("creat")) { QDateTime createdTimestamp; - localSpJson.createdTimestamp = jsonObject["creat"].toVariant().toUInt(); + localSpJson.createdTimestamp = jsonMap["creat"].toUInt(); createdTimestamp.setTime_t(localSpJson.createdTimestamp); localSpJson.createdDateTime = createdTimestamp; } if (jsonObject.contains("plyrs")) { - localSpJson.playersList = jsonObject["plyrs"].toVariant().toStringList(); + localSpJson.playersList = jsonMap["plyrs"].toStringList(); } if (jsonObject.contains("meme")) {