From 2c4214825c15550af3bdfe0f50f269cbfd0294a4 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 11 Aug 2014 15:33:03 +0200 Subject: [PATCH] Rename occurrences of "title" to "displayName" Change-Id: Ic26122d319dd56a4666a02bf6979c292581473ea Reviewed-by: Kai Koehne --- plugins/qmlprofilerextension/memoryusagemodel.cpp | 5 ++--- plugins/qmlprofilerextension/pixmapcachemodel.cpp | 4 ++-- plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index acf60b98199..60fc29744cd 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -137,16 +137,15 @@ const QVariantList MemoryUsageModel::getLabels() const const QVariantList MemoryUsageModel::getEventDetails(int index) const { Q_D(const MemoryUsageModel); - static QString title = QStringLiteral("title"); QVariantList result; const MemoryUsageModelPrivate::Range *ev = &d->range(index); QVariantMap res; if (ev->allocated >= -ev->deallocated) - res.insert(title, tr("Memory Allocated")); + res.insert(QLatin1String("displayName"), tr("Memory Allocated")); else - res.insert(title, tr("Memory Freed")); + res.insert(QLatin1String("displayName"), tr("Memory Freed")); result << res; res.clear(); diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index 0d6c6981930..b4714afd49e 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -199,9 +199,9 @@ const QVariantList PixmapCacheModel::getEventDetails(int index) const { QVariantMap res; if (ev->pixmapEventType == PixmapCacheCountChanged) - res.insert(QLatin1String("title"), QVariant(QLatin1String("Image Cached"))); + res.insert(QLatin1String("displayName"), QVariant(QLatin1String("Image Cached"))); else if (ev->pixmapEventType == PixmapLoadingStarted) - res.insert(QLatin1String("title"), QVariant(QLatin1String("Image Loaded"))); + res.insert(QLatin1String("displayName"), QVariant(QLatin1String("Image Loaded"))); result << res; } diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 204e852d2f8..10a3276e8ed 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -165,7 +165,7 @@ const QVariantList SceneGraphTimelineModel::getEventDetails(int index) const { QVariantMap res; - res.insert(QLatin1String("title"), QVariant(labelForSGType( + res.insert(QLatin1String("displayName"), QVariant(labelForSGType( d->seenPolishAndSync ? ev->sgEventType : SceneGraphGUIThread))); result << res; }