From 55c26025f01d5da83f56ce2f60f090770aff384f Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 13 Jul 2016 10:09:51 +0200 Subject: [PATCH] QmlProfiler: Move bindingLoopsDest() into QmlProfilerRangeModel It's the only class that overrode it. Change-Id: I15aa8177571e2eda6016e3aa16302fcbe94c3f11 Reviewed-by: Christian Kandeler --- src/plugins/qmlprofiler/qmlprofilerrangemodel.h | 2 +- src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp | 6 ------ src/plugins/qmlprofiler/qmlprofilertimelinemodel.h | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerrangemodel.h b/src/plugins/qmlprofiler/qmlprofilerrangemodel.h index 3eb281ef8d5..1b97833335a 100644 --- a/src/plugins/qmlprofiler/qmlprofilerrangemodel.h +++ b/src/plugins/qmlprofiler/qmlprofilerrangemodel.h @@ -61,7 +61,7 @@ public: Q_INVOKABLE int expandedRow(int index) const override; Q_INVOKABLE int collapsedRow(int index) const override; - int bindingLoopDest(int index) const override; + int bindingLoopDest(int index) const; QColor color(int index) const override; QVariantList labels() const override; diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp index 181ca3b90db..605ced1fb77 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp @@ -112,12 +112,6 @@ void QmlProfilerTimelineModel::onVisibleFeaturesChanged(quint64 features) setHidden(!(features & (1ULL << m_mainFeature))); } -int QmlProfilerTimelineModel::bindingLoopDest(int index) const -{ - Q_UNUSED(index); - return -1; -} - QVariantMap QmlProfilerTimelineModel::locationFromTypeId(int index) const { QVariantMap result; diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h index 7fd590dbd3c..996a0a5b52d 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h @@ -50,7 +50,7 @@ public: virtual bool accepted(const QmlEventType &type) const; bool handlesTypeId(int typeId) const; - Q_INVOKABLE virtual int bindingLoopDest(int index) const; + QVariantMap locationFromTypeId(int index) const; virtual void loadEvent(const QmlEvent &event, const QmlEventType &type) = 0;