mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 10:52:56 +00:00
use proper type for QTransform members
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
9b7ce9fab6
commit
e3a752ad90
2 changed files with 7 additions and 7 deletions
|
@ -2044,9 +2044,9 @@ const QMatrix &QTransform::toAffine() const
|
|||
QTransform::TransformationType QTransform::type() const
|
||||
{
|
||||
if(m_dirty == TxNone || m_dirty < m_type)
|
||||
return static_cast<TransformationType>(m_type);
|
||||
return m_type;
|
||||
|
||||
switch (static_cast<TransformationType>(m_dirty)) {
|
||||
switch (m_dirty) {
|
||||
case TxProject:
|
||||
if (!qFuzzyIsNull(m_13) || !qFuzzyIsNull(m_23) || !qFuzzyIsNull(m_33 - 1)) {
|
||||
m_type = TxProject;
|
||||
|
@ -2078,7 +2078,7 @@ QTransform::TransformationType QTransform::type() const
|
|||
}
|
||||
|
||||
m_dirty = TxNone;
|
||||
return static_cast<TransformationType>(m_type);
|
||||
return m_type;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
@ -136,8 +136,8 @@ private:
|
|||
qreal m_23;
|
||||
qreal m_33;
|
||||
|
||||
mutable uint m_type : 5;
|
||||
mutable uint m_dirty : 5;
|
||||
mutable TransformationType m_type;
|
||||
mutable TransformationType m_dirty;
|
||||
};
|
||||
Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE);
|
||||
|
||||
|
@ -145,7 +145,7 @@ Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE);
|
|||
inline QTransform::TransformationType QTransform::inline_type() const
|
||||
{
|
||||
if (m_dirty == TxNone)
|
||||
return static_cast<TransformationType>(m_type);
|
||||
return m_type;
|
||||
return type();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue