Set a parent trace on all the frames.

[apitrace] / gui / apitrace.cpp

diff --git a/gui/apitrace.cpp b/gui/apitrace.cpp
index 592202fee3f0d1d9529d3dc5bcd700db25d4dcd0..abdae27591e03db46d7e2086998a50cbe4caccee 100644 (file)
--- a/gui/apitrace.cpp
+++ b/gui/apitrace.cpp
@@ -29,13 +29,13 @@ bool ApiTrace::isCallAFrameMarker(const ApiTraceCall *call,
 
     switch (marker) {
     case FrameMarker_SwapBuffers:
-        return call->name.contains(QLatin1String("SwapBuffers"));
+        return call->name().contains(QLatin1String("SwapBuffers"));
     case FrameMarker_Flush:
-        return call->name == QLatin1String("glFlush");
+        return call->name() == QLatin1String("glFlush");
     case FrameMarker_Finish:
-        return call->name == QLatin1String("glFinish");
+        return call->name() == QLatin1String("glFinish");
     case FrameMarker_Clear:
-        return call->name == QLatin1String("glClear");
+        return call->name() == QLatin1String("glClear");
     }
 
     Q_ASSERT(!"unknown frame marker");
@@ -134,6 +134,7 @@ void ApiTrace::addFrames(const QList<ApiTraceFrame*> &frames)
     int currentCalls = m_calls.count();
     int numNewCalls = 0;
     foreach(ApiTraceFrame *frame, frames) {
+        frame->setParentTrace(this);
         numNewCalls += frame->calls.count();
         m_calls += frame->calls;
     }
@@ -151,9 +152,10 @@ void ApiTrace::detectFrames()
     foreach(ApiTraceCall *apiCall, m_calls) {
         if (!currentFrame) {
             currentFrame = new ApiTraceFrame();
+            currentFrame->setParentTrace(this);
             currentFrame->number = m_frames.count();
         }
-        apiCall->parentFrame = currentFrame;
+        apiCall->setParentFrame(currentFrame);
         currentFrame->calls.append(apiCall);
         if (ApiTrace::isCallAFrameMarker(apiCall,
                                          m_frameMarker)) {
@@ -175,7 +177,7 @@ ApiTraceCall * ApiTrace::callWithIndex(int idx) const
 {
     for (int i = 0; i < m_calls.count(); ++i) {
         ApiTraceCall *call = m_calls[i];
-        if (call->index == idx)
+        if (call->index() == idx)
             return call;
     }
     return NULL;