prepairing Qt6 usage

This commit is contained in:
Uwe Rathmann 2020-10-26 18:06:06 +01:00
parent 93dc6f76f7
commit 4d7d9735dc
4 changed files with 11 additions and 2 deletions

View File

@ -50,7 +50,7 @@ void QskGraphicNode::setGraphic(
const QskGraphic& graphic, const QskColorFilter& colorFilter, const QskGraphic& graphic, const QskColorFilter& colorFilter,
QskTextureRenderer::RenderMode renderMode, const QRectF& rect ) QskTextureRenderer::RenderMode renderMode, const QRectF& rect )
{ {
bool isTextureDirty = ( QskTextureNode::textureId() == 0 ); bool isTextureDirty = isNull();
QSize textureSize; QSize textureSize;

View File

@ -34,7 +34,7 @@ QskPaintedNode::~QskPaintedNode()
void QskPaintedNode::update( void QskPaintedNode::update(
QskTextureRenderer::RenderMode renderMode, const QRect& rect ) QskTextureRenderer::RenderMode renderMode, const QRect& rect )
{ {
bool isTextureDirty = ( QskTextureNode::textureId() == 0 ); bool isTextureDirty = isNull();
if ( !isTextureDirty ) if ( !isTextureDirty )
{ {

View File

@ -282,3 +282,10 @@ uint QskTextureNode::textureId() const
Q_D( const QskTextureNode ); Q_D( const QskTextureNode );
return d->material.textureId(); return d->material.textureId();
} }
bool QskTextureNode::isNull() const
{
Q_D( const QskTextureNode );
return d->material.textureId() == 0;
}

View File

@ -19,6 +19,8 @@ class QSK_EXPORT QskTextureNode : public QSGGeometryNode
QskTextureNode(); QskTextureNode();
~QskTextureNode() override; ~QskTextureNode() override;
bool isNull() const;
void setRect( const QRectF& ); void setRect( const QRectF& );
QRectF rect() const; QRectF rect() const;