@@ -111,7 +111,8 @@ void QgsTextFormatWidget::initWidget()
111111 mPreviewScaleComboBox ->setShowCurrentScaleButton ( true );
112112 connect ( mPreviewScaleComboBox , &QgsScaleWidget::scaleChanged, this , &QgsTextFormatWidget::previewScaleChanged );
113113
114- Q_FOREACH ( QgsUnitSelectionWidget *unitWidget, findChildren<QgsUnitSelectionWidget *>() )
114+ const auto unitWidgets = findChildren<QgsUnitSelectionWidget *>();
115+ for ( QgsUnitSelectionWidget *unitWidget : unitWidgets )
115116 {
116117 unitWidget->setMapCanvas ( mMapCanvas );
117118 }
@@ -259,15 +260,13 @@ void QgsTextFormatWidget::initWidget()
259260
260261 // Global settings group for groupboxes' saved/restored collapsed state
261262 // maintains state across different dialogs
262- Q_FOREACH ( QgsCollapsibleGroupBox *grpbox, findChildren<QgsCollapsibleGroupBox *>() )
263+ const auto groupBoxes = findChildren<QgsCollapsibleGroupBox *>();
264+ for ( QgsCollapsibleGroupBox *grpbox : groupBoxes )
263265 {
264266 grpbox->setSettingGroup ( QStringLiteral ( " mAdvLabelingDlg" ) );
265267 }
266268
267- connect ( groupBox_mPreview,
268- &QgsCollapsibleGroupBoxBasic::collapsedStateChanged,
269- this ,
270- &QgsTextFormatWidget::collapseSample );
269+ connect ( groupBox_mPreview, &QgsCollapsibleGroupBoxBasic::collapsedStateChanged, this , &QgsTextFormatWidget::collapseSample );
271270
272271 // get rid of annoying outer focus rect on Mac
273272 mLabelingOptionsListWidget ->setAttribute ( Qt::WA_MacShowFocusRect, false );
@@ -304,7 +303,6 @@ void QgsTextFormatWidget::initWidget()
304303
305304 setDockMode ( false );
306305
307-
308306 QList<QWidget *> widgets;
309307 widgets << btnBufferColor
310308 << btnTextColor
@@ -1105,8 +1103,7 @@ void QgsTextFormatWidget::mFontSizeSpinBox_valueChanged( double d )
11051103
11061104void QgsTextFormatWidget::mFontCapitalsComboBox_currentIndexChanged ( int index )
11071105{
1108- int capitalsindex = mFontCapitalsComboBox ->itemData ( index ).toUInt ();
1109- mRefFont .setCapitalization ( ( QFont::Capitalization ) capitalsindex );
1106+ mRefFont .setCapitalization ( mFontCapitalsComboBox ->itemData ( index ).value <QFont::Capitalization>() );
11101107 updateFont ( mRefFont );
11111108}
11121109
0 commit comments