diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp index 1d6f70b0ca3..28704631133 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp @@ -47,7 +47,7 @@ void AbstractTimelineModel::setModelManager(QmlProfilerModelManager *modelManage QStringList AbstractTimelineModel::categoryTitles() const { QStringList retString; - for (int i = 0; i < categories(); i++) + for (int i = 0; i < categoryCount(); i++) retString << categoryLabel(i); return retString; } diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.h b/src/plugins/qmlprofiler/abstracttimelinemodel.h index 43f73e38904..db8619475b6 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.h +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.h @@ -50,7 +50,6 @@ public: void setModelManager(QmlProfilerModelManager *modelManager); - virtual int categories() const = 0; QStringList categoryTitles() const; virtual QString name() const = 0; virtual int count() const = 0; diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml index ff7591ea0bc..bdada21a541 100644 --- a/src/plugins/qmlprofiler/qml/MainView.qml +++ b/src/plugins/qmlprofiler/qml/MainView.qml @@ -387,7 +387,7 @@ Rectangle { color: "#dcdcdc" height: col.height - property int rowCount: qmlProfilerModelProxy.categories(); + property int rowCount: qmlProfilerModelProxy.categoryCount(); Column { id: col diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp index 03a9bddf5ec..4f50f5b73f0 100644 --- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp @@ -77,11 +77,6 @@ PaintEventsModelProxy::~PaintEventsModelProxy() delete d; } -int PaintEventsModelProxy::categories() const -{ - return categoryCount(); -} - QString PaintEventsModelProxy::name() const { return QLatin1String("PaintEventsModelProxy"); diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h index 165c6801700..9a648ac4e67 100644 --- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h +++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h @@ -63,8 +63,6 @@ public: PaintEventsModelProxy(QObject *parent = 0); ~PaintEventsModelProxy(); - - int categories() const; QString name() const; void loadData(); diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp index 9700fdf8329..fdea4d63c21 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp @@ -84,11 +84,6 @@ BasicTimelineModel::~BasicTimelineModel() delete d; } -int BasicTimelineModel::categories() const -{ - return categoryCount(); -} - QString BasicTimelineModel::name() const { return QLatin1String("BasicTimelineModel"); diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h index ceaf54c9c74..df643615467 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h @@ -82,8 +82,6 @@ public: BasicTimelineModel(QObject *parent = 0); ~BasicTimelineModel(); - - int categories() const; QString name() const; void loadData(); diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp index 03fd7b5bba8..571b46e62c3 100644 --- a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp +++ b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp @@ -95,11 +95,11 @@ void TimelineModelAggregator::addModel(AbstractTimelineModel *m) } // order? -int TimelineModelAggregator::categories() const +int TimelineModelAggregator::categoryCount() const { int categoryCount = 0; foreach (const AbstractTimelineModel *modelProxy, d->modelList) - categoryCount += modelProxy->categories(); + categoryCount += modelProxy->categoryCount(); return categoryCount; } @@ -107,7 +107,7 @@ int TimelineModelAggregator::visibleCategories() const { int categoryCount = 0; foreach (const AbstractTimelineModel *modelProxy, d->modelList) { - for (int i = 0; i < modelProxy->categories(); i++) + for (int i = 0; i < modelProxy->categoryCount(); i++) if (modelProxy->categoryDepth(i) > 0) categoryCount ++; } diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.h b/src/plugins/qmlprofiler/timelinemodelaggregator.h index 472d047bc3f..06ba24401f7 100644 --- a/src/plugins/qmlprofiler/timelinemodelaggregator.h +++ b/src/plugins/qmlprofiler/timelinemodelaggregator.h @@ -47,7 +47,7 @@ public: void addModel(AbstractTimelineModel *m); - Q_INVOKABLE int categories() const; + Q_INVOKABLE int categoryCount() const; Q_INVOKABLE int visibleCategories() const; Q_INVOKABLE QStringList categoryTitles() const; Q_INVOKABLE int count(int modelIndex = -1) const;