From 2d93a34d18c3006358e55589fd4e2c79928a6148 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 11 Jul 2014 10:09:08 +0200 Subject: [PATCH] Use fewer QVariantMaps to create memory event details Change-Id: Ief0b14ae2be15bf5e9db31d8f6625882a17f685a Reviewed-by: Kai Koehne --- .../qmlprofilerextension/memoryusagemodel.cpp | 47 +++++++------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index 1f7880f86ab..6c3282aa9f7 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -139,45 +139,30 @@ 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->delta > 0) - res.insert(QLatin1String("title"), QVariant(QLatin1String("Memory Allocated"))); - else - res.insert(QLatin1String("title"), QVariant(QLatin1String("Memory Freed"))); + QVariantMap res; + if (ev->delta > 0) + res.insert(title, tr("Memory Allocated")); + else + res.insert(title, tr("Memory Freed")); + result << res; + res.clear(); - result << res; - } - - { - QVariantMap res; - res.insert(tr("Total"), QVariant(QString::fromLatin1("%1 bytes").arg(ev->size))); - result << res; - } - - { - QVariantMap res; - res.insert(tr("Allocation"), QVariant(QString::fromLatin1("%1 bytes").arg(ev->delta))); - result << res; - } - - - { - QVariantMap res; - res.insert(tr("Type"), QVariant(MemoryUsageModelPrivate::memoryTypeName(ev->type))); - result << res; - } + res.insert(tr("Total"), QVariant(QString::fromLatin1("%1 bytes").arg(ev->size))); + result << res; + res.clear(); + res.insert(tr("Allocation"), QVariant(QString::fromLatin1("%1 bytes").arg(ev->delta))); + res.insert(tr("Type"), QVariant(MemoryUsageModelPrivate::memoryTypeName(ev->type))); if (ev->originTypeIndex != -1) { - QVariantMap valuePair; - valuePair.insert(tr("Location"), + res.insert(tr("Location"), d->modelManager->qmlModel()->getEventTypes().at(ev->originTypeIndex).displayName); - result << valuePair; } - + result << res; return result; }