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 <christian.kandeler@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index e03726a99ea..37799cd9e72 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -290,16 +290,16 @@ void QmlProfilerModelManager::addQmlEvent(Message message, RangeType rangeType,
         d->traceTime->setTime(startTime, startTime + d->traceTime->duration());
 
     QTC_ASSERT(state() == AcquiringData, /**/);
-    d->model->addQmlEvent(message, rangeType, detailType, startTime, length, data, location,
-                          ndata1, ndata2, ndata3, ndata4, ndata5);
+    d->model->addEvent(message, rangeType, detailType, startTime, length, data, location, ndata1,
+                       ndata2, ndata3, ndata4, ndata5);
 }
 
 void QmlProfilerModelManager::addDebugMessage(QtMsgType type, qint64 timestamp, const QString &text,
                                               const QmlEventLocation &location)
 {
     if (state() == AcquiringData)
-        d->model->addQmlEvent(DebugMessage, MaximumRangeType, type, timestamp, 0, text, location, 0,
-                              0, 0, 0, 0);
+        d->model->addEvent(DebugMessage, MaximumRangeType, type, timestamp, 0, text, location, 0, 0,
+                           0, 0, 0);
 }
 
 void QmlProfilerModelManager::acquiringDone()
@@ -334,8 +334,8 @@ void QmlProfilerModelManager::save(const QString &filename)
     QmlProfilerFileWriter *writer = new QmlProfilerFileWriter(this);
     writer->setTraceTime(traceTime()->startTime(), traceTime()->endTime(),
                         traceTime()->duration());
-    writer->setQmlEvents(d->model->getEventTypes(), d->model->getEvents());
-    writer->setNotes(d->model->getEventNotes());
+    writer->setData(d->model->eventTypes(), d->model->events());
+    writer->setNotes(d->model->notes());
 
     connect(writer, &QObject::destroyed, this, &QmlProfilerModelManager::saveFinished,
             Qt::QueuedConnection);
@@ -372,8 +372,8 @@ void QmlProfilerModelManager::load(const QString &filename)
 
     connect(reader, &QmlProfilerFileReader::success, this, [this, reader]() {
         d->model->setData(reader->traceStart(), qMax(reader->traceStart(), reader->traceEnd()),
-                          reader->qmlEvents(), reader->ranges());
-        d->model->setNoteData(reader->notes());
+                          reader->eventTypes(), reader->events());
+        d->model->setNotes(reader->notes());
         setRecordedFeatures(reader->loadedFeatures());
         d->traceTime->increaseEndTime(d->model->lastTimeMark());
         delete reader;