summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-09-02 12:30:40 +0200
committerUlf Hermann <ulf.hermann@digia.com>2014-09-11 12:47:48 +0300
commit2360ecb657e4563179ed898e4201a3fd426a200f (patch)
treeab9c526f8e2542a08ea0562c4f0d725ffb8c8289
parentf430b108689845f3a572c3a64fd714ea978d1d78 (diff)
downloadqt-creator-2360ecb657e4563179ed898e4201a3fd426a200f.tar.gz
Rename relative height of items in timeline to "relativeHeight"
Change-Id: I3fb0d91dafbb42b0422263b6710b1a0fcb4c193c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--plugins/qmlprofilerextension/memoryusagemodel.cpp2
-rw-r--r--plugins/qmlprofilerextension/memoryusagemodel.h2
-rw-r--r--plugins/qmlprofilerextension/pixmapcachemodel.cpp2
-rw-r--r--plugins/qmlprofilerextension/pixmapcachemodel.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index 6bf769bc65..4f51c3b073 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -78,7 +78,7 @@ QColor MemoryUsageModel::color(int index) const
return colorByEventId(index);
}
-float MemoryUsageModel::height(int index) const
+float MemoryUsageModel::relativeHeight(int index) const
{
Q_D(const MemoryUsageModel);
return qMin(1.0f, (float)d->data[index].size / (float)d->maxSize);
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.h b/plugins/qmlprofilerextension/memoryusagemodel.h
index caff902f61..6118634615 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.h
+++ b/plugins/qmlprofilerextension/memoryusagemodel.h
@@ -56,7 +56,7 @@ public:
int row(int index) const;
int eventId(int index) const;
QColor color(int index) const;
- float height(int index) const;
+ float relativeHeight(int index) const;
QVariantMap location(int index) const;
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index 04d802d3ac..5be3b6cc27 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -132,7 +132,7 @@ QColor PixmapCacheModel::color(int index) const
return colorByEventId(index);
}
-float PixmapCacheModel::height(int index) const
+float PixmapCacheModel::relativeHeight(int index) const
{
Q_D(const PixmapCacheModel);
if (d->data[index].pixmapEventType == PixmapCacheCountChanged)
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.h b/plugins/qmlprofilerextension/pixmapcachemodel.h
index 87c49f1804..666dd4f2f6 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.h
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.h
@@ -61,7 +61,7 @@ public:
int row(int index) const;
int eventId(int index) const;
QColor color(int index) const;
- float height(int index) const;
+ float relativeHeight(int index) const;
QVariantList labels() const;