using auto

This commit is contained in:
Uwe Rathmann 2018-12-11 15:00:53 +01:00
parent 4a035ee0ed
commit e97bca7859

View File

@ -39,7 +39,8 @@ static inline bool qskHasHintFor( const QQuickItem* item, const char* method )
return false; return false;
} }
static inline qreal qskAdjustedValue( QskSizePolicy::Policy policy, qreal value, qreal targetValue ) static inline qreal qskAdjustedValue(
QskSizePolicy::Policy policy, qreal value, qreal targetValue )
{ {
if ( targetValue > value ) if ( targetValue > value )
{ {
@ -58,9 +59,9 @@ static inline qreal qskAdjustedValue( QskSizePolicy::Policy policy, qreal value,
bool QskLayoutConstraint::hasDynamicConstraint( const QQuickItem* item ) bool QskLayoutConstraint::hasDynamicConstraint( const QQuickItem* item )
{ {
if ( const QskControl* control = qobject_cast< const QskControl* >( item ) ) if ( auto control = qobject_cast< const QskControl* >( item ) )
{ {
const QskSizePolicy& policy = control->sizePolicy(); const auto& policy = control->sizePolicy();
return ( policy.horizontalPolicy() == QskSizePolicy::Constrained ) || return ( policy.horizontalPolicy() == QskSizePolicy::Constrained ) ||
( policy.verticalPolicy() == QskSizePolicy::Constrained ); ( policy.verticalPolicy() == QskSizePolicy::Constrained );
} }
@ -71,7 +72,7 @@ bool QskLayoutConstraint::hasDynamicConstraint( const QQuickItem* item )
qreal QskLayoutConstraint::heightForWidth( const QQuickItem* item, qreal width ) qreal QskLayoutConstraint::heightForWidth( const QQuickItem* item, qreal width )
{ {
if ( const QskControl* control = qobject_cast< const QskControl* >( item ) ) if ( auto control = qobject_cast< const QskControl* >( item ) )
return control->heightForWidth( width ); return control->heightForWidth( width );
return qskHintFor( item, "heightForWidth", width ); return qskHintFor( item, "heightForWidth", width );
@ -79,7 +80,7 @@ qreal QskLayoutConstraint::heightForWidth( const QQuickItem* item, qreal width )
qreal QskLayoutConstraint::widthForHeight( const QQuickItem* item, qreal height ) qreal QskLayoutConstraint::widthForHeight( const QQuickItem* item, qreal height )
{ {
if ( const QskControl* control = qobject_cast< const QskControl* >( item ) ) if ( auto control = qobject_cast< const QskControl* >( item ) )
return control->widthForHeight( height ); return control->widthForHeight( height );
return qskHintFor( item, "widthForHeight", height ); return qskHintFor( item, "widthForHeight", height );
@ -88,7 +89,7 @@ qreal QskLayoutConstraint::widthForHeight( const QQuickItem* item, qreal height
QSizeF QskLayoutConstraint::effectiveConstraint( QSizeF QskLayoutConstraint::effectiveConstraint(
const QQuickItem* item, Qt::SizeHint whichHint ) const QQuickItem* item, Qt::SizeHint whichHint )
{ {
if ( const QskControl* control = qobject_cast< const QskControl* >( item ) ) if ( auto control = qobject_cast< const QskControl* >( item ) )
return control->effectiveSizeHint( whichHint ); return control->effectiveSizeHint( whichHint );
QSizeF constraint( -1.0, -1.0 ); // no hint QSizeF constraint( -1.0, -1.0 ); // no hint