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

more C++11

Browse Source
This commit is contained in:
Uwe Rathmann 2022-12-01 14:23:13 +01:00
parent 9ed4aafff5
commit 103746d719
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/graphic/QskColorFilter.cpp
View File

@ -41,12 +41,11 @@ static inline QBrush qskSubstitutedBrush(
{ {
QBrush newBrush; QBrush newBrush;
const QGradient* gradient = brush.gradient(); if ( const auto gradient = brush.gradient() )
if ( gradient )
{ {
bool isModified = false; bool isModified = false;
QGradientStops stops = gradient->stops(); auto stops = gradient->stops();
for ( auto& stop : stops ) for ( auto& stop : stops )
{ {
const QColor c = qskSubstitutedColor( substitions, stop.second ); const QColor c = qskSubstitutedColor( substitions, stop.second );
@ -61,7 +60,7 @@ static inline QBrush qskSubstitutedBrush(
{ {
newBrush = brush; newBrush = brush;
QGradient* newGradient = const_cast< QGradient* >( newBrush.gradient() ); auto newGradient = const_cast< QGradient* >( newBrush.gradient() );
newGradient->setStops( stops ); newGradient->setStops( stops );
} }
} }
@ -167,7 +166,7 @@ QPen QskColorFilter::substituted( const QPen& pen ) const
if ( m_substitutions.isEmpty() || pen.style() == Qt::NoPen ) if ( m_substitutions.isEmpty() || pen.style() == Qt::NoPen )
return pen; return pen;
const QBrush newBrush = qskSubstitutedBrush( m_substitutions, pen.brush() ); const auto newBrush = qskSubstitutedBrush( m_substitutions, pen.brush() );
if ( newBrush.style() == Qt::NoBrush ) if ( newBrush.style() == Qt::NoBrush )
return pen; return pen;
@ -181,7 +180,7 @@ QBrush QskColorFilter::substituted( const QBrush& brush ) const
if ( m_substitutions.isEmpty() || brush.style() == Qt::NoBrush ) if ( m_substitutions.isEmpty() || brush.style() == Qt::NoBrush )
return brush; return brush;
const QBrush newBrush = qskSubstitutedBrush( m_substitutions, brush ); const auto newBrush = qskSubstitutedBrush( m_substitutions, brush );
return ( newBrush.style() != Qt::NoBrush ) ? newBrush : brush; return ( newBrush.style() != Qt::NoBrush ) ? newBrush : brush;
} }