From 4d7d9735dc61148d9843eea7c7cf26411b31ab6f Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 26 Oct 2020 18:06:06 +0100
Subject: [PATCH] prepairing Qt6 usage

---
 src/nodes/QskGraphicNode.cpp | 2 +-
 src/nodes/QskPaintedNode.cpp | 2 +-
 src/nodes/QskTextureNode.cpp | 7 +++++++
 src/nodes/QskTextureNode.h   | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/nodes/QskGraphicNode.cpp b/src/nodes/QskGraphicNode.cpp
index 8839e7aa..87e455c5 100644
--- a/src/nodes/QskGraphicNode.cpp
+++ b/src/nodes/QskGraphicNode.cpp
@@ -50,7 +50,7 @@ void QskGraphicNode::setGraphic(
     const QskGraphic& graphic, const QskColorFilter& colorFilter,
     QskTextureRenderer::RenderMode renderMode, const QRectF& rect )
 {
-    bool isTextureDirty = ( QskTextureNode::textureId() == 0 );
+    bool isTextureDirty = isNull();
 
     QSize textureSize;
 
diff --git a/src/nodes/QskPaintedNode.cpp b/src/nodes/QskPaintedNode.cpp
index 834695f1..64c85285 100644
--- a/src/nodes/QskPaintedNode.cpp
+++ b/src/nodes/QskPaintedNode.cpp
@@ -34,7 +34,7 @@ QskPaintedNode::~QskPaintedNode()
 void QskPaintedNode::update(
     QskTextureRenderer::RenderMode renderMode, const QRect& rect )
 {
-    bool isTextureDirty = ( QskTextureNode::textureId() == 0 );
+    bool isTextureDirty = isNull();
 
     if ( !isTextureDirty )
     {
diff --git a/src/nodes/QskTextureNode.cpp b/src/nodes/QskTextureNode.cpp
index 64a0f1e8..33e64d16 100644
--- a/src/nodes/QskTextureNode.cpp
+++ b/src/nodes/QskTextureNode.cpp
@@ -282,3 +282,10 @@ uint QskTextureNode::textureId() const
     Q_D( const QskTextureNode );
     return d->material.textureId();
 }
+
+
+bool QskTextureNode::isNull() const
+{
+    Q_D( const QskTextureNode );
+    return d->material.textureId() == 0;
+}
diff --git a/src/nodes/QskTextureNode.h b/src/nodes/QskTextureNode.h
index 83a32f1f..8add3ccf 100644
--- a/src/nodes/QskTextureNode.h
+++ b/src/nodes/QskTextureNode.h
@@ -19,6 +19,8 @@ class QSK_EXPORT QskTextureNode : public QSGGeometryNode
     QskTextureNode();
     ~QskTextureNode() override;
 
+    bool isNull() const;
+
     void setRect( const QRectF& );
     QRectF rect() const;