@@ -108,11 +108,11 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
108
108
connect ( mBottomMarginSpinBox , SIGNAL ( valueChanged ( double ) ), this , SLOT ( resizeMarginsChanged () ) );
109
109
connect ( mLeftMarginSpinBox , SIGNAL ( valueChanged ( double ) ), this , SLOT ( resizeMarginsChanged () ) );
110
110
111
- connect ( mPaperSizeDDBtn , &QgsDataDefinedButtonV2 ::activated, mPaperSizeComboBox , &QComboBox::setDisabled );
112
- connect ( mPaperWidthDDBtn , &QgsDataDefinedButtonV2 ::activated, mPaperWidthDoubleSpinBox , &QgsDoubleSpinBox::setDisabled );
113
- connect ( mPaperHeightDDBtn , &QgsDataDefinedButtonV2 ::activated, mPaperHeightDoubleSpinBox , &QgsDoubleSpinBox::setDisabled );
114
- connect ( mNumPagesDDBtn , &QgsDataDefinedButtonV2 ::activated, mNumPagesSpinBox , &QgsSpinBox::setDisabled );
115
- connect ( mPaperOrientationDDBtn , &QgsDataDefinedButtonV2 ::activated, mPaperOrientationComboBox , &QComboBox::setDisabled );
111
+ connect ( mPaperSizeDDBtn , &QgsPropertyOverrideButton ::activated, mPaperSizeComboBox , &QComboBox::setDisabled );
112
+ connect ( mPaperWidthDDBtn , &QgsPropertyOverrideButton ::activated, mPaperWidthDoubleSpinBox , &QgsDoubleSpinBox::setDisabled );
113
+ connect ( mPaperHeightDDBtn , &QgsPropertyOverrideButton ::activated, mPaperHeightDoubleSpinBox , &QgsDoubleSpinBox::setDisabled );
114
+ connect ( mNumPagesDDBtn , &QgsPropertyOverrideButton ::activated, mNumPagesSpinBox , &QgsSpinBox::setDisabled );
115
+ connect ( mPaperOrientationDDBtn , &QgsPropertyOverrideButton ::activated, mPaperOrientationComboBox , &QComboBox::setDisabled );
116
116
117
117
connect ( mReferenceMapComboBox , &QgsComposerItemComboBox::itemChanged, this , &QgsCompositionWidget::referenceMapChanged );
118
118
@@ -149,11 +149,11 @@ void QgsCompositionWidget::populateDataDefinedButtons()
149
149
vl = atlas->coverageLayer ();
150
150
}
151
151
152
- Q_FOREACH ( QgsDataDefinedButtonV2 * button, findChildren< QgsDataDefinedButtonV2 * >() )
152
+ Q_FOREACH ( QgsPropertyOverrideButton * button, findChildren< QgsPropertyOverrideButton * >() )
153
153
{
154
154
button->blockSignals ( true );
155
155
button->registerExpressionContextGenerator ( mComposition );
156
- connect ( button, &QgsDataDefinedButtonV2 ::changed, this , &QgsCompositionWidget::updateDataDefinedProperty );
156
+ connect ( button, &QgsPropertyOverrideButton ::changed, this , &QgsCompositionWidget::updateDataDefinedProperty );
157
157
}
158
158
159
159
mPaperSizeDDBtn ->init ( QgsComposerObject::PresetPaperSize, mComposition ->dataDefinedProperties (), QgsComposerObject::PROPERTY_DEFINITIONS, vl );
@@ -165,7 +165,7 @@ void QgsCompositionWidget::populateDataDefinedButtons()
165
165
// initial state of controls - disable related controls when dd buttons are active
166
166
mPaperSizeComboBox ->setEnabled ( !mPaperSizeDDBtn ->isActive () );
167
167
168
- Q_FOREACH ( QgsDataDefinedButtonV2 * button, findChildren< QgsDataDefinedButtonV2 * >() )
168
+ Q_FOREACH ( QgsPropertyOverrideButton * button, findChildren< QgsPropertyOverrideButton * >() )
169
169
{
170
170
button->blockSignals ( false );
171
171
}
@@ -216,7 +216,7 @@ void QgsCompositionWidget::cleanUpStyleSelector( QgsPanelWidget* container )
216
216
217
217
void QgsCompositionWidget::updateDataDefinedProperty ()
218
218
{
219
- QgsDataDefinedButtonV2 * ddButton = qobject_cast<QgsDataDefinedButtonV2 *>( sender () );
219
+ QgsPropertyOverrideButton * ddButton = qobject_cast<QgsPropertyOverrideButton *>( sender () );
220
220
if ( !ddButton || !mComposition )
221
221
{
222
222
return ;
0 commit comments