From 1d0d2291090bc93809ffca20f6216af2846c7ad4 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Mon, 18 Apr 2011 01:52:13 -0400 Subject: [PATCH] Fix saving of traces with pointers. --- gui/apitracecall.cpp | 2 +- gui/mainwindow.cpp | 2 +- gui/saverthread.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp index fa709c9..b2ded2f 100644 --- 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 f9e15f8..cd63962 100644 --- 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 db0aa53..ac726a1 100644 --- 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(); - 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(); Trace::EnumSig *sig = createEnumSig(apiEnum, ++id); -- 2.43.0