@@ -932,7 +932,7 @@ bool QgsLayoutItem::excludeFromExports() const
932932void QgsLayoutItem::setExcludeFromExports ( bool exclude )
933933{
934934 mExcludeFromExports = exclude;
935- refreshDataDefinedProperty ( QgsLayoutObject::ExcludeFromExports );
935+ refreshDataDefinedProperty ( QgsLayoutObject::DataDefinedProperty:: ExcludeFromExports );
936936}
937937
938938bool QgsLayoutItem::containsAdvancedEffects () const
@@ -1005,15 +1005,15 @@ QgsLayoutPoint QgsLayoutItem::applyDataDefinedPosition( const QgsLayoutPoint &po
10051005 }
10061006
10071007 const QgsExpressionContext context = createExpressionContext ();
1008- const double evaluatedX = mDataDefinedProperties .valueAsDouble ( QgsLayoutObject::PositionX, context, position.x () );
1009- const double evaluatedY = mDataDefinedProperties .valueAsDouble ( QgsLayoutObject::PositionY, context, position.y () );
1008+ const double evaluatedX = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: PositionX ) , context, position.x () );
1009+ const double evaluatedY = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: PositionY ) , context, position.y () );
10101010 return QgsLayoutPoint ( evaluatedX, evaluatedY, position.units () );
10111011}
10121012
10131013void QgsLayoutItem::applyDataDefinedOrientation ( double &width, double &height, const QgsExpressionContext &context )
10141014{
10151015 bool ok = false ;
1016- const QString orientationString = mDataDefinedProperties .valueAsString ( QgsLayoutObject::PaperOrientation, context, QString (), &ok );
1016+ const QString orientationString = mDataDefinedProperties .valueAsString ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: PaperOrientation ) , context, QString (), &ok );
10171017 if ( ok && !orientationString.isEmpty () )
10181018 {
10191019 const QgsLayoutItemPage::Orientation orientation = QgsLayoutUtils::decodePaperOrientation ( orientationString, ok );
@@ -1048,17 +1048,17 @@ QgsLayoutSize QgsLayoutItem::applyDataDefinedSize( const QgsLayoutSize &size )
10481048 return size;
10491049 }
10501050
1051- if ( !mDataDefinedProperties .isActive ( QgsLayoutObject::PresetPaperSize ) &&
1052- !mDataDefinedProperties .isActive ( QgsLayoutObject::ItemWidth ) &&
1053- !mDataDefinedProperties .isActive ( QgsLayoutObject::ItemHeight ) &&
1054- !mDataDefinedProperties .isActive ( QgsLayoutObject::PaperOrientation ) )
1051+ if ( !mDataDefinedProperties .isActive ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: PresetPaperSize ) ) &&
1052+ !mDataDefinedProperties .isActive ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ItemWidth ) ) &&
1053+ !mDataDefinedProperties .isActive ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ItemHeight ) ) &&
1054+ !mDataDefinedProperties .isActive ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: PaperOrientation ) ) )
10551055 return size;
10561056
10571057
10581058 const QgsExpressionContext context = createExpressionContext ();
10591059
10601060 // lowest priority is page size
1061- const QString pageSize = mDataDefinedProperties .valueAsString ( QgsLayoutObject::PresetPaperSize, context );
1061+ const QString pageSize = mDataDefinedProperties .valueAsString ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: PresetPaperSize ) , context );
10621062 QgsPageSize matchedSize;
10631063 double evaluatedWidth = size.width ();
10641064 double evaluatedHeight = size.height ();
@@ -1070,8 +1070,8 @@ QgsLayoutSize QgsLayoutItem::applyDataDefinedSize( const QgsLayoutSize &size )
10701070 }
10711071
10721072 // highest priority is dd width/height
1073- evaluatedWidth = mDataDefinedProperties .valueAsDouble ( QgsLayoutObject::ItemWidth, context, evaluatedWidth );
1074- evaluatedHeight = mDataDefinedProperties .valueAsDouble ( QgsLayoutObject::ItemHeight, context, evaluatedHeight );
1073+ evaluatedWidth = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ItemWidth ) , context, evaluatedWidth );
1074+ evaluatedHeight = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ItemHeight ) , context, evaluatedHeight );
10751075
10761076 // which is finally overwritten by data defined orientation
10771077 applyDataDefinedOrientation ( evaluatedWidth, evaluatedHeight, context );
@@ -1105,7 +1105,7 @@ double QgsLayoutItem::applyDataDefinedRotation( const double rotation )
11051105 }
11061106
11071107 const QgsExpressionContext context = createExpressionContext ();
1108- const double evaluatedRotation = mDataDefinedProperties .valueAsDouble ( QgsLayoutObject::ItemRotation, context, rotation );
1108+ const double evaluatedRotation = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ItemRotation ) , context, rotation );
11091109 return evaluatedRotation;
11101110}
11111111
@@ -1114,41 +1114,41 @@ void QgsLayoutItem::refreshDataDefinedProperty( const QgsLayoutObject::DataDefin
11141114 // update data defined properties and update item to match
11151115
11161116 // evaluate width and height first, since they may affect position if non-top-left reference point set
1117- if ( property == QgsLayoutObject::ItemWidth || property == QgsLayoutObject::ItemHeight ||
1118- property == QgsLayoutObject::AllProperties )
1117+ if ( property == QgsLayoutObject::DataDefinedProperty:: ItemWidth || property == QgsLayoutObject::DataDefinedProperty ::ItemHeight ||
1118+ property == QgsLayoutObject::DataDefinedProperty:: AllProperties )
11191119 {
11201120 refreshItemSize ();
11211121 }
1122- if ( property == QgsLayoutObject::PositionX || property == QgsLayoutObject::PositionY ||
1123- property == QgsLayoutObject::AllProperties )
1122+ if ( property == QgsLayoutObject::DataDefinedProperty:: PositionX || property == QgsLayoutObject::DataDefinedProperty ::PositionY ||
1123+ property == QgsLayoutObject::DataDefinedProperty:: AllProperties )
11241124 {
11251125 refreshItemPosition ();
11261126 }
1127- if ( property == QgsLayoutObject::ItemRotation || property == QgsLayoutObject::AllProperties )
1127+ if ( property == QgsLayoutObject::DataDefinedProperty:: ItemRotation || property == QgsLayoutObject::DataDefinedProperty ::AllProperties )
11281128 {
11291129 refreshItemRotation ();
11301130 }
1131- if ( property == QgsLayoutObject::Opacity || property == QgsLayoutObject::AllProperties )
1131+ if ( property == QgsLayoutObject::DataDefinedProperty:: Opacity || property == QgsLayoutObject::DataDefinedProperty ::AllProperties )
11321132 {
11331133 refreshOpacity ( false );
11341134 }
1135- if ( property == QgsLayoutObject::FrameColor || property == QgsLayoutObject::AllProperties )
1135+ if ( property == QgsLayoutObject::DataDefinedProperty:: FrameColor || property == QgsLayoutObject::DataDefinedProperty ::AllProperties )
11361136 {
11371137 refreshFrame ( false );
11381138 }
1139- if ( property == QgsLayoutObject::BackgroundColor || property == QgsLayoutObject::AllProperties )
1139+ if ( property == QgsLayoutObject::DataDefinedProperty:: BackgroundColor || property == QgsLayoutObject::DataDefinedProperty ::AllProperties )
11401140 {
11411141 refreshBackgroundColor ( false );
11421142 }
1143- if ( property == QgsLayoutObject::BlendMode || property == QgsLayoutObject::AllProperties )
1143+ if ( property == QgsLayoutObject::DataDefinedProperty:: BlendMode || property == QgsLayoutObject::DataDefinedProperty ::AllProperties )
11441144 {
11451145 refreshBlendMode ();
11461146 }
1147- if ( property == QgsLayoutObject::ExcludeFromExports || property == QgsLayoutObject::AllProperties )
1147+ if ( property == QgsLayoutObject::DataDefinedProperty:: ExcludeFromExports || property == QgsLayoutObject::DataDefinedProperty ::AllProperties )
11481148 {
11491149 const bool exclude = mExcludeFromExports ;
11501150 // data defined exclude from exports set?
1151- mEvaluatedExcludeFromExports = mDataDefinedProperties .valueAsBool ( QgsLayoutObject::ExcludeFromExports, createExpressionContext (), exclude );
1151+ mEvaluatedExcludeFromExports = mDataDefinedProperties .valueAsBool ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ExcludeFromExports ) , createExpressionContext (), exclude );
11521152 }
11531153
11541154 update ();
@@ -1446,7 +1446,7 @@ void QgsLayoutItem::refreshItemRotation( QPointF *origin )
14461446 double r = mItemRotation ;
14471447
14481448 // data defined rotation set?
1449- r = mDataDefinedProperties .valueAsDouble ( QgsLayoutItem:: ItemRotation, createExpressionContext (), r );
1449+ r = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: ItemRotation ) , createExpressionContext (), r );
14501450
14511451 if ( qgsDoubleNear ( r, rotation () ) && !origin )
14521452 {
@@ -1483,7 +1483,7 @@ void QgsLayoutItem::refreshItemRotation( QPointF *origin )
14831483void QgsLayoutItem::refreshOpacity ( bool updateItem )
14841484{
14851485 // data defined opacity set?
1486- const double opacity = mDataDefinedProperties .valueAsDouble ( QgsLayoutObject::Opacity, createExpressionContext (), mOpacity * 100.0 );
1486+ const double opacity = mDataDefinedProperties .valueAsDouble ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: Opacity ) , createExpressionContext (), mOpacity * 100.0 );
14871487
14881488 // Set the QGraphicItem's opacity
14891489 mEvaluatedOpacity = opacity / 100.0 ;
@@ -1511,7 +1511,7 @@ void QgsLayoutItem::refreshFrame( bool updateItem )
15111511
15121512 // data defined stroke color set?
15131513 bool ok = false ;
1514- const QColor frameColor = mDataDefinedProperties .valueAsColor ( QgsLayoutObject::FrameColor, createExpressionContext (), mFrameColor , &ok );
1514+ const QColor frameColor = mDataDefinedProperties .valueAsColor ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: FrameColor ) , createExpressionContext (), mFrameColor , &ok );
15151515 QPen itemPen;
15161516 if ( ok )
15171517 {
@@ -1546,7 +1546,7 @@ void QgsLayoutItem::refreshBackgroundColor( bool updateItem )
15461546{
15471547 // data defined fill color set?
15481548 bool ok = false ;
1549- const QColor backgroundColor = mDataDefinedProperties .valueAsColor ( QgsLayoutObject::BackgroundColor, createExpressionContext (), mBackgroundColor , &ok );
1549+ const QColor backgroundColor = mDataDefinedProperties .valueAsColor ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: BackgroundColor ) , createExpressionContext (), mBackgroundColor , &ok );
15501550 if ( ok )
15511551 {
15521552 setBrush ( QBrush ( backgroundColor, Qt::SolidPattern ) );
@@ -1567,7 +1567,7 @@ void QgsLayoutItem::refreshBlendMode()
15671567
15681568 // data defined blend mode set?
15691569 bool ok = false ;
1570- const QString blendStr = mDataDefinedProperties .valueAsString ( QgsLayoutObject::BlendMode, createExpressionContext (), QString (), &ok );
1570+ const QString blendStr = mDataDefinedProperties .valueAsString ( static_cast < int >( QgsLayoutObject::DataDefinedProperty:: BlendMode ) , createExpressionContext (), QString (), &ok );
15711571 if ( ok && !blendStr.isEmpty () )
15721572 {
15731573 const QString blendstr = blendStr.trimmed ();
0 commit comments