From 7f0b2b40879ad83825f8d03ca771059c7b3bd152 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 23 Jun 2014 16:32:26 +0200 Subject: Remove redundant displayNames There is no point in showing a displayName that's the same as the description. Change-Id: Ie6ace79e622e31b87ff42d741e04103a920b36e4 Reviewed-by: Kai Koehne --- plugins/qmlprofilerextension/memoryusagemodel.cpp | 2 -- plugins/qmlprofilerextension/pixmapcachemodel.cpp | 3 --- plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 2 -- 3 files changed, 7 deletions(-) diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index 4482715702..6b48d45c1e 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -89,7 +89,6 @@ const QVariantList MemoryUsageModel::getLabels() const if (d->expanded && !isEmpty()) { { QVariantMap element; - element.insert(QLatin1String("displayName"), QVariant(tr("Memory Allocation"))); element.insert(QLatin1String("description"), QVariant(tr("Memory Allocation"))); element.insert(QLatin1String("id"), QVariant(QmlDebug::HeapPage)); @@ -98,7 +97,6 @@ const QVariantList MemoryUsageModel::getLabels() const { QVariantMap element; - element.insert(QLatin1String("displayName"), QVariant(tr("Memory Usage"))); element.insert(QLatin1String("description"), QVariant(tr("Memory Usage"))); element.insert(QLatin1String("id"), QVariant(QmlDebug::SmallItem)); diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index 1160625629..c66055aa0c 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -153,7 +153,6 @@ const QVariantList PixmapCacheModel::getLabels() const { // Cache Size QVariantMap element; - element.insert(QLatin1String("displayName"), QVariant(QLatin1String("Cache Size"))); element.insert(QLatin1String("description"), QVariant(QLatin1String("Cache Size"))); element.insert(QLatin1String("id"), QVariant(0)); @@ -163,8 +162,6 @@ const QVariantList PixmapCacheModel::getLabels() const for (int i=0; i < d->pixmaps.count(); i++) { // Loading QVariantMap element; - element.insert(QLatin1String("displayName"), - QVariant(getFilenameOnly(d->pixmaps[i].url))); element.insert(QLatin1String("description"), QVariant(getFilenameOnly(d->pixmaps[i].url))); diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 59267d2c72..a29ddfe1b3 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -131,14 +131,12 @@ const QVariantList SceneGraphTimelineModel::getLabels() const if (d->expanded && !isEmpty()) { { QVariantMap element; - element.insert(QLatin1String("displayName"), guiThreadLabel); element.insert(QLatin1String("description"), guiThreadLabel); element.insert(QLatin1String("id"), SceneGraphGUIThread); result << element; } if (d->seenPolishAndSync) { QVariantMap element; - element.insert(QLatin1String("displayName"), renderThreadLabel); element.insert(QLatin1String("description"), renderThreadLabel); element.insert(QLatin1String("id"), SceneGraphRenderThread); result << element; -- cgit v1.2.3