diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-04-26 11:50:59 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-04 09:49:32 +0000 |
commit | a9555371327b31a294109b42d954371105ccee9b (patch) | |
tree | f1778f3db29710d74841419e94991741fca56d60 /src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp | |
parent | 08f807a13465b8664cafaa4206076d9d083a6e9a (diff) |
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>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp index 65479c0429b..40158aa357e 100644 --- a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp @@ -54,7 +54,7 @@ void QmlProfilerAnimationsModel::clear() QmlProfilerTimelineModel::clear(); } -bool QmlProfilerAnimationsModel::accepted(const QmlProfilerDataModel::QmlEventTypeData &event) const +bool QmlProfilerAnimationsModel::accepted(const QmlEventType &event) const { return QmlProfilerTimelineModel::accepted(event) && event.detailType == AnimationFrame; } @@ -66,15 +66,15 @@ void QmlProfilerAnimationsModel::loadData() return; // collect events - const QVector<QmlProfilerDataModel::QmlEventData> &referenceList = simpleModel->getEvents(); - const QVector<QmlProfilerDataModel::QmlEventTypeData> &typeList = simpleModel->getEventTypes(); + const QVector<QmlEvent> &referenceList = simpleModel->events(); + const QVector<QmlEventType> &typeList = simpleModel->eventTypes(); AnimationThread lastThread; QmlPaintEventData lastEvent; qint64 minNextStartTimes[] = {0, 0}; - foreach (const QmlProfilerDataModel::QmlEventData &event, referenceList) { - const QmlProfilerDataModel::QmlEventTypeData &type = typeList[event.typeIndex()]; + foreach (const QmlEvent &event, referenceList) { + const QmlEventType &type = typeList[event.typeIndex()]; if (!accepted(type)) continue; |