enum types specified

This commit is contained in:
Uwe Rathmann 2024-12-09 15:21:37 +01:00
parent d53579f3d9
commit 0849571523
13 changed files with 30 additions and 30 deletions

View File

@ -70,7 +70,7 @@ class QSK_EXPORT QskBoxBorderColors
bool isValid() const; bool isValid() const;
private: private:
enum enum : quint8
{ {
// in order of Qt::Edge // in order of Qt::Edge
Top = 0, Top = 0,

View File

@ -154,7 +154,7 @@ QskBoxShapeMetrics QskBoxShapeMetrics::interpolated(
qskInterpolatedSize( m_radii[ 1 ], to.m_radii[ 1 ], ratio ), qskInterpolatedSize( m_radii[ 1 ], to.m_radii[ 1 ], ratio ),
qskInterpolatedSize( m_radii[ 2 ], to.m_radii[ 2 ], ratio ), qskInterpolatedSize( m_radii[ 2 ], to.m_radii[ 2 ], ratio ),
qskInterpolatedSize( m_radii[ 3 ], to.m_radii[ 3 ], ratio ), qskInterpolatedSize( m_radii[ 3 ], to.m_radii[ 3 ], ratio ),
to.m_sizeMode, to.m_scalingMode ); to.sizeMode(), to.m_scalingMode );
} }
QVariant QskBoxShapeMetrics::interpolate( QVariant QskBoxShapeMetrics::interpolate(

View File

@ -52,7 +52,7 @@ class QSK_EXPORT QskBoxShapeMetrics
The default setting is Symmetric. The default setting is Symmetric.
*/ */
enum ScalingMode enum ScalingMode : quint8
{ {
Symmetric, Symmetric,
SymmetricByMaximum, SymmetricByMaximum,
@ -144,7 +144,7 @@ class QSK_EXPORT QskBoxShapeMetrics
} }
QSizeF m_radii[ 4 ]; QSizeF m_radii[ 4 ];
Qt::SizeMode m_sizeMode : 2; unsigned int m_sizeMode : 2;
ScalingMode m_scalingMode : 2; ScalingMode m_scalingMode : 2;
}; };
@ -278,7 +278,7 @@ inline void QskBoxShapeMetrics::setSizeMode( Qt::SizeMode sizeMode ) noexcept
inline constexpr Qt::SizeMode QskBoxShapeMetrics::sizeMode() const noexcept inline constexpr Qt::SizeMode QskBoxShapeMetrics::sizeMode() const noexcept
{ {
return m_sizeMode; return static_cast< Qt::SizeMode >( m_sizeMode );
} }
inline void QskBoxShapeMetrics::setScalingMode( ScalingMode scalingMode ) noexcept inline void QskBoxShapeMetrics::setScalingMode( ScalingMode scalingMode ) noexcept
@ -312,7 +312,7 @@ inline constexpr QskBoxShapeMetrics QskBoxShapeMetrics::transposed() const noexc
return QskBoxShapeMetrics( return QskBoxShapeMetrics(
m_radii[ 0 ].transposed(), m_radii[ 1 ].transposed(), m_radii[ 0 ].transposed(), m_radii[ 1 ].transposed(),
m_radii[ 2 ].transposed(), m_radii[ 3 ].transposed(), m_radii[ 2 ].transposed(), m_radii[ 3 ].transposed(),
m_sizeMode, m_scalingMode ); sizeMode(), m_scalingMode );
} }
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM

View File

@ -17,7 +17,7 @@ class QSK_EXPORT QskFontRole
Q_PROPERTY( Emphasis emphasis READ emphasis WRITE setEmphasis ) Q_PROPERTY( Emphasis emphasis READ emphasis WRITE setEmphasis )
public: public:
enum Category enum Category : quint8
{ {
Caption, Caption,
Body, Body,
@ -28,7 +28,7 @@ class QSK_EXPORT QskFontRole
}; };
Q_ENUM( Category ); Q_ENUM( Category );
enum Emphasis enum Emphasis : quint8
{ {
VeryLow, VeryLow,
Low, Low,
@ -54,8 +54,8 @@ class QSK_EXPORT QskFontRole
QskHashValue hash( QskHashValue seed = 0 ) const noexcept; QskHashValue hash( QskHashValue seed = 0 ) const noexcept;
private: private:
unsigned char m_category; Category m_category;
unsigned char m_emphasis; Emphasis m_emphasis;
}; };
inline constexpr QskFontRole::QskFontRole( Category category, Emphasis emphasis ) noexcept inline constexpr QskFontRole::QskFontRole( Category category, Emphasis emphasis ) noexcept
@ -81,7 +81,7 @@ inline void QskFontRole::setCategory( Category category ) noexcept
inline constexpr QskFontRole::Category QskFontRole::category() const noexcept inline constexpr QskFontRole::Category QskFontRole::category() const noexcept
{ {
return static_cast< Category >( m_category ); return m_category;
} }
inline void QskFontRole::setEmphasis( Emphasis emphasis ) noexcept inline void QskFontRole::setEmphasis( Emphasis emphasis ) noexcept
@ -91,7 +91,7 @@ inline void QskFontRole::setEmphasis( Emphasis emphasis ) noexcept
inline constexpr QskFontRole::Emphasis QskFontRole::emphasis() const noexcept inline constexpr QskFontRole::Emphasis QskFontRole::emphasis() const noexcept
{ {
return static_cast< Emphasis >( m_emphasis ); return m_emphasis;
} }
inline QskHashValue qHash( const QskFontRole fontRole, QskHashValue seed = 0 ) noexcept inline QskHashValue qHash( const QskFontRole fontRole, QskHashValue seed = 0 ) noexcept

View File

@ -40,7 +40,7 @@ class QSK_EXPORT QskGradient
Q_CLASSINFO( "DefaultProperty", "stops" ) Q_CLASSINFO( "DefaultProperty", "stops" )
public: public:
enum Type enum Type : quint8
{ {
Stops, Stops,
@ -50,7 +50,7 @@ class QSK_EXPORT QskGradient
}; };
Q_ENUM( Type ) Q_ENUM( Type )
enum SpreadMode enum SpreadMode : quint8
{ {
PadSpread, PadSpread,
ReflectSpread, ReflectSpread,
@ -58,7 +58,7 @@ class QSK_EXPORT QskGradient
}; };
Q_ENUM( SpreadMode ) Q_ENUM( SpreadMode )
enum StretchMode enum StretchMode : quint8
{ {
NoStretch, NoStretch,
StretchToSize StretchToSize
@ -181,8 +181,8 @@ class QSK_EXPORT QskGradient
qreal m_values[5] = {}; qreal m_values[5] = {};
unsigned int m_type : 3; unsigned int m_type : 3;
unsigned int m_spreadMode : 3; SpreadMode m_spreadMode : 3;
unsigned int m_stretchMode : 3; StretchMode m_stretchMode : 3;
mutable bool m_isDirty : 1; mutable bool m_isDirty : 1;
mutable bool m_isValid : 1; mutable bool m_isValid : 1;

View File

@ -21,7 +21,7 @@ class QByteArray;
class QSK_EXPORT QskMetaInvokable class QSK_EXPORT QskMetaInvokable
{ {
public: public:
enum Type enum Type : quint8
{ {
Invalid = 0, Invalid = 0,
@ -93,7 +93,7 @@ class QSK_EXPORT QskMetaInvokable
MetaData m_metaData; MetaData m_metaData;
}; };
int m_type : 3; Type m_type;
}; };
inline QskMetaInvokable::QskMetaInvokable() inline QskMetaInvokable::QskMetaInvokable()

View File

@ -14,7 +14,7 @@ class QObject;
class QSK_EXPORT QskObjectCounter class QSK_EXPORT QskObjectCounter
{ {
public: public:
enum ObjectType enum ObjectType : quint8
{ {
Objects, Objects,
Items Items

View File

@ -19,7 +19,7 @@ class QSK_EXPORT QskPlacementPolicy
public: public:
enum Policy enum Policy : quint8
{ {
Ignore, Ignore,
Reserve, Reserve,

View File

@ -26,7 +26,7 @@ class QSK_EXPORT QskShadowMetrics
Q_PROPERTY( ShapeMode shapeMode READ shapeMode WRITE setShapeMode ) Q_PROPERTY( ShapeMode shapeMode READ shapeMode WRITE setShapeMode )
public: public:
enum ShapeMode enum ShapeMode : quint8
{ {
Aligned = 0, // The shape is related to some external definition Aligned = 0, // The shape is related to some external definition
@ -86,7 +86,7 @@ class QSK_EXPORT QskShadowMetrics
qreal m_spreadRadius = 0.0; qreal m_spreadRadius = 0.0;
qreal m_blurRadius = 0.0; qreal m_blurRadius = 0.0;
quint8 m_sizeMode = Qt::AbsoluteSize; quint8 m_sizeMode = Qt::AbsoluteSize;
quint8 m_shapeMode = QskShadowMetrics::Aligned; ShapeMode m_shapeMode = QskShadowMetrics::Aligned;
}; };
inline constexpr QskShadowMetrics::QskShadowMetrics( const QPointF& offset ) noexcept inline constexpr QskShadowMetrics::QskShadowMetrics( const QPointF& offset ) noexcept
@ -170,7 +170,7 @@ inline void QskShadowMetrics::setShapeMode( ShapeMode shapeMode ) noexcept
inline constexpr QskShadowMetrics::ShapeMode QskShadowMetrics::shapeMode() const noexcept inline constexpr QskShadowMetrics::ShapeMode QskShadowMetrics::shapeMode() const noexcept
{ {
return static_cast< ShapeMode >( m_shapeMode ); return m_shapeMode;
} }
inline void QskShadowMetrics::setOffsetX( qreal dx ) noexcept inline void QskShadowMetrics::setOffsetX( qreal dx ) noexcept

View File

@ -11,7 +11,7 @@
class QSK_EXPORT QskStateCombination class QSK_EXPORT QskStateCombination
{ {
public: public:
enum Type enum Type : quint8
{ {
Combination, Combination,
CombinationNoState CombinationNoState

View File

@ -24,7 +24,7 @@ class QSK_EXPORT QskTextOptions
Q_PROPERTY( int maximumLineCount READ maximumLineCount WRITE setMaximumLineCount ) Q_PROPERTY( int maximumLineCount READ maximumLineCount WRITE setMaximumLineCount )
public: public:
enum FontSizeMode enum FontSizeMode : quint8
{ {
FixedSize, FixedSize,
HorizontalFit, HorizontalFit,
@ -33,7 +33,7 @@ class QSK_EXPORT QskTextOptions
}; };
Q_ENUM( FontSizeMode ) Q_ENUM( FontSizeMode )
enum WrapMode enum WrapMode : quint8
{ {
NoWrap = QTextOption::NoWrap, NoWrap = QTextOption::NoWrap,
WordWrap = QTextOption::WordWrap, WordWrap = QTextOption::WordWrap,
@ -42,7 +42,7 @@ class QSK_EXPORT QskTextOptions
}; };
Q_ENUM( WrapMode ) Q_ENUM( WrapMode )
enum TextFormat enum TextFormat : quint8
{ {
PlainText = Qt::PlainText, PlainText = Qt::PlainText,
RichText = Qt::RichText, RichText = Qt::RichText,

View File

@ -18,7 +18,7 @@ class QSK_EXPORT QskTickmarks
Q_PROPERTY( QVector< qreal > minorTicks READ minorTicks WRITE setMinorTicks ) Q_PROPERTY( QVector< qreal > minorTicks READ minorTicks WRITE setMinorTicks )
public: public:
enum TickType enum TickType : quint8
{ {
MinorTick, MinorTick,
MediumTick, MediumTick,

View File

@ -14,7 +14,7 @@
class QSK_EXPORT QskAnimationHint class QSK_EXPORT QskAnimationHint
{ {
public: public:
enum UpdateFlag enum UpdateFlag : quint8
{ {
UpdateAuto = 0, // depending on the animated aspect UpdateAuto = 0, // depending on the animated aspect