peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making clazy happier

Browse Source
This commit is contained in:
Uwe Rathmann 2022-03-25 07:46:48 +01:00
parent 73f11cffd9
commit 04ec8b52a1
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/controls/QskSkinnable.cpp
View File

@ -1155,14 +1155,14 @@ bool QskSkinnable::isTransitionAccepted( QskAspect aspect ) const
} }
void QskSkinnable::startTransition( QskAspect aspect, void QskSkinnable::startTransition( QskAspect aspect,
QskAnimationHint animationHint, QVariant from, QVariant to ) QskAnimationHint animationHint, const QVariant& from, const QVariant& to )
{ {
aspect.setSubControl( effectiveSubcontrol( aspect.subControl() ) ); aspect.setSubControl( effectiveSubcontrol( aspect.subControl() ) );
startHintTransition( aspect, animationHint, from, to ); startHintTransition( aspect, animationHint, from, to );
} }
void QskSkinnable::startHintTransition( QskAspect aspect, void QskSkinnable::startHintTransition( QskAspect aspect,
QskAnimationHint animationHint, QVariant from, QVariant to ) QskAnimationHint animationHint, const QVariant& from, const QVariant& to )
{ {
if ( animationHint.duration <= 0 || ( from == to ) ) if ( animationHint.duration <= 0 || ( from == to ) )
return; return;
@ -1177,15 +1177,18 @@ void QskSkinnable::startHintTransition( QskAspect aspect,
to fallback to 0.0 ). In this case we create a default one. to fallback to 0.0 ). In this case we create a default one.
*/ */
if ( !from.isValid() ) auto v1 = from;
auto v2 = to;
if ( !v1.isValid() )
{ {
from = qskTypedNullValue( to ); v1 = qskTypedNullValue( v2 );
} }
else if ( !to.isValid() ) else if ( !v2.isValid() )
{ {
to = qskTypedNullValue( from ); v2 = qskTypedNullValue( v1 );
} }
else if ( from.userType() != to.userType() ) else if ( v1.userType() != v2.userType() )
{ {
return; return;
} }
@ -1194,8 +1197,8 @@ void QskSkinnable::startHintTransition( QskAspect aspect,
{ {
const auto skin = effectiveSkin(); const auto skin = effectiveSkin();
from.setValue( skin->graphicFilter( from.toInt() ) ); v1.setValue( skin->graphicFilter( v1.toInt() ) );
to.setValue( skin->graphicFilter( to.toInt() ) ); v2.setValue( skin->graphicFilter( v2.toInt() ) );
} }
aspect.clearStates(); aspect.clearStates();
@ -1208,9 +1211,9 @@ void QskSkinnable::startHintTransition( QskAspect aspect,
auto animator = m_data->animators.animator( aspect ); auto animator = m_data->animators.animator( aspect );
if ( animator && animator->isRunning() ) if ( animator && animator->isRunning() )
from = animator->currentValue(); v1 = animator->currentValue();
m_data->animators.start( control, aspect, animationHint, from, to ); m_data->animators.start( control, aspect, animationHint, v1, v2 );
} }
void QskSkinnable::setSkinStateFlag( QskAspect::State stateFlag, bool on ) void QskSkinnable::setSkinStateFlag( QskAspect::State stateFlag, bool on )

4
src/controls/QskSkinnable.h
View File

@ -119,7 +119,7 @@ class QSK_EXPORT QskSkinnable
QskSkin* effectiveSkin() const; QskSkin* effectiveSkin() const;
void startTransition( QskAspect, void startTransition( QskAspect,
QskAnimationHint, QVariant from, QVariant to ); QskAnimationHint, const QVariant& from, const QVariant& to );
QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const; QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const;
@ -243,7 +243,7 @@ class QSK_EXPORT QskSkinnable
Q_DISABLE_COPY( QskSkinnable ) Q_DISABLE_COPY( QskSkinnable )
void startHintTransition( QskAspect, void startHintTransition( QskAspect,
QskAnimationHint, QVariant from, QVariant to ); QskAnimationHint, const QVariant& from, const QVariant& to );
QVariant animatedValue( QskAspect, QskSkinHintStatus* ) const; QVariant animatedValue( QskAspect, QskSkinHintStatus* ) const;
const QVariant& storedHint( QskAspect, QskSkinHintStatus* = nullptr ) const; const QVariant& storedHint( QskAspect, QskSkinHintStatus* = nullptr ) const;