From 12a3476e7171f1e6b14c5207bbeb9a8269e0a80a Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 24 Mar 2022 08:01:52 +0100 Subject: [PATCH] return code for all remove operations --- src/controls/QskSkinHintTableEditor.cpp | 34 ++++++++++---------- src/controls/QskSkinHintTableEditor.h | 42 ++++++++++++------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/controls/QskSkinHintTableEditor.cpp b/src/controls/QskSkinHintTableEditor.cpp index ea88434a..91fc8f78 100644 --- a/src/controls/QskSkinHintTableEditor.cpp +++ b/src/controls/QskSkinHintTableEditor.cpp @@ -244,10 +244,10 @@ void QskSkinHintTableEditor::setPosition( setMetricHint( aspectPosition( aspect ), position, combination ); } -void QskSkinHintTableEditor::removePosition( +bool QskSkinHintTableEditor::removePosition( QskAspect aspect, QskStateCombination combination ) { - removeMetricHint( aspectPosition( aspect ), combination ); + return removeMetricHint( aspectPosition( aspect ), combination ); } qreal QskSkinHintTableEditor::position( QskAspect aspect ) const @@ -268,10 +268,10 @@ void QskSkinHintTableEditor::setStrutSize( QSizeF( width, height ), combination ); } -void QskSkinHintTableEditor::removeStrutSize( +bool QskSkinHintTableEditor::removeStrutSize( QskAspect aspect, QskStateCombination combination ) { - removeMetricHint( aspectStrutSize( aspect ), combination ); + return removeMetricHint( aspectStrutSize( aspect ), combination ); } QSizeF QskSkinHintTableEditor::strutSize( QskAspect aspect ) const @@ -293,10 +293,10 @@ void QskSkinHintTableEditor::setMargin( QskAspect aspect, setMetricHint( aspectMargin( aspect ), margins, combination ); } -void QskSkinHintTableEditor::removeMargin( +bool QskSkinHintTableEditor::removeMargin( QskAspect aspect, QskStateCombination combination ) { - removeMetricHint( aspectMargin( aspect ), combination ); + return removeMetricHint( aspectMargin( aspect ), combination ); } QskMargins QskSkinHintTableEditor::margin( QskAspect aspect ) const @@ -319,10 +319,10 @@ void QskSkinHintTableEditor::setPadding( QskAspect aspect, setMetricHint( aspectPadding( aspect ), padding, combination ); } -void QskSkinHintTableEditor::removePadding( +bool QskSkinHintTableEditor::removePadding( QskAspect aspect, QskStateCombination combination ) { - removeMetricHint( aspectPadding( aspect ), combination ); + return removeMetricHint( aspectPadding( aspect ), combination ); } QskMargins QskSkinHintTableEditor::padding( QskAspect aspect ) const @@ -336,10 +336,10 @@ void QskSkinHintTableEditor::setSpacing( setMetricHint( aspectSpacing( aspect ), spacing, combination ); } -void QskSkinHintTableEditor::removeSpacing( +bool QskSkinHintTableEditor::removeSpacing( QskAspect aspect, QskStateCombination combination ) { - removeMetricHint( aspectSpacing( aspect ), combination ); + return removeMetricHint( aspectSpacing( aspect ), combination ); } qreal QskSkinHintTableEditor::spacing( QskAspect aspect ) const @@ -354,7 +354,7 @@ void QskSkinHintTableEditor::setAlignment( static_cast< int >( alignment ), combination ); } -void QskSkinHintTableEditor::removeAlignment( +bool QskSkinHintTableEditor::removeAlignment( QskAspect aspect, QskStateCombination combination ) { return removeFlagHint( aspectAlignment( aspect ), combination ); @@ -371,7 +371,7 @@ void QskSkinHintTableEditor::setFontRole( setFlagHint( aspectFontRole( aspect ), fontRole, combination ); } -void QskSkinHintTableEditor::removeFontRole( +bool QskSkinHintTableEditor::removeFontRole( QskAspect aspect, QskStateCombination combination ) { return removeFlagHint( aspectFontRole( aspect ), combination ); @@ -388,7 +388,7 @@ void QskSkinHintTableEditor::setGraphicRole( setFlagHint( aspectGraphicRole( aspect ), graphicRole, combination ); } -void QskSkinHintTableEditor::removeGraphicRole( +bool QskSkinHintTableEditor::removeGraphicRole( QskAspect aspect, QskStateCombination combination ) { return removeFlagHint( aspectGraphicRole( aspect ), combination ); @@ -421,7 +421,7 @@ void QskSkinHintTableEditor::setBoxShape( setMetricHint( aspectShape( aspect ), shape, combination ); } -void QskSkinHintTableEditor::removeBoxShape( +bool QskSkinHintTableEditor::removeBoxShape( QskAspect aspect, QskStateCombination combination ) { return removeMetricHint( aspectShape( aspect ), combination ); @@ -453,7 +453,7 @@ void QskSkinHintTableEditor::setBoxBorderMetrics( setMetricHint( aspectBorder( aspect ), borderMetrics, combination ); } -void QskSkinHintTableEditor::removeBoxBorderMetric( +bool QskSkinHintTableEditor::removeBoxBorderMetric( QskAspect aspect, QskStateCombination combination ) { return removeMetricHint( aspectBorder( aspect ), combination ); @@ -480,7 +480,7 @@ void QskSkinHintTableEditor::setBoxBorderColors(QskAspect aspect, combination ); } -void QskSkinHintTableEditor::removeBoxBorderColors( +bool QskSkinHintTableEditor::removeBoxBorderColors( QskAspect aspect, QskStateCombination combination ) { return removeColorHint( aspectBorder( aspect ), combination ); @@ -504,7 +504,7 @@ void QskSkinHintTableEditor::setArcMetrics( QskAspect aspect, setMetricHint( aspectShape( aspect ), arcMetrics, combination ); } -void QskSkinHintTableEditor::removeArcMetrics( QskAspect aspect, +bool QskSkinHintTableEditor::removeArcMetrics( QskAspect aspect, QskStateCombination combination ) { return removeMetricHint( aspectShape( aspect ), combination ); diff --git a/src/controls/QskSkinHintTableEditor.h b/src/controls/QskSkinHintTableEditor.h index a6845d35..ce1b25cc 100644 --- a/src/controls/QskSkinHintTableEditor.h +++ b/src/controls/QskSkinHintTableEditor.h @@ -63,7 +63,7 @@ class QSK_EXPORT QskSkinHintTableEditor template< typename T > void setFlagHint( QskAspect, const T&, QskStateCombination = QskStateCombination() ); - void removeFlagHint( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeFlagHint( QskAspect, QskStateCombination = QskStateCombination() ); QVariant flagHint( QskAspect ) const; template< typename T > T flagHint( QskAspect ) const; @@ -76,7 +76,7 @@ class QSK_EXPORT QskSkinHintTableEditor template< typename T > void setMetricHint( QskAspect, const T&, QskStateCombination = QskStateCombination() ); - void removeMetricHint( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeMetricHint( QskAspect, QskStateCombination = QskStateCombination() ); QVariant metricHint( QskAspect ) const; template< typename T > T metricHint( QskAspect ) const; @@ -89,7 +89,7 @@ class QSK_EXPORT QskSkinHintTableEditor template< typename T > void setColorHint( QskAspect, const T&, QskStateCombination = QskStateCombination() ); - void removeColorHint( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeColorHint( QskAspect, QskStateCombination = QskStateCombination() ); QVariant colorHint( QskAspect ) const; template< typename T > T colorHint( QskAspect ) const; @@ -126,7 +126,7 @@ class QSK_EXPORT QskSkinHintTableEditor void setPosition( QskAspect, qreal, QskStateCombination = QskStateCombination() ); - void removePosition( QskAspect, QskStateCombination = QskStateCombination() ); + bool removePosition( QskAspect, QskStateCombination = QskStateCombination() ); qreal position( QskAspect ) const; @@ -138,7 +138,7 @@ class QSK_EXPORT QskSkinHintTableEditor void setStrutSize( QskAspect, qreal width, qreal height, QskStateCombination = QskStateCombination() ); - void removeStrutSize( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeStrutSize( QskAspect, QskStateCombination = QskStateCombination() ); QSizeF strutSize( QskAspect ) const; @@ -151,7 +151,7 @@ class QSK_EXPORT QskSkinHintTableEditor qreal left, qreal top, qreal right, qreal bottom, QskStateCombination = QskStateCombination() ); - void removeMargin( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeMargin( QskAspect, QskStateCombination = QskStateCombination() ); QskMargins margin( QskAspect ) const; @@ -164,32 +164,32 @@ class QSK_EXPORT QskSkinHintTableEditor qreal left, qreal top, qreal right, qreal bottom, QskStateCombination = QskStateCombination() ); - void removePadding( QskAspect, QskStateCombination = QskStateCombination() ); + bool removePadding( QskAspect, QskStateCombination = QskStateCombination() ); QskMargins padding( QskAspect ) const; // spacing void setSpacing( QskAspect, qreal, QskStateCombination = QskStateCombination() ); - void removeSpacing( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeSpacing( QskAspect, QskStateCombination = QskStateCombination() ); qreal spacing( QskAspect ) const; // alignment void setAlignment( QskAspect, Qt::Alignment, QskStateCombination = QskStateCombination() ); - void removeAlignment( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeAlignment( QskAspect, QskStateCombination = QskStateCombination() ); Qt::Alignment alignment( QskAspect ) const; // fontRole void setFontRole( QskAspect, int, QskStateCombination = QskStateCombination() ); - void removeFontRole( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeFontRole( QskAspect, QskStateCombination = QskStateCombination() ); int fontRole( QskAspect ) const; // graphicRole void setGraphicRole( QskAspect, int, QskStateCombination = QskStateCombination() ); - void removeGraphicRole( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeGraphicRole( QskAspect, QskStateCombination = QskStateCombination() ); int graphicRole( QskAspect ) const; // boxShape @@ -202,7 +202,7 @@ class QSK_EXPORT QskSkinHintTableEditor void setBoxShape( QskAspect, const QskBoxShapeMetrics&, QskStateCombination = QskStateCombination() ); - void removeBoxShape( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeBoxShape( QskAspect, QskStateCombination = QskStateCombination() ); QskBoxShapeMetrics boxShape( QskAspect ) const; @@ -217,7 +217,7 @@ class QSK_EXPORT QskSkinHintTableEditor void setBoxBorderMetrics( QskAspect, const QskBoxBorderMetrics&, QskStateCombination = QskStateCombination() ); - void removeBoxBorderMetric( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeBoxBorderMetric( QskAspect, QskStateCombination = QskStateCombination() ); QskBoxBorderMetrics boxBorderMetrics( QskAspect ) const; @@ -231,7 +231,7 @@ class QSK_EXPORT QskSkinHintTableEditor const QskGradient& right, const QskGradient& bottom, QskStateCombination = QskStateCombination() ); - void removeBoxBorderColors( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeBoxBorderColors( QskAspect, QskStateCombination = QskStateCombination() ); QskBoxBorderColors boxBorderColors( QskAspect ) const; // arcMetrics @@ -241,7 +241,7 @@ class QSK_EXPORT QskSkinHintTableEditor void setArcMetrics( QskAspect, const QskArcMetrics&, QskStateCombination = QskStateCombination() ); - void removeArcMetrics( QskAspect, QskStateCombination = QskStateCombination() ); + bool removeArcMetrics( QskAspect, QskStateCombination = QskStateCombination() ); QskArcMetrics arcMetrics( QskAspect ) const; @@ -294,10 +294,10 @@ inline void QskSkinHintTableEditor::setFlagHint( setHint( aspect | QskAspect::Flag, hint, combination ); } -inline void QskSkinHintTableEditor::removeFlagHint( +inline bool QskSkinHintTableEditor::removeFlagHint( QskAspect aspect, QskStateCombination combination ) { - removeHint( aspect | QskAspect::Flag, combination ); + return removeHint( aspect | QskAspect::Flag, combination ); } inline QVariant QskSkinHintTableEditor::flagHint( QskAspect aspect ) const @@ -326,10 +326,10 @@ inline void QskSkinHintTableEditor::setMetricHint( setHint( aspect | QskAspect::Metric, hint, combination ); } -inline void QskSkinHintTableEditor::removeMetricHint( +inline bool QskSkinHintTableEditor::removeMetricHint( QskAspect aspect, QskStateCombination combination ) { - removeHint( aspect | QskAspect::Metric, combination ); + return removeHint( aspect | QskAspect::Metric, combination ); } inline QVariant QskSkinHintTableEditor::metricHint( QskAspect aspect ) const @@ -358,10 +358,10 @@ inline void QskSkinHintTableEditor::setColorHint( setHint( aspect | QskAspect::Color, hint, combination ); } -inline void QskSkinHintTableEditor::removeColorHint( +inline bool QskSkinHintTableEditor::removeColorHint( QskAspect aspect, QskStateCombination combination ) { - removeHint( aspect | QskAspect::Color, combination ); + return removeHint( aspect | QskAspect::Color, combination ); } inline QVariant QskSkinHintTableEditor::colorHint( QskAspect aspect ) const