From 7956b176e6944a44896aa13ebe896a0b451b4964 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Wed, 29 Oct 2014 10:41:27 +0100
Subject: [PATCH] QmlProfiler: remove useless checks from labels() methods

The view should check if it needs the labels before requesting them.

Change-Id: I935259e91337202224af7890d0617e1b12dd922a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 .../qmlprofileranimationsmodel.cpp            |  4 ++--
 .../qmlprofiler/qmlprofilerrangemodel.cpp     | 20 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp
index 1cb139baa81..534d7f06b2c 100644
--- a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp
@@ -186,7 +186,7 @@ QVariantList QmlProfilerAnimationsModel::labels() const
 {
     QVariantList result;
 
-    if (!hidden() && m_maxGuiThreadAnimations > 0) {
+    if (m_maxGuiThreadAnimations > 0) {
         QVariantMap element;
         element.insert(QLatin1String("displayName"), QVariant(tr("Animations")));
         element.insert(QLatin1String("description"), QVariant(tr("GUI Thread")));
@@ -194,7 +194,7 @@ QVariantList QmlProfilerAnimationsModel::labels() const
         result << element;
     }
 
-    if (!hidden() && m_maxRenderThreadAnimations > 0) {
+    if (m_maxRenderThreadAnimations > 0) {
         QVariantMap element;
         element.insert(QLatin1String("displayName"), QVariant(tr("Animations")));
         element.insert(QLatin1String("description"), QVariant(tr("Render Thread")));
diff --git a/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp b/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
index 863181cc827..16e3a1ce20f 100644
--- a/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
@@ -210,17 +210,15 @@ QVariantList QmlProfilerRangeModel::labels() const
 {
     QVariantList result;
 
-    if (expanded() && !hidden()) {
-        const QVector<QmlProfilerDataModel::QmlEventTypeData> &types =
-                modelManager()->qmlModel()->getEventTypes();
-        for (int i = 1; i < expandedRowCount(); i++) { // Ignore the -1 for the first row
-            QVariantMap element;
-            int typeId = m_expandedRowTypes[i];
-            element.insert(QLatin1String("displayName"), QVariant(types[typeId].displayName));
-            element.insert(QLatin1String("description"), QVariant(types[typeId].data));
-            element.insert(QLatin1String("id"), QVariant(typeId));
-            result << element;
-        }
+    const QVector<QmlProfilerDataModel::QmlEventTypeData> &types =
+            modelManager()->qmlModel()->getEventTypes();
+    for (int i = 1; i < expandedRowCount(); i++) { // Ignore the -1 for the first row
+        QVariantMap element;
+        int typeId = m_expandedRowTypes[i];
+        element.insert(QLatin1String("displayName"), QVariant(types[typeId].displayName));
+        element.insert(QLatin1String("description"), QVariant(types[typeId].data));
+        element.insert(QLatin1String("id"), QVariant(typeId));
+        result << element;
     }
 
     return result;