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

QmlProfiler: Modernize

Browse Source 
modernize-*

Change-Id: Ibdf9c0ae91bf8a622facc7f323112b550f532f15
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Alessandro Portale
2018-11-24 12:14:44 +01:00
parent 383f0b9fcc
commit d1df55d128
42 changed files with 112 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmlprofiler/tests/qmlprofilerbindingloopsrenderpass_test.cpp
View File

@@ -78,7 +78,7 @@ void QmlProfilerBindingLoopsRenderPassTest::testInstance()
const QmlProfilerBindingLoopsRenderPass *inst = QmlProfilerBindingLoopsRenderPass::instance();
const QmlProfilerBindingLoopsRenderPass *inst2 = QmlProfilerBindingLoopsRenderPass::instance();
QCOMPARE(inst, inst2);
QVERIFY(inst != 0);
QVERIFY(inst != nullptr);
}
void QmlProfilerBindingLoopsRenderPassTest::testUpdate()
@@ -86,43 +86,43 @@ void QmlProfilerBindingLoopsRenderPassTest::testUpdate()
const QmlProfilerBindingLoopsRenderPass *inst = QmlProfilerBindingLoopsRenderPass::instance();
Timeline::TimelineAbstractRenderer renderer;
Timeline::TimelineRenderState parentState(0, 8, 1, 1);
Timeline::TimelineRenderPass::State *nullState = 0;
QSGNode *nullNode = 0;
Timeline::TimelineRenderPass::State *nullState = nullptr;
QSGNode *nullNode = nullptr;
Timeline::TimelineRenderPass::State *result =
inst->update(&renderer, &parentState, 0, 0, 0, true, 1);
inst->update(&renderer, &parentState, nullptr, 0, 0, true, 1);
QCOMPARE(result, nullState);
QmlProfilerModelManager manager;
Timeline::TimelineModelAggregator aggregator;
DummyModel model(&manager, &aggregator);
renderer.setModel(&model);
result = inst->update(&renderer, &parentState, 0, 0, 0, true, 1);
result = inst->update(&renderer, &parentState, nullptr, 0, 0, true, 1);
QCOMPARE(result, nullState);
model.loadData();
result = inst->update(&renderer, &parentState, 0, 0, 0, true, 1);
result = inst->update(&renderer, &parentState, nullptr, 0, 0, true, 1);
QCOMPARE(result, nullState);
result = inst->update(&renderer, &parentState, 0, 2, 9, true, 1);
result = inst->update(&renderer, &parentState, nullptr, 2, 9, true, 1);
QVERIFY(result != nullState);
QCOMPARE(result->expandedOverlay(), nullNode);
QVERIFY(result->collapsedOverlay() != nullNode);
QCOMPARE(result->expandedRows().count(), 2); // all the loops are in one row
QCOMPARE(result->collapsedRows().count(), 0); // it's an overlay
QCOMPARE(result->expandedRows()[1]->childCount(), 1);
QSGGeometryNode *node = static_cast<QSGGeometryNode *>(result->expandedRows()[1]->firstChild());
auto node = static_cast<const QSGGeometryNode *>(result->expandedRows()[1]->firstChild());
QSGMaterial *material1 = node->material();
QVERIFY(material1 != 0);
QVERIFY(material1 != nullptr);
QCOMPARE(node->geometry()->vertexCount(), 7 * 4);
node = static_cast<QSGGeometryNode *>(result->collapsedOverlay()->firstChild());
QSGMaterial *material2 = node->material();
QCOMPARE(node->geometry()->vertexCount(), 7 * 18);
QVERIFY(material2 != 0);
QVERIFY(material2 != nullptr);
QCOMPARE(material1->type(), material2->type());
QSGMaterialShader *shader1 = material1->createShader();
QVERIFY(shader1 != 0);
QVERIFY(shader1 != nullptr);
QSGMaterialShader *shader2 = material2->createShader();
QVERIFY(shader2 != 0);
QVERIFY(shader2 != nullptr);
QCOMPARE(shader1->attributeNames(), shader2->attributeNames());
delete shader1;