From 0a98b5c1c04e1387caced96dfd205eed54a76694 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 23 Dec 2020 09:34:11 +0100 Subject: [PATCH] QskInterval removed from the skinHint helper methods --- src/controls/QskSkinHintTable.h | 15 --------------- src/controls/QskSkinnable.cpp | 12 ------------ src/controls/QskSkinnable.h | 4 ---- 3 files changed, 31 deletions(-) diff --git a/src/controls/QskSkinHintTable.h b/src/controls/QskSkinHintTable.h index e46c3693..f64028f2 100644 --- a/src/controls/QskSkinHintTable.h +++ b/src/controls/QskSkinHintTable.h @@ -13,7 +13,6 @@ #include "QskBoxShapeMetrics.h" #include "QskGradient.h" #include "QskMargins.h" -#include "QskIntervalF.h" #include #include @@ -60,9 +59,6 @@ class QSK_EXPORT QskSkinHintTable void setBoxBorderColors( QskAspect, const QskBoxBorderColors& ); QskBoxBorderColors boxBorderColors( QskAspect ) const; - void setInterval( QskAspect, const QskIntervalF& ); - QskIntervalF interval( QskAspect ) const; - void setSpacing( QskAspect, qreal ); qreal spacing( QskAspect ) const; @@ -263,17 +259,6 @@ inline QskBoxBorderColors QskSkinHintTable::boxBorderColors( QskAspect aspect ) return hint( aspect | A::Border | A::Color ).value< QskBoxBorderColors >(); } -inline void QskSkinHintTable::setInterval( - QskAspect aspect, const QskIntervalF& interval ) -{ - setHint( aspect | QskAspect::Metric, QVariant::fromValue( interval ) ); -} - -inline QskIntervalF QskSkinHintTable::interval( QskAspect aspect ) const -{ - return hint( aspect | QskAspect::Metric ).value< QskIntervalF >(); -} - inline void QskSkinHintTable::setSpacing( QskAspect aspect, qreal spacing ) { setMetric( aspect | QskAspect::Spacing, spacing ); diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 0e00f085..a6d37b29 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -428,18 +428,6 @@ QskBoxBorderColors QskSkinnable::boxBorderColorsHint( this, aspect | QskAspect::Border, status ); } -void QskSkinnable::setIntervalHint( - const QskAspect aspect, const QskIntervalF& interval ) -{ - qskSetMetric( this, aspect, interval ); -} - -QskIntervalF QskSkinnable::intervalHint( - const QskAspect aspect, QskSkinHintStatus* status ) const -{ - return qskMetric< QskIntervalF >( this, aspect, status ); -} - void QskSkinnable::setSpacingHint( const QskAspect aspect, qreal spacing ) { qskSetMetric( this, aspect | QskAspect::Spacing, spacing ); diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index ac028ca4..192c3945 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -28,7 +28,6 @@ class QskBoxShapeMetrics; class QskBoxBorderMetrics; class QskBoxBorderColors; class QskGradient; -class QskIntervalF; class QskSkin; class QskSkinlet; @@ -122,9 +121,6 @@ class QSK_EXPORT QskSkinnable bool resetBoxBorderColorsHint( QskAspect ); QskBoxBorderColors boxBorderColorsHint( QskAspect, QskSkinHintStatus* = nullptr ) const; - void setIntervalHint( QskAspect, const QskIntervalF& ); - QskIntervalF intervalHint( QskAspect, QskSkinHintStatus* = nullptr ) const; - void setSpacingHint( QskAspect, qreal ); bool resetSpacingHint( QskAspect ); qreal spacingHint( QskAspect, QskSkinHintStatus* = nullptr ) const;