aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-07-11 10:09:08 +0200
committerUlf Hermann <ulf.hermann@digia.com>2014-07-11 15:05:46 +0300
commit2d93a34d18c3006358e55589fd4e2c79928a6148 (patch)
tree0c6ddb1c70dcc0c2d36ac288baa1ae5cf0272969
parent4d820f05f65f23c9e4313c84fa9cfac17db349bb (diff)
Use fewer QVariantMaps to create memory event details
Change-Id: Ief0b14ae2be15bf5e9db31d8f6625882a17f685a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--plugins/qmlprofilerextension/memoryusagemodel.cpp47
1 files changed, 16 insertions, 31 deletions
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index 1f7880f86a..6c3282aa9f 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")));
-
- 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;
+ if (ev->delta > 0)
+ res.insert(title, tr("Memory Allocated"));
+ else
+ res.insert(title, tr("Memory Freed"));
+ result << res;
+ res.clear();
+ res.insert(tr("Total"), QVariant(QString::fromLatin1("%1 bytes").arg(ev->size)));
+ result << res;
+ res.clear();
- {
- QVariantMap res;
- res.insert(tr("Type"), QVariant(MemoryUsageModelPrivate::memoryTypeName(ev->type)));
- result << res;
- }
-
+ 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;
}