aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-08-29 17:12:11 +0200
committerUlf Hermann <ulf.hermann@digia.com>2014-09-29 14:07:05 +0300
commit009b1bd437e7bd6ed454d9a00046a0afe1127316 (patch)
tree71fe96f78cbe51322f9553942a4afde75588a00d
parentb429a98f151ad45fc779e2bba971f2d3a5545058 (diff)
Rename eventId to typeId and selectionId
Change-Id: Id28186a5e24c9b0f6f89142ba4c35d1a5a462852 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--plugins/qmlprofilerextension/inputeventsmodel.h2
-rw-r--r--plugins/qmlprofilerextension/memoryusagemodel.cpp4
-rw-r--r--plugins/qmlprofilerextension/memoryusagemodel.h2
-rw-r--r--plugins/qmlprofilerextension/pixmapcachemodel.cpp6
-rw-r--r--plugins/qmlprofilerextension/pixmapcachemodel.h2
-rw-r--r--plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp4
-rw-r--r--plugins/qmlprofilerextension/scenegraphtimelinemodel.h2
7 files changed, 11 insertions, 11 deletions
diff --git a/plugins/qmlprofilerextension/inputeventsmodel.h b/plugins/qmlprofilerextension/inputeventsmodel.h
index 2cd77ada63..3b6314d988 100644
--- a/plugins/qmlprofilerextension/inputeventsmodel.h
+++ b/plugins/qmlprofilerextension/inputeventsmodel.h
@@ -35,7 +35,7 @@ public:
quint64 features() const;
int rowCount() const {return 0;}
- int eventId(int) const {return -1;}
+ int selectionId(int) const {return -1;}
QColor color(int) const {return QColor();}
QVariantList labels() const {return QVariantList();}
QVariantMap details(int) const {return QVariantMap();}
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index f3f9cfcc3c..3421eb567e 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -69,7 +69,7 @@ int MemoryUsageModel::row(int index) const
return 2;
}
-int MemoryUsageModel::eventId(int index) const
+int MemoryUsageModel::selectionId(int index) const
{
Q_D(const MemoryUsageModel);
return d->data[index].type;
@@ -77,7 +77,7 @@ int MemoryUsageModel::eventId(int index) const
QColor MemoryUsageModel::color(int index) const
{
- return colorByEventId(index);
+ return colorBySelectionId(index);
}
float MemoryUsageModel::relativeHeight(int index) const
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.h b/plugins/qmlprofilerextension/memoryusagemodel.h
index 2ef49ba930..a96f07a850 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.h
+++ b/plugins/qmlprofilerextension/memoryusagemodel.h
@@ -54,7 +54,7 @@ public:
int rowMaxValue(int rowNumber) const;
int row(int index) const;
- int eventId(int index) const;
+ int selectionId(int index) const;
QColor color(int index) const;
float relativeHeight(int index) const;
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index a2f3b4fb47..9a016e8a32 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -106,11 +106,11 @@ int PixmapCacheModel::row(int index) const
{
Q_D(const PixmapCacheModel);
if (d->expanded)
- return eventId(index) + 1;
+ return selectionId(index) + 1;
return d->data[index].rowNumberCollapsed;
}
-int PixmapCacheModel::eventId(int index) const
+int PixmapCacheModel::selectionId(int index) const
{
Q_D(const PixmapCacheModel);
return d->data[index].pixmapEventType == PixmapCacheCountChanged ?
@@ -123,7 +123,7 @@ QColor PixmapCacheModel::color(int index) const
if (d->data[index].pixmapEventType == PixmapCacheCountChanged)
return colorByHue(PixmapCacheCountHue);
- return colorByEventId(index);
+ return colorBySelectionId(index);
}
float PixmapCacheModel::relativeHeight(int index) const
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.h b/plugins/qmlprofilerextension/pixmapcachemodel.h
index 0eaf18b323..d2e68ff913 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.h
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.h
@@ -59,7 +59,7 @@ public:
int rowMaxValue(int rowNumber) const;
int row(int index) const;
- int eventId(int index) const;
+ int selectionId(int index) const;
QColor color(int index) const;
float relativeHeight(int index) const;
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
index d9321c750c..7d77c9cd65 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
@@ -126,7 +126,7 @@ int SceneGraphTimelineModel::row(int index) const
return expanded() ? (d->data[index].stage + 1) : d->data[index].rowNumberCollapsed;
}
-int SceneGraphTimelineModel::eventId(int index) const
+int SceneGraphTimelineModel::selectionId(int index) const
{
Q_D(const SceneGraphTimelineModel);
return d->data[index].stage;
@@ -134,7 +134,7 @@ int SceneGraphTimelineModel::eventId(int index) const
QColor SceneGraphTimelineModel::color(int index) const
{
- return colorByEventId(index);
+ return colorBySelectionId(index);
}
QVariantList SceneGraphTimelineModel::labels() const
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
index 2283d957a1..258b3a80e0 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
@@ -45,7 +45,7 @@ public:
quint64 features() const;
int row(int index) const;
- int eventId(int index) const;
+ int selectionId(int index) const;
QColor color(int index) const;
QVariantList labels() const;