QmlProfiler: Fix the naming scheme for events and event types

Move them out of the QmlProfilerDataModel class, drop the "Data"
suffix, and rename symbols that refer to them in order to call them by
their names.

Change-Id: I41151359921b325edb79111371083c4185bd148b
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp
index 1607d4a8583..cf0723b3296 100644
--- a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp
+++ b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp
@@ -138,9 +138,9 @@ void SceneGraphTimelineModel::loadData()
         return;
 
     // combine the data of several eventtypes into two rows
-    const QVector<QmlProfilerDataModel::QmlEventTypeData> &types = simpleModel->getEventTypes();
-    foreach (const QmlProfilerDataModel::QmlEventData &event, simpleModel->getEvents()) {
-        const QmlProfilerDataModel::QmlEventTypeData &type = types[event.typeIndex()];
+    const QVector<QmlEventType> &types = simpleModel->eventTypes();
+    foreach (const QmlEvent &event, simpleModel->events()) {
+        const QmlEventType &type = types[event.typeIndex()];
         if (!accepted(type))
             continue;
 
@@ -220,7 +220,7 @@ void SceneGraphTimelineModel::loadData()
         default: break;
         }
 
-        updateProgress(count(), simpleModel->getEvents().count());
+        updateProgress(count(), simpleModel->events().count());
     }
 
     computeNesting();