diff --git a/examples/buttons/TestButton.qml b/examples/buttons/TestButton.qml index 33e083cb..e2489044 100644 --- a/examples/buttons/TestButton.qml +++ b/examples/buttons/TestButton.qml @@ -6,8 +6,8 @@ Qsk.PushButton sizePolicy { // avoid the effect of long texts - horizontalPolicy: Qsk.SizePolicy.Ignored - verticalPolicy: Qsk.SizePolicy.Ignored + horizontal: Qsk.SizePolicy.Ignored + vertical: Qsk.SizePolicy.Ignored } minimumSize diff --git a/examples/messageboxQml/messagebox.qml b/examples/messageboxQml/messagebox.qml index 5aa0cc45..6be1eccc 100644 --- a/examples/messageboxQml/messagebox.qml +++ b/examples/messageboxQml/messagebox.qml @@ -26,7 +26,7 @@ Qsk.Window focus: true - sizePolicy.verticalPolicy: Qsk.SizePolicy.MinimumExpanding + sizePolicy.vertical: Qsk.SizePolicy.MinimumExpanding onClicked: { @@ -42,7 +42,7 @@ Qsk.Window id: informationButton text: "Information" - sizePolicy.verticalPolicy: Qsk.SizePolicy.MinimumExpanding + sizePolicy.vertical: Qsk.SizePolicy.MinimumExpanding onClicked: { @@ -57,7 +57,7 @@ Qsk.Window id: questionButton text: "Question" - sizePolicy.verticalPolicy: Qsk.SizePolicy.MinimumExpanding + sizePolicy.vertical: Qsk.SizePolicy.MinimumExpanding onClicked: { @@ -78,7 +78,7 @@ Qsk.Window id: warningButton text: "Warning" - sizePolicy.verticalPolicy: Qsk.SizePolicy.MinimumExpanding + sizePolicy.vertical: Qsk.SizePolicy.MinimumExpanding onClicked: { @@ -93,7 +93,7 @@ Qsk.Window id: criticalButton text: "Critical" - sizePolicy.verticalPolicy: Qsk.SizePolicy.MinimumExpanding + sizePolicy.vertical: Qsk.SizePolicy.MinimumExpanding onClicked: { @@ -108,7 +108,7 @@ Qsk.Window id: selectionButton text: "Selection" - sizePolicy.verticalPolicy: Qsk.SizePolicy.MinimumExpanding + sizePolicy.vertical: Qsk.SizePolicy.MinimumExpanding onClicked: { diff --git a/src/common/QskSizePolicy.h b/src/common/QskSizePolicy.h index c348d589..a3322288 100644 --- a/src/common/QskSizePolicy.h +++ b/src/common/QskSizePolicy.h @@ -14,11 +14,8 @@ class QSK_EXPORT QskSizePolicy { Q_GADGET - Q_PROPERTY( Policy horizontalPolicy - READ horizontalPolicy WRITE setHorizontalPolicy ) - - Q_PROPERTY( Policy verticalPolicy - READ verticalPolicy WRITE setVerticalPolicy ) + Q_PROPERTY( Policy horizontal READ horizontalPolicy WRITE setHorizontalPolicy ) + Q_PROPERTY( Policy vertical READ verticalPolicy WRITE setVerticalPolicy ) public: enum Flag @@ -63,7 +60,7 @@ class QSK_EXPORT QskSizePolicy Q_ENUM( Policy ) Q_ENUM( ConstraintType ) - constexpr QskSizePolicy() noexcept; + constexpr QskSizePolicy() noexcept = default; constexpr QskSizePolicy( Policy horizontalPolicy, Policy verticalPolicy ) noexcept; constexpr bool operator==( const QskSizePolicy& ) const noexcept; @@ -88,16 +85,10 @@ class QSK_EXPORT QskSizePolicy void transpose() noexcept; private: - unsigned char m_horizontalPolicy; - unsigned char m_verticalPolicy; + unsigned char m_horizontalPolicy = Ignored; + unsigned char m_verticalPolicy = Ignored; }; -inline constexpr QskSizePolicy::QskSizePolicy() noexcept - : m_horizontalPolicy( Ignored ) - , m_verticalPolicy( Ignored ) -{ -} - inline constexpr QskSizePolicy::QskSizePolicy( Policy horizontalPolicy, Policy verticalPolicy ) noexcept : m_horizontalPolicy( horizontalPolicy )