Fix saving of traces with pointers.

diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp
index fa709c9acfacef9fe479f347c0acadf8c53af124..b2ded2ff053fdfc2b110f9d3ecd7cab70102fc4a 100644 (file)
--- a/gui/apitracecall.cpp
+++ b/gui/apitracecall.cpp
@@ -149,7 +149,7 @@ void ApiStruct::init(const Trace::Struct *s)
 
 void VariantVisitor::visit(Trace::Null *)
 {
-    m_variant = QVariant(QLatin1String("NULL"));
+    m_variant = QVariant::fromValue(ApiPointer(0));
 }
 
 void VariantVisitor::visit(Trace::Bool *node)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index f9e15f825502330bc14f430e8fad915e82e4fcb2..cd63962d068f704e57984efa77002ccfc0024348 100644 (file)
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -922,7 +922,7 @@ void MainWindow::editCall()
 
 void MainWindow::slotStartedSaving()
 {
-    m_progressBar->setValue(0);
+    m_progressBar->show();
     statusBar()->showMessage(
         tr("Saving to %1").arg(m_trace->fileName()));
 }

diff --git a/gui/saverthread.cpp b/gui/saverthread.cpp
index db0aa532a1ac636377ab36e167cf235a4f6f5df8..ac726a1d8c32ae2551d551666a7a4ead8ead09e1 100644 (file)
--- a/gui/saverthread.cpp
+++ b/gui/saverthread.cpp
@@ -187,11 +187,11 @@ writeValue(const QVariant &var, unsigned &id)
             deleteStructSig(str);
         } else if (type == pointerType) {
             ApiPointer apiPtr = var.value<ApiPointer>();
-            Trace::BeginArray(1);
-            Trace::BeginElement();
+            //Trace::BeginArray(1);
+            //Trace::BeginElement();
             Trace::LiteralOpaque((const void*)apiPtr.value());
-            Trace::EndElement();
-            Trace::EndArray();
+            //Trace::EndElement();
+            //Trace::EndArray();
         } else if (type == enumType) {
             ApiEnum apiEnum = var.value<ApiEnum>();
             Trace::EnumSig *sig = createEnumSig(apiEnum, ++id);