Some clang-tidy -use-modernize-nullptr

Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
hjk
2019-07-31 17:21:41 +02:00
parent 630385751a
commit 2e14df7561
180 changed files with 1312 additions and 1312 deletions

View File

@@ -28,7 +28,7 @@
namespace Timeline {
TimelineAbstractRenderer::TimelineAbstractRendererPrivate::TimelineAbstractRendererPrivate() :
selectedItem(-1), selectionLocked(true), model(0), notes(0), zoomer(0), modelDirty(false),
selectedItem(-1), selectionLocked(true), model(nullptr), notes(nullptr), zoomer(nullptr), modelDirty(false),
rowHeightsDirty(false), notesDirty(false)
{
}

View File

@@ -273,7 +273,7 @@ OpaqueColoredPoint2DWithSize *OpaqueColoredPoint2DWithSize::fromVertexData(QSGGe
return static_cast<OpaqueColoredPoint2DWithSize *>(geometry->vertexData());
}
TimelineItemsGeometry::TimelineItemsGeometry() : usedVertices(0), node(0)
TimelineItemsGeometry::TimelineItemsGeometry() : usedVertices(0), node(nullptr)
{
initNodes();
}
@@ -392,7 +392,7 @@ TimelineRenderPass::State *TimelineItemsRenderPass::update(const TimelineAbstrac
QColor(Qt::blue)).lighter(130);
TimelineItemsRenderPassState *state;
if (oldState == 0)
if (oldState == nullptr)
state = new TimelineItemsRenderPassState(model);
else
state = static_cast<TimelineItemsRenderPassState *>(oldState);
@@ -472,7 +472,7 @@ void TimelineItemsMaterialShader::updateState(const RenderState &state, QSGMater
char const *const *TimelineItemsMaterialShader::attributeNames() const
{
static const char *const attr[] = {"vertexCoord", "rectSize", "selectionId", "vertexColor", 0};
static const char *const attr[] = {"vertexCoord", "rectSize", "selectionId", "vertexColor", nullptr};
return attr;
}

View File

@@ -117,7 +117,7 @@ TimelineRenderPass::State *TimelineNotesRenderPass::update(const TimelineAbstrac
return oldState;
TimelineNotesRenderPassState *state;
if (oldState == 0) {
if (oldState == nullptr) {
state = new TimelineNotesRenderPassState(model->expandedRowCount());
} else {
if (!stateChanged && !renderer->notesDirty())
@@ -253,7 +253,7 @@ void NotesMaterialShader::updateState(const RenderState &state, QSGMaterial *, Q
char const *const *NotesMaterialShader::attributeNames() const
{
static const char *const attr[] = {"vertexCoord", "distanceFromTop", 0};
static const char *const attr[] = {"vertexCoord", "distanceFromTop", nullptr};
return attr;
}

View File

@@ -34,7 +34,7 @@ TimelineOverviewRenderer::TimelineOverviewRenderer(QQuickItem *parent) :
}
TimelineOverviewRenderer::TimelineOverviewRendererPrivate::TimelineOverviewRendererPrivate() :
renderState(0)
renderState(nullptr)
{
}
@@ -50,15 +50,15 @@ QSGNode *TimelineOverviewRenderer::updatePaintNode(QSGNode *oldNode,
if (!d->model || d->model->isEmpty() || !d->zoomer || d->zoomer->traceDuration() <= 0) {
delete oldNode;
return 0;
return nullptr;
}
if (d->modelDirty) {
delete d->renderState;
d->renderState = 0;
d->renderState = nullptr;
}
if (d->renderState == 0) {
if (d->renderState == nullptr) {
d->renderState = new TimelineRenderState(d->zoomer->traceStart(), d->zoomer->traceEnd(),
1.0, d->renderPasses.size());
}
@@ -77,7 +77,7 @@ QSGNode *TimelineOverviewRenderer::updatePaintNode(QSGNode *oldNode,
if (d->renderState->isEmpty())
d->renderState->assembleNodeTree(d->model, d->model->height(), 0);
TimelineAbstractRenderer::updatePaintNode(0, updatePaintNodeData);
TimelineAbstractRenderer::updatePaintNode(nullptr, updatePaintNodeData);
QMatrix4x4 matrix;
matrix.scale(xSpacing, ySpacing, 1);

View File

@@ -43,7 +43,7 @@
namespace Timeline {
TimelineRenderer::TimelineRendererPrivate::TimelineRendererPrivate() : lastState(0)
TimelineRenderer::TimelineRendererPrivate::TimelineRendererPrivate() : lastState(nullptr)
{
resetCurrentSelection();
}
@@ -58,7 +58,7 @@ void TimelineRenderer::TimelineRendererPrivate::clear()
for (auto i = renderStates.begin(); i != renderStates.end(); ++i)
qDeleteAll(*i);
renderStates.clear();
lastState = 0;
lastState = nullptr;
}
TimelineRenderer::TimelineRenderer(QQuickItem *parent) :
@@ -102,7 +102,7 @@ TimelineRenderState *TimelineRenderer::TimelineRendererPrivate::findRenderState(
if (renderStates.length() <= level)
renderStates.resize(level + 1);
TimelineRenderState *state = renderStates[level][offset];
if (state == 0) {
if (state == nullptr) {
state = new TimelineRenderState(start, end, 1.0 / static_cast<qreal>(SafeFloatMax),
renderPasses.size());
renderStates[level][offset] = state;
@@ -117,7 +117,7 @@ QSGNode *TimelineRenderer::updatePaintNode(QSGNode *node, UpdatePaintNodeData *u
if (!d->model || d->model->hidden() || d->model->isEmpty() || !d->zoomer ||
d->zoomer->windowDuration() <= 0) {
delete node;
return 0;
return nullptr;
}
float spacing = static_cast<float>(width() / d->zoomer->windowDuration());
@@ -146,7 +146,7 @@ QSGNode *TimelineRenderer::updatePaintNode(QSGNode *node, UpdatePaintNodeData *u
TimelineModel::defaultRowHeight());
}
TimelineAbstractRenderer::updatePaintNode(0, updatePaintNodeData);
TimelineAbstractRenderer::updatePaintNode(nullptr, updatePaintNodeData);
d->lastState = state;
QMatrix4x4 matrix;

View File

@@ -41,12 +41,12 @@ const QVector<QSGNode *> &TimelineRenderPass::State::collapsedRows() const
QSGNode *TimelineRenderPass::State::expandedOverlay() const
{
return 0;
return nullptr;
}
QSGNode *TimelineRenderPass::State::collapsedOverlay() const
{
return 0;
return nullptr;
}
TimelineRenderPass::State::~State()

View File

@@ -195,7 +195,7 @@ void TimelineRenderState::updateExpandedRowHeights(const TimelineModel *model, i
Q_D(TimelineRenderState);
int row = 0;
qreal offset = 0;
for (QSGNode *rowNode = d->expandedRowRoot->firstChild(); rowNode != 0;
for (QSGNode *rowNode = d->expandedRowRoot->firstChild(); rowNode != nullptr;
rowNode = rowNode->nextSibling()) {
qreal rowHeight = model->expandedRowHeight(row++);
QMatrix4x4 matrix;

View File

@@ -74,7 +74,7 @@ TimelineRenderPass::State *TimelineSelectionRenderPass::update(
TimelineSelectionRenderPassState *state;
if (oldState == 0)
if (oldState == nullptr)
state = new TimelineSelectionRenderPassState;
else
state = static_cast<TimelineSelectionRenderPassState *>(oldState);
@@ -153,7 +153,7 @@ TimelineSelectionRenderPass::TimelineSelectionRenderPass()
}
TimelineSelectionRenderPassState::TimelineSelectionRenderPassState() :
m_expandedOverlay(0), m_collapsedOverlay(0)
m_expandedOverlay(nullptr), m_collapsedOverlay(nullptr)
{
m_expandedOverlay = createSelectionNode(&m_material);
m_collapsedOverlay = createSelectionNode(&m_material);