Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use proper type for QTransform members

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-03-03 04:10:24 +02:00
parent 9b7ce9fab6
commit e3a752ad90
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/painting/qtransform.cpp
View file

@ -2044,9 +2044,9 @@ const QMatrix &QTransform::toAffine() const
QTransform::TransformationType QTransform::type() const QTransform::TransformationType QTransform::type() const
{ {
if(m_dirty == TxNone || m_dirty < m_type) 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: case TxProject:
if (!qFuzzyIsNull(m_13) || !qFuzzyIsNull(m_23) || !qFuzzyIsNull(m_33 - 1)) { if (!qFuzzyIsNull(m_13) || !qFuzzyIsNull(m_23) || !qFuzzyIsNull(m_33 - 1)) {
m_type = TxProject; m_type = TxProject;
@ -2078,7 +2078,7 @@ QTransform::TransformationType QTransform::type() const
} }
m_dirty = TxNone; m_dirty = TxNone;
return static_cast<TransformationType>(m_type); return m_type;
} }
/*! /*!

6
src/gui/painting/qtransform.h
View file

@ -136,8 +136,8 @@ private:
qreal m_23; qreal m_23;
qreal m_33; qreal m_33;
mutable uint m_type : 5; mutable TransformationType m_type;
mutable uint m_dirty : 5; mutable TransformationType m_dirty;
}; };
Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE); 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 inline QTransform::TransformationType QTransform::inline_type() const
{ {
if (m_dirty == TxNone) if (m_dirty == TxNone)
return static_cast<TransformationType>(m_type); return m_type;
return type(); return type();
} }