From 00e6285ece97580f2522780fc532559c83e7d7be Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Tue, 8 Jul 2014 13:40:35 +0200
Subject: [PATCH] QmlProfiler: Rename occurrences of "title" to "displayName"
Also, remove categoryTitles() which isn't used anywhere.
Change-Id: I919abf1221fb71d407eb04190d27180ed39b7b45
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/plugins/qmlprofiler/abstracttimelinemodel.cpp | 8 ++++----
src/plugins/qmlprofiler/abstracttimelinemodel.h | 4 ++--
src/plugins/qmlprofiler/abstracttimelinemodel_p.h | 2 +-
src/plugins/qmlprofiler/qml/CategoryLabel.qml | 2 +-
src/plugins/qmlprofiler/qml/RangeDetails.qml | 2 +-
.../qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp | 2 +-
.../qmlprofiler/qmlprofilertimelinemodelproxy.cpp | 2 +-
src/plugins/qmlprofiler/timelinemodelaggregator.cpp | 12 ++----------
src/plugins/qmlprofiler/timelinemodelaggregator.h | 3 +--
9 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
index 6d8adfdfd7b..9fbbd667933 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 b6e67196bb9..afe99b0c9d2 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 34910ba561a..f8ad982794a 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 c51c24c0f2b..bad1e3e4af9 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 b5bbf4af8b1..1c0036401ea 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 54f5a8ff69e..50a848b93f6 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 0bbad005867..a98b2f66b0c 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 6bbe1fe68a1..79370a40b15 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 cc47391ce38..0f996594a2d 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;
--
GitLab