diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-06 12:21:54 (GMT) |
---|---|---|
committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-06 12:21:54 (GMT) |
commit | 2c0108ee5aa1cd21c9f3aee23e1d9eec71d600e6 (patch) | |
tree | f80a3d174493d9bcc331343f22e4362d1bfdc91f /src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | |
parent | 1edc42765fa922a4d89a64d5edce2af27b72713b (diff) | |
download | Qt-2c0108ee5aa1cd21c9f3aee23e1d9eec71d600e6.zip Qt-2c0108ee5aa1cd21c9f3aee23e1d9eec71d600e6.tar.gz Qt-2c0108ee5aa1cd21c9f3aee23e1d9eec71d600e6.tar.bz2 |
Use 0 instead of NULL.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsanchorlayout_p.cpp')
-rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp index 7ad994c..96f8930 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp @@ -966,8 +966,8 @@ void QGraphicsAnchorLayoutPrivate::deleteLayoutEdges() { Q_Q(QGraphicsAnchorLayout); - Q_ASSERT(internalVertex(q, Qt::AnchorHorizontalCenter) == NULL); - Q_ASSERT(internalVertex(q, Qt::AnchorVerticalCenter) == NULL); + Q_ASSERT(!internalVertex(q, Qt::AnchorHorizontalCenter)); + Q_ASSERT(!internalVertex(q, Qt::AnchorVerticalCenter)); removeAnchor_helper(internalVertex(q, Qt::AnchorLeft), internalVertex(q, Qt::AnchorRight)); @@ -2036,7 +2036,7 @@ QList<QSimplexConstraint *> QGraphicsAnchorLayoutPrivate::constraintsFromSizeHin // Look for the layout edge. That can be either the first half in case the // layout is split in two, or the whole layout anchor. Orientation orient = Orientation(anchors.first()->orientation); - AnchorData *layoutEdge = NULL; + AnchorData *layoutEdge = 0; if (layoutCentralVertex[orient]) { layoutEdge = graph[orient].edgeData(layoutFirstVertex[orient], layoutCentralVertex[orient]); } else { @@ -2047,7 +2047,7 @@ QList<QSimplexConstraint *> QGraphicsAnchorLayoutPrivate::constraintsFromSizeHin // set back the variable to NULL to prevent the continue condition from being // satisfied in the loop below. if (layoutEdge->maxSize < QWIDGETSIZE_MAX) - layoutEdge = NULL; + layoutEdge = 0; } // For each variable, create constraints based on size hints @@ -2111,8 +2111,8 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Orientation orientation) { Q_ASSERT(layoutFirstVertex[orientation] && layoutLastVertex[orientation]); - AnchorData *edgeL1 = NULL; - AnchorData *edgeL2 = NULL; + AnchorData *edgeL1 = 0; + AnchorData *edgeL2 = 0; // The layout may have a single anchor between Left and Right or two half anchors // passing through the center |