diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.h b/src/plugins/qmlprofiler/abstracttimelinemodel.h index 24be2fc614a..415eb544291 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.h +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.h @@ -73,7 +73,6 @@ public: virtual QVariantList labels() const = 0; virtual QVariantMap details(int index) const = 0; virtual int row(int index) const = 0; - virtual void loadData() = 0; virtual quint64 features() const = 0; // Methods which can optionally be implemented by child models. @@ -85,7 +84,6 @@ public: virtual float relativeHeight(int index) const; virtual int rowMinValue(int rowNumber) const; virtual int rowMaxValue(int rowNumber) const; - virtual void clear(); signals: void expandedChanged(); @@ -122,6 +120,9 @@ protected: QObject *parent); AbstractTimelineModelPrivate *d_ptr; + virtual void loadData() = 0; + virtual void clear(); + protected slots: void dataChanged(); diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h index 2493efd81b2..63613d319ff 100644 --- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h +++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h @@ -61,9 +61,6 @@ public: PaintEventsModelProxy(QObject *parent = 0); - void loadData(); - void clear(); - int rowMaxValue(int rowNumber) const; int eventId(int index) const; @@ -76,9 +73,12 @@ public: QVariantMap details(int index) const; quint64 features() const; -private slots: bool accepted(const QmlProfilerDataModel::QmlEventTypeData &event) const; +protected: + void loadData(); + void clear(); + private: class PaintEventsModelProxyPrivate; Q_DECLARE_PRIVATE(PaintEventsModelProxy) diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h index 22ad43c9451..53fd5feac07 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h @@ -65,9 +65,6 @@ public: RangeTimelineModel(QmlDebug::RangeType rangeType, QObject *parent = 0); - void loadData(); - void clear(); - static QString categoryLabel(QmlDebug::RangeType categoryIndex); quint64 features() const; @@ -83,6 +80,10 @@ public: int eventIdForTypeIndex(int typeIndex) const; int eventIdForLocation(const QString &filename, int line, int column) const; +protected: + void loadData(); + void clear(); + private: class RangeTimelineModelPrivate; Q_DECLARE_PRIVATE(RangeTimelineModel) diff --git a/tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp b/tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp index 0839a9a67ce..33709e9549e 100644 --- a/tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp +++ b/tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp @@ -53,6 +53,7 @@ public: QVariantMap details(int) const { return QVariantMap(); } int row(int) const { return 1; } void loadData(); + void clear() { AbstractTimelineModel::clear(); } // Make some protected methods public