compiler errors fixed
This commit is contained in:
parent
d1fa0207fa
commit
3a83f5fa2c
@ -57,8 +57,8 @@ QskTextOptions::TextFormat QskTextOptions::effectiveFormat( const QString& text
|
|||||||
|
|
||||||
if ( m_format == QskTextOptions::AutoText )
|
if ( m_format == QskTextOptions::AutoText )
|
||||||
return Qt::mightBeRichText( text ) ? StyledText : PlainText;
|
return Qt::mightBeRichText( text ) ? StyledText : PlainText;
|
||||||
else
|
|
||||||
return m_format;
|
return static_cast< QskTextOptions::TextFormat >( m_format );
|
||||||
}
|
}
|
||||||
|
|
||||||
QskHashValue QskTextOptions::hash( QskHashValue seed ) const noexcept
|
QskHashValue QskTextOptions::hash( QskHashValue seed ) const noexcept
|
||||||
|
@ -119,7 +119,8 @@ constexpr inline Qt::TextElideMode QskTextOptions::elideMode() const noexcept
|
|||||||
|
|
||||||
constexpr inline Qt::TextElideMode QskTextOptions::effectiveElideMode() const noexcept
|
constexpr inline Qt::TextElideMode QskTextOptions::effectiveElideMode() const noexcept
|
||||||
{
|
{
|
||||||
return ( wrapMode() != QskTextOptions::NoWrap ) ? Qt::ElideNone : m_elideMode;
|
return ( wrapMode() != QskTextOptions::NoWrap ) ?
|
||||||
|
Qt::ElideNone : static_cast< Qt::TextElideMode >( m_elideMode );
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void QskTextOptions::setWrapMode( WrapMode wrapMode ) noexcept
|
inline void QskTextOptions::setWrapMode( WrapMode wrapMode ) noexcept
|
||||||
|
Loading…
x
Reference in New Issue
Block a user