summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/qubjson.cpp6
-rw-r--r--gui/qubjson.h2
-rw-r--r--gui/retracer.cpp2
3 files changed, 4 insertions, 6 deletions
diff --git a/gui/qubjson.cpp b/gui/qubjson.cpp
index 2649a41a..ae3b7b15 100644
--- a/gui/qubjson.cpp
+++ b/gui/qubjson.cpp
@@ -267,13 +267,11 @@ readVariant(QDataStream &stream, Marker type)
}
-QVariantMap decodeUBJSONObject(QIODevice *io)
+QVariant decodeUBJSONObject(QIODevice *io)
{
QDataStream stream(io);
stream.setByteOrder(QDataStream::BigEndian);
Marker marker = readMarker(stream);
- Q_ASSERT(marker == MARKER_OBJECT_BEGIN);
- Q_UNUSED(marker);
- return readObject(stream);
+ return readVariant(stream, marker);
}
diff --git a/gui/qubjson.h b/gui/qubjson.h
index a5e38e50..7ca043d4 100644
--- a/gui/qubjson.h
+++ b/gui/qubjson.h
@@ -31,4 +31,4 @@
class QIODevice;
-QVariantMap decodeUBJSONObject(QIODevice *io);
+QVariant decodeUBJSONObject(QIODevice *io);
diff --git a/gui/retracer.cpp b/gui/retracer.cpp
index 103cdeb9..02f01454 100644
--- a/gui/retracer.cpp
+++ b/gui/retracer.cpp
@@ -446,7 +446,7 @@ void Retracer::run()
BlockingIODevice io(&process);
if (m_captureState) {
- parsedJson = decodeUBJSONObject(&io);
+ parsedJson = decodeUBJSONObject(&io).toMap();
process.waitForFinished(-1);
} else if (m_captureThumbnails) {
/*