Fix minor errors in the apitracemodel

[apitrace] / gui / apitracemodel.cpp

diff --git a/gui/apitracemodel.cpp b/gui/apitracemodel.cpp
index 951d6ac085c006dc9eff305e9f8b34e00020c66c..debf5c5712698470c27a6ea024b96b4dd2b211ee 100644 (file)
--- a/gui/apitracemodel.cpp
+++ b/gui/apitracemodel.cpp
@@ -98,7 +98,7 @@ QVariant ApiTraceModel::headerData(int section, Qt::Orientation orientation,
 QModelIndex ApiTraceModel::index(int row, int column,
                                  const QModelIndex &parent) const
 {
-    if (parent.isValid() && parent.column() != 0)
+    if ((parent.isValid() && parent.column() != 0) || column != 0)
         return QModelIndex();
 
     ApiTraceEvent *event = item(parent);
@@ -204,8 +204,10 @@ void ApiTraceModel::setApiTrace(ApiTrace *trace)
             this, SLOT(invalidateFrames()));
     connect(m_trace, SIGNAL(framesInvalidated()),
             this, SLOT(invalidateFrames()));
-    connect(m_trace, SIGNAL(framesAdded(int, int)),
-            this, SLOT(appendFrames(int, int)));
+    connect(m_trace, SIGNAL(beginAddingFrames(int, int)),
+            this, SLOT(beginAddingFrames(int, int)));
+    connect(m_trace, SIGNAL(endAddingFrames()),
+            this, SLOT(endAddingFrames()));
     connect(m_trace, SIGNAL(changed(ApiTraceCall*)),
             this, SLOT(callChanged(ApiTraceCall*)));
 }
@@ -221,11 +223,10 @@ void ApiTraceModel::invalidateFrames()
     endResetModel();
 }
 
-void ApiTraceModel::appendFrames(int oldCount, int numAdded)
+void ApiTraceModel::beginAddingFrames(int oldCount, int numAdded)
 {
     beginInsertRows(QModelIndex(), oldCount,
                     oldCount + numAdded - 1);
-    endInsertRows();
 }
 
 ApiTraceEvent * ApiTraceModel::item(const QModelIndex &index) const
@@ -299,4 +300,9 @@ void ApiTraceModel::callChanged(ApiTraceCall *call)
     emit dataChanged(index, index);
 }
 
+void ApiTraceModel::endAddingFrames()
+{
+    endInsertRows();
+}
+
 #include "apitracemodel.moc"