From 86b3da7cd2f0bec3656ea67ccf4550c96be41cf9 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 14 Feb 2014 17:02:56 +0100 Subject: Use time formatting method of base class instead of reimplementing it Change-Id: I81da4ec2a7830f3a3ddfb85ceeffdaeca20c3c6d Reviewed-by: Kai Koehne --- plugins/qmlprofilerextension/pixmapcachemodel.cpp | 13 +------------ plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 15 +-------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index 64efac4328..a52d9e2fc2 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -46,7 +46,6 @@ public: bool isExpanded; int expandedRowCount; int collapsedRowCount; - QString displayTime(double time); void addVP(QVariantList &l, QString label, qint64 time); qint64 minCacheSize; @@ -231,21 +230,11 @@ const QVariantList PixmapCacheModel::getLabelsForCategory(int category) const return result; } -QString PixmapCacheModel::PixmapCacheModelPrivate::displayTime(double time) -{ - if (time < 1e6) - return QString::number(time/1e3,'f',3) + trUtf8(" \xc2\xb5s"); - if (time < 1e9) - return QString::number(time/1e6,'f',3) + tr(" ms"); - - return QString::number(time/1e9,'f',3) + tr(" s"); -} - void PixmapCacheModel::PixmapCacheModelPrivate::addVP(QVariantList &l, QString label, qint64 time) { if (time > 0) { QVariantMap res; - res.insert(label, QVariant(displayTime(time))); + res.insert(label, QVariant(QmlProfilerSimpleModel::formatTime(time))); l << res; } } diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 13519cbfcd..381d6fb94f 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -59,7 +59,6 @@ public: SceneGraphTimelineModel *q; bool isExpanded; - QString displayTime(double time); void addVP(QVariantList &l, QString label, qint64 time); }; @@ -223,23 +222,11 @@ const QVariantList SceneGraphTimelineModel::getLabelsForCategory(int category) c return result; } - - -QString SceneGraphTimelineModel::SceneGraphTimelineModelPrivate::displayTime(double time) -{ - if (time < 1e6) - return QString::number(time/1e3,'f',3) + trUtf8(" \xc2\xb5s"); - if (time < 1e9) - return QString::number(time/1e6,'f',3) + tr(" ms"); - - return QString::number(time/1e9,'f',3) + tr(" s"); -} - void SceneGraphTimelineModel::SceneGraphTimelineModelPrivate::addVP(QVariantList &l, QString label, qint64 time) { if (time > 0) { QVariantMap res; - res.insert(label, QVariant(displayTime(time))); + res.insert(label, QVariant(QmlProfilerSimpleModel::formatTime(time))); l << res; } } -- cgit v1.2.1