From ceb8f6a9ed305a16fb34033354b1b7bf0dc25162 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Tue, 30 Jun 2015 16:39:58 +0200
Subject: [PATCH] Adapt to adding of main feature to QmlProfilerTimelineModel

Change-Id: I54e2037106c8f0f5a0115cb415633acc8f0a879b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 plugins/qmlprofilerextension/inputeventsmodel.cpp        | 8 +++-----
 plugins/qmlprofilerextension/memoryusagemodel.cpp        | 7 +++----
 plugins/qmlprofilerextension/pixmapcachemodel.cpp        | 6 ++----
 plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 6 ++----
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/plugins/qmlprofilerextension/inputeventsmodel.cpp b/plugins/qmlprofilerextension/inputeventsmodel.cpp
index 41403d90164..3609f4bd46e 100644
--- a/plugins/qmlprofilerextension/inputeventsmodel.cpp
+++ b/plugins/qmlprofilerextension/inputeventsmodel.cpp
@@ -26,12 +26,10 @@ namespace Internal {
 using namespace QmlProfiler;
 
 InputEventsModel::InputEventsModel(QmlProfilerModelManager *manager, QObject *parent) :
-    QmlProfilerTimelineModel(manager,
-                             tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileInputEvents)),
-                             QmlDebug::Event, QmlDebug::MaximumRangeType, parent),
-      m_keyTypeId(-1), m_mouseTypeId(-1)
+    QmlProfilerTimelineModel(manager, QmlDebug::Event, QmlDebug::MaximumRangeType,
+                             QmlDebug::ProfileInputEvents, parent),
+    m_keyTypeId(-1), m_mouseTypeId(-1)
 {
-    announceFeatures(1 << QmlDebug::ProfileInputEvents);
 }
 
 int InputEventsModel::typeId(int index) const
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index 4510ed59c1e..9d391176c9e 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -28,12 +28,11 @@ namespace Internal {
 using namespace QmlProfiler;
 
 MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager, QObject *parent) :
-    QmlProfilerTimelineModel(manager,
-                             tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileMemory)),
-                             QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, parent)
+    QmlProfilerTimelineModel(manager, QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType,
+                             QmlDebug::ProfileMemory, parent)
 {
     m_maxSize = 1;
-    announceFeatures((1 << QmlDebug::ProfileMemory) | QmlDebug::Constants::QML_JS_RANGE_FEATURES);
+    announceFeatures((1ULL << mainFeature()) | QmlDebug::Constants::QML_JS_RANGE_FEATURES);
 }
 
 int MemoryUsageModel::rowMaxValue(int rowNumber) const
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index f6e998596ab..b33748eebcb 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -26,12 +26,10 @@ namespace Internal {
 using namespace QmlProfiler;
 
 PixmapCacheModel::PixmapCacheModel(QmlProfilerModelManager *manager, QObject *parent) :
-    QmlProfilerTimelineModel(manager,
-                             tr(QmlProfilerModelManager::featureName(QmlDebug::ProfilePixmapCache)),
-                             QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType, parent)
+    QmlProfilerTimelineModel(manager, QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType,
+                             QmlDebug::ProfilePixmapCache, parent)
 {
     m_maxCacheSize = 1;
-    announceFeatures(1 << QmlDebug::ProfilePixmapCache);
 }
 
 int PixmapCacheModel::rowMaxValue(int rowNumber) const
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
index 7e0bd79f5ed..9b855965440 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
@@ -70,11 +70,9 @@ Q_STATIC_ASSERT(sizeof(StageLabels) ==
 
 SceneGraphTimelineModel::SceneGraphTimelineModel(QmlProfilerModelManager *manager,
                                                  QObject *parent) :
-    QmlProfilerTimelineModel(manager,
-                             tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileSceneGraph)),
-                             QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType, parent)
+    QmlProfilerTimelineModel(manager, QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType,
+                             QmlDebug::ProfileSceneGraph, parent)
 {
-    announceFeatures(1 << QmlDebug::ProfileSceneGraph);
 }
 
 int SceneGraphTimelineModel::expandedRow(int index) const