feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove useless checks in labels() methods

Browse Source 
The view should do those.

Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-10-29 10:42:22 +01:00
committed by Ulf Hermann
parent d93266420b
commit fad69ea995
4 changed files with 36 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/qmlprofilerextension/inputeventsmodel.cpp
View File

@@ -48,21 +48,15 @@ QVariantList InputEventsModel::labels() const
{ {
QVariantList result; QVariantList result;
if (expanded() && !hidden() && !isEmpty()) { QVariantMap element;
{ element.insert(QLatin1String("description"), QVariant(tr("Mouse Events")));
QVariantMap element; element.insert(QLatin1String("id"), QVariant(QmlDebug::Mouse));
element.insert(QLatin1String("description"), QVariant(tr("Mouse Events"))); result << element;
element.insert(QLatin1String("id"), QVariant(QmlDebug::Mouse));
result << element;
}
{ element.clear();
QVariantMap element; element.insert(QLatin1String("description"), QVariant(tr("Keyboard Events")));
element.insert(QLatin1String("description"), QVariant(tr("Keyboard Events"))); element.insert(QLatin1String("id"), QVariant(QmlDebug::Key));
element.insert(QLatin1String("id"), QVariant(QmlDebug::Key)); result << element;
result << element;
}
}
return result; return result;
} }

24
plugins/qmlprofilerextension/memoryusagemodel.cpp
View File

@@ -90,23 +90,15 @@ QVariantList MemoryUsageModel::labels() const
{ {
QVariantList result; QVariantList result;
if (expanded() && !hidden() && !isEmpty()) { QVariantMap element;
{ element.insert(QLatin1String("description"), QVariant(tr("Memory Allocation")));
QVariantMap element; element.insert(QLatin1String("id"), QVariant(QmlDebug::HeapPage));
element.insert(QLatin1String("description"), QVariant(tr("Memory Allocation"))); result << element;
element.insert(QLatin1String("id"), QVariant(QmlDebug::HeapPage)); element.clear();
result << 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 Usage")));
element.insert(QLatin1String("id"), QVariant(QmlDebug::SmallItem));
result << element;
}
}
return result; return result;
} }

30
plugins/qmlprofilerextension/pixmapcachemodel.cpp
View File

@@ -83,26 +83,22 @@ QVariantList PixmapCacheModel::labels() const
{ {
QVariantList result; QVariantList result;
if (expanded() && !hidden() && !isEmpty()) { // Cache Size
{ QVariantMap element;
// Cache Size element.insert(QLatin1String("description"), QVariant(QLatin1String("Cache Size")));
QVariantMap element;
element.insert(QLatin1String("description"), QVariant(QLatin1String("Cache Size")));
element.insert(QLatin1String("id"), QVariant(0)); element.insert(QLatin1String("id"), QVariant(0));
result << element; result << element;
}
for (int i=0; i < m_pixmaps.count(); i++) { for (int i=0; i < m_pixmaps.count(); i++) {
// Loading // Loading
QVariantMap element; QVariantMap element;
element.insert(QLatin1String("displayName"), m_pixmaps[i].url); element.insert(QLatin1String("displayName"), m_pixmaps[i].url);
element.insert(QLatin1String("description"), element.insert(QLatin1String("description"),
QVariant(getFilenameOnly(m_pixmaps[i].url))); QVariant(getFilenameOnly(m_pixmaps[i].url)));
element.insert(QLatin1String("id"), QVariant(i+1)); element.insert(QLatin1String("id"), QVariant(i+1));
result << element; result << element;
}
} }
return result; return result;

16
plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
View File

@@ -96,15 +96,13 @@ QVariantList SceneGraphTimelineModel::labels() const
{ {
QVariantList result; QVariantList result;
if (expanded() && !hidden() && !isEmpty()) { for (SceneGraphStage i = MinimumSceneGraphStage; i < MaximumSceneGraphStage;
for (SceneGraphStage i = MinimumSceneGraphStage; i < MaximumSceneGraphStage; i = static_cast<SceneGraphStage>(i + 1)) {
i = static_cast<SceneGraphStage>(i + 1)) { QVariantMap element;
QVariantMap element; element.insert(QLatin1String("displayName"), tr(threadLabel(i)));
element.insert(QLatin1String("displayName"), tr(threadLabel(i))); element.insert(QLatin1String("description"), tr(StageLabels[i]));
element.insert(QLatin1String("description"), tr(StageLabels[i])); element.insert(QLatin1String("id"), i);
element.insert(QLatin1String("id"), i); result << element;
result << element;
}
} }
return result; return result;