diff options
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp index 1976538aec..a35629d874 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.cpp +++ b/src/quick/scenegraph/coreapi/qsgnode.cpp @@ -245,7 +245,6 @@ static void qt_print_node_count() */ QSGNode::QSGNode() : m_nodeFlags(OwnedByParent) - , m_dirtyState(nullptr) { init(); } @@ -264,7 +263,6 @@ QSGNode::QSGNode(NodeType type) , m_previousSibling(nullptr) , m_subtreeRenderableCount(type == GeometryNodeType || type == RenderNodeType ? 1 : 0) , m_nodeFlags(OwnedByParent) - , m_dirtyState(nullptr) { init(); } @@ -283,7 +281,6 @@ QSGNode::QSGNode(QSGNodePrivate &dd, NodeType type) , m_previousSibling(nullptr) , m_subtreeRenderableCount(type == GeometryNodeType || type == RenderNodeType ? 1 : 0) , m_nodeFlags(OwnedByParent) - , m_dirtyState(nullptr) , d_ptr(&dd) { init(); @@ -1466,7 +1463,7 @@ QDebug operator<<(QDebug d, const QSGGeometryNode *n) d << "Geometry(null)"; return d; } - d << "GeometryNode(" << hex << (const void *) n << dec; + d << "GeometryNode(" << Qt::hex << (const void *) n << Qt::dec; const QSGGeometry *g = n->geometry(); @@ -1517,7 +1514,7 @@ QDebug operator<<(QDebug d, const QSGClipNode *n) d << "ClipNode(null)"; return d; } - d << "ClipNode(" << hex << (const void *) n << dec; + d << "ClipNode(" << Qt::hex << (const void *) n << Qt::dec; if (n->childCount()) d << "children=" << n->childCount(); @@ -1540,7 +1537,7 @@ QDebug operator<<(QDebug d, const QSGTransformNode *n) } const QMatrix4x4 m = n->matrix(); d << "TransformNode("; - d << hex << (const void *) n << dec; + d << Qt::hex << (const void *) n << Qt::dec; if (m.isIdentity()) d << "identity"; else if (m.determinant() == 1 && m(0, 0) == 1 && m(1, 1) == 1 && m(2, 2) == 1) @@ -1562,7 +1559,7 @@ QDebug operator<<(QDebug d, const QSGOpacityNode *n) return d; } d << "OpacityNode("; - d << hex << (const void *) n << dec; + d << Qt::hex << (const void *) n << Qt::dec; d << "opacity=" << n->opacity() << "combined=" << n->combinedOpacity() << (n->isSubtreeBlocked() ? "*BLOCKED*" : ""); @@ -1581,7 +1578,7 @@ QDebug operator<<(QDebug d, const QSGRootNode *n) return d; } QDebugStateSaver saver(d); - d << "RootNode" << hex << (const void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : ""); + d << "RootNode" << Qt::hex << (const void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : ""); #ifdef QSG_RUNTIME_DESCRIPTION d << QSGNodePrivate::description(n); #endif @@ -1614,8 +1611,8 @@ QDebug operator<<(QDebug d, const QSGNode *n) d << static_cast<const QSGOpacityNode *>(n); break; case QSGNode::RenderNodeType: - d << "RenderNode(" << hex << (const void *) n << dec - << "flags=" << (int) n->flags() << dec + d << "RenderNode(" << Qt::hex << (const void *) n << Qt::dec + << "flags=" << (int) n->flags() << Qt::dec << (n->isSubtreeBlocked() ? "*BLOCKED*" : ""); #ifdef QSG_RUNTIME_DESCRIPTION d << QSGNodePrivate::description(n); @@ -1623,8 +1620,8 @@ QDebug operator<<(QDebug d, const QSGNode *n) d << ')'; break; default: - d << "Node(" << hex << (const void *) n << dec - << "flags=" << (int) n->flags() << dec + d << "Node(" << Qt::hex << (const void *) n << Qt::dec + << "flags=" << (int) n->flags() << Qt::dec << (n->isSubtreeBlocked() ? "*BLOCKED*" : ""); #ifdef QSG_RUNTIME_DESCRIPTION d << QSGNodePrivate::description(n); |