diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp index 6d8adfdfd7be6f50eacf81abaa9c636a51e9b180..9fbbd66793393c443929e637e1521cfb4d3af956 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp @@ -33,7 +33,7 @@ namespace QmlProfiler { AbstractTimelineModel::AbstractTimelineModel(AbstractTimelineModelPrivate *dd, - const QString &label, QmlDebug::Message message, QmlDebug::RangeType rangeType, + const QString &displayName, QmlDebug::Message message, QmlDebug::RangeType rangeType, QObject *parent) : QObject(parent), d_ptr(dd) { @@ -42,7 +42,7 @@ AbstractTimelineModel::AbstractTimelineModel(AbstractTimelineModelPrivate *dd, d->modelId = 0; d->modelManager = 0; d->expanded = false; - d->title = label; + d->displayName = displayName; d->message = message; d->rangeType = rangeType; } @@ -266,10 +266,10 @@ void AbstractTimelineModel::setExpanded(bool expanded) } } -const QString AbstractTimelineModel::title() const +QString AbstractTimelineModel::displayName() const { Q_D(const AbstractTimelineModel); - return d->title; + return d->displayName; } } diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.h b/src/plugins/qmlprofiler/abstracttimelinemodel.h index b6e67196bb9424cb25468bd0db1a766c82005180..afe99b0c9d2f7307a853d786195c6ae08c6c0019 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.h +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.h @@ -71,7 +71,7 @@ public: bool eventAccepted(const QmlProfilerDataModel::QmlEventTypeData &event) const; bool expanded() const; void setExpanded(bool expanded); - const QString title() const; + QString displayName() const; // Methods that have to be implemented by child models virtual int rowCount() const = 0; @@ -123,7 +123,7 @@ protected: return QColor::fromHsl(hue % 360, Saturation, Lightness); } - explicit AbstractTimelineModel(AbstractTimelineModelPrivate *dd, const QString &label, + explicit AbstractTimelineModel(AbstractTimelineModelPrivate *dd, const QString &displayName, QmlDebug::Message message, QmlDebug::RangeType rangeType, QObject *parent); AbstractTimelineModelPrivate *d_ptr; diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel_p.h b/src/plugins/qmlprofiler/abstracttimelinemodel_p.h index 34910ba561a49eee634823d02747837b8bb4271e..f8ad982794a3b108d5856bdf2010d77df1453021 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel_p.h +++ b/src/plugins/qmlprofiler/abstracttimelinemodel_p.h @@ -51,7 +51,7 @@ public: QmlProfilerModelManager *modelManager; int modelId; bool expanded; - QString title; + QString displayName; QmlDebug::Message message; QmlDebug::RangeType rangeType; diff --git a/src/plugins/qmlprofiler/qml/CategoryLabel.qml b/src/plugins/qmlprofiler/qml/CategoryLabel.qml index c51c24c0f2b3f3d6ba0055aaad67eeeece3b4f24..bad1e3e4af993c9b6ad65c20d17b94aa28e80c59 100644 --- a/src/plugins/qmlprofiler/qml/CategoryLabel.qml +++ b/src/plugins/qmlprofiler/qml/CategoryLabel.qml @@ -33,7 +33,7 @@ import QtQuick.Controls.Styles 1.2 Item { id: labelContainer - property string text: qmlProfilerModelProxy.title(modelIndex) + property string text: qmlProfilerModelProxy.displayName(modelIndex) property bool expanded: trigger(qmlProfilerModelProxy.expanded(modelIndex)) property int modelIndex: index property int bindingTrigger: 1 diff --git a/src/plugins/qmlprofiler/qml/RangeDetails.qml b/src/plugins/qmlprofiler/qml/RangeDetails.qml index b5bbf4af8b1b16c8ffc1f1652c8b27525795e1cf..1c0036401eaa0694321b764646da022d4af52931 100644 --- a/src/plugins/qmlprofiler/qml/RangeDetails.qml +++ b/src/plugins/qmlprofiler/qml/RangeDetails.qml @@ -65,7 +65,7 @@ Item { function showInfo(eventData) { eventInfo.clear(); - rangeDetails.dialogTitle = eventData[0]["title"]; + rangeDetails.dialogTitle = eventData[0].displayName; for (var i = 1; i < eventData.length; i++) { for (var k in eventData[i]) { if (eventData[i][k].length > 0) { diff --git a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp index 54f5a8ff69ef0c86db685b3ae58f42fb16792429..50a848b93f623e7deed213162cc88d7fe2ed14b7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp @@ -244,7 +244,7 @@ const QVariantList PaintEventsModelProxy::getEventDetails(int index) const static const char trContext[] = "RangeDetails"; { QVariantMap valuePair; - valuePair.insert(QLatin1String("title"), QVariant(title())); + valuePair.insert(QLatin1String("displayName"), QVariant(displayName())); result << valuePair; } diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp index 0bbad005867f708f1c1e6b8205743eb4929c53b5..a98b2f66b0c793b91ef041ac0241305438067739 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp @@ -298,7 +298,7 @@ const QVariantList RangeTimelineModel::getEventDetails(int index) const static const char trContext[] = "RangeDetails"; { QVariantMap valuePair; - valuePair.insert(QLatin1String("title"), QVariant(categoryLabel(d->rangeType))); + valuePair.insert(QLatin1String("displayName"), QVariant(categoryLabel(d->rangeType))); result << valuePair; } diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp index 6bbe1fe68a124c7e69375ae96a829bbb3b4be398..79370a40b15affa2e95b457199e75fdea9278458 100644 --- a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp +++ b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp @@ -94,14 +94,6 @@ void TimelineModelAggregator::addModel(AbstractTimelineModel *m) connect(m,SIGNAL(rowHeightChanged()),this,SIGNAL(rowHeightChanged())); } -QStringList TimelineModelAggregator::categoryTitles() const -{ - QStringList retString; - foreach (const AbstractTimelineModel *modelProxy, d->modelList) - retString << modelProxy->title(); - return retString; -} - int TimelineModelAggregator::count(int modelIndex) const { if (modelIndex == -1) { @@ -158,9 +150,9 @@ int TimelineModelAggregator::rowCount(int modelIndex) const return d->modelList[modelIndex]->rowCount(); } -const QString TimelineModelAggregator::title(int modelIndex) const +QString TimelineModelAggregator::displayName(int modelIndex) const { - return d->modelList[modelIndex]->title(); + return d->modelList[modelIndex]->displayName(); } int TimelineModelAggregator::rowMinValue(int modelIndex, int row) const diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.h b/src/plugins/qmlprofiler/timelinemodelaggregator.h index cc47391ce38b65ac623c15dd4214f06ebad19285..0f996594a2d97a7b70234f8b7456576ee1db723c 100644 --- a/src/plugins/qmlprofiler/timelinemodelaggregator.h +++ b/src/plugins/qmlprofiler/timelinemodelaggregator.h @@ -46,7 +46,6 @@ public: void setModelManager(QmlProfilerModelManager *modelManager); void addModel(AbstractTimelineModel *m); - Q_INVOKABLE QStringList categoryTitles() const; Q_INVOKABLE int count(int modelIndex = -1) const; void clear(); Q_INVOKABLE int modelCount() const; @@ -64,7 +63,7 @@ public: Q_INVOKABLE bool expanded(int modelIndex) const; Q_INVOKABLE void setExpanded(int modelIndex, bool expanded); Q_INVOKABLE int rowCount(int modelIndex) const; - Q_INVOKABLE const QString title(int modelIndex) const; + Q_INVOKABLE QString displayName(int modelIndex) const; Q_INVOKABLE int rowMinValue(int modelIndex, int row) const; Q_INVOKABLE int rowMaxValue(int modelIndex, int row) const;