Remove useless checks in labels() methods

The view should do those.

Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

4 files changed, 41 insertions, 61 deletions

diff --git a/plugins/qmlprofilerextension/inputeventsmodel.cpp b/plugins/qmlprofilerextension/inputeventsmodel.cpp
index 5de3c8047b..310a3d5f06 100644
--- a/plugins/qmlprofilerextension/inputeventsmodel.cpp
+++ b/plugins/qmlprofilerextension/inputeventsmodel.cpp
@@ -48,21 +48,15 @@ QVariantList InputEventsModel::labels() const
 {
     QVariantList result;
 
-    if (expanded() && !hidden() && !isEmpty()) {
-        {
-            QVariantMap element;
-            element.insert(QLatin1String("description"), QVariant(tr("Mouse Events")));
-            element.insert(QLatin1String("id"), QVariant(QmlDebug::Mouse));
-            result << element;
-        }
-
-        {
-            QVariantMap element;
-            element.insert(QLatin1String("description"), QVariant(tr("Keyboard Events")));
-            element.insert(QLatin1String("id"), QVariant(QmlDebug::Key));
-            result << element;
-        }
-    }
+    QVariantMap element;
+    element.insert(QLatin1String("description"), QVariant(tr("Mouse Events")));
+    element.insert(QLatin1String("id"), QVariant(QmlDebug::Mouse));
+    result << element;
+
+    element.clear();
+    element.insert(QLatin1String("description"), QVariant(tr("Keyboard Events")));
+    element.insert(QLatin1String("id"), QVariant(QmlDebug::Key));
+    result << element;
 
     return result;
 }
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index e144aa77de..189913d0a8 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -90,23 +90,15 @@ QVariantList MemoryUsageModel::labels() const
 {
     QVariantList result;
 
-    if (expanded() && !hidden() && !isEmpty()) {
-        {
-            QVariantMap element;
-            element.insert(QLatin1String("description"), QVariant(tr("Memory Allocation")));
-
-            element.insert(QLatin1String("id"), QVariant(QmlDebug::HeapPage));
-            result << element;
-        }
-
-        {
-            QVariantMap element;
-            element.insert(QLatin1String("description"), QVariant(tr("Memory Usage")));
-
-            element.insert(QLatin1String("id"), QVariant(QmlDebug::SmallItem));
-            result << element;
-        }
-    }
+    QVariantMap element;
+    element.insert(QLatin1String("description"), QVariant(tr("Memory Allocation")));
+    element.insert(QLatin1String("id"), QVariant(QmlDebug::HeapPage));
+    result << element;
+
+    element.clear();
+    element.insert(QLatin1String("description"), QVariant(tr("Memory Usage")));
+    element.insert(QLatin1String("id"), QVariant(QmlDebug::SmallItem));
+    result << element;
 
     return result;
 }
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index aa4c20d25e..6808d53dbb 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -83,26 +83,22 @@ QVariantList PixmapCacheModel::labels() const
 {
     QVariantList result;
 
-    if (expanded() && !hidden() && !isEmpty()) {
-        {
-            // Cache Size
-            QVariantMap element;
-            element.insert(QLatin1String("description"), QVariant(QLatin1String("Cache Size")));
-
-            element.insert(QLatin1String("id"), QVariant(0));
-            result << element;
-        }
-
-        for (int i=0; i < m_pixmaps.count(); i++) {
-            // Loading
-            QVariantMap element;
-            element.insert(QLatin1String("displayName"), m_pixmaps[i].url);
-            element.insert(QLatin1String("description"),
-                           QVariant(getFilenameOnly(m_pixmaps[i].url)));
-
-            element.insert(QLatin1String("id"), QVariant(i+1));
-            result << element;
-        }
+    // Cache Size
+    QVariantMap element;
+    element.insert(QLatin1String("description"), QVariant(QLatin1String("Cache Size")));
+
+    element.insert(QLatin1String("id"), QVariant(0));
+    result << element;
+
+    for (int i=0; i < m_pixmaps.count(); i++) {
+        // Loading
+        QVariantMap element;
+        element.insert(QLatin1String("displayName"), m_pixmaps[i].url);
+        element.insert(QLatin1String("description"),
+                       QVariant(getFilenameOnly(m_pixmaps[i].url)));
+
+        element.insert(QLatin1String("id"), QVariant(i+1));
+        result << element;
     }
 
     return result;
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
index 596ab5bfdd..91e981e103 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
@@ -96,15 +96,13 @@ QVariantList SceneGraphTimelineModel::labels() const
 {
     QVariantList result;
 
-    if (expanded() && !hidden() && !isEmpty()) {
-        for (SceneGraphStage i = MinimumSceneGraphStage; i < MaximumSceneGraphStage;
-             i = static_cast<SceneGraphStage>(i + 1)) {
-            QVariantMap element;
-            element.insert(QLatin1String("displayName"), tr(threadLabel(i)));
-            element.insert(QLatin1String("description"), tr(StageLabels[i]));
-            element.insert(QLatin1String("id"), i);
-            result << element;
-        }
+    for (SceneGraphStage i = MinimumSceneGraphStage; i < MaximumSceneGraphStage;
+         i = static_cast<SceneGraphStage>(i + 1)) {
+        QVariantMap element;
+        element.insert(QLatin1String("displayName"), tr(threadLabel(i)));
+        element.insert(QLatin1String("description"), tr(StageLabels[i]));
+        element.insert(QLatin1String("id"), i);
+        result << element;
     }
 
     return result;