Skip to content
Permalink
Browse files

Fix warnings

  • Loading branch information
nyalldawson committed Sep 21, 2018
1 parent 8e1c437 commit 0e64d9295b7d7dcf0555d4ef84e8b1759cb09f41
Showing with 9 additions and 9 deletions.
  1. +9 −9 src/app/layout/qgslayoutmapgridwidget.cpp
@@ -747,22 +747,22 @@ void QgsLayoutMapGridWidget::mCheckGridBottomSide_toggled( bool checked )

void QgsLayoutMapGridWidget::mFrameDivisionsLeftComboBox_currentIndexChanged( int index )
{
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Left, ( QgsLayoutItemMapGrid::DisplayMode ) mFrameDivisionsLeftComboBox->itemData( index ).toInt() );
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Left, static_cast< QgsLayoutItemMapGrid::DisplayMode >( mFrameDivisionsLeftComboBox->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mFrameDivisionsRightComboBox_currentIndexChanged( int index )
{
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Right, ( QgsLayoutItemMapGrid::DisplayMode ) mFrameDivisionsRightComboBox->itemData( index ).toInt() );
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Right, static_cast< QgsLayoutItemMapGrid::DisplayMode >( mFrameDivisionsRightComboBox->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mFrameDivisionsTopComboBox_currentIndexChanged( int index )
{
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Top, ( QgsLayoutItemMapGrid::DisplayMode ) mFrameDivisionsTopComboBox->itemData( index ).toInt() );
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Top, static_cast< QgsLayoutItemMapGrid::DisplayMode >( mFrameDivisionsTopComboBox->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mFrameDivisionsBottomComboBox_currentIndexChanged( int index )
{
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Bottom, ( QgsLayoutItemMapGrid::DisplayMode ) mFrameDivisionsBottomComboBox->itemData( index ).toInt() );
handleChangedFrameDisplay( QgsLayoutItemMapGrid::Bottom, static_cast< QgsLayoutItemMapGrid::DisplayMode >( mFrameDivisionsBottomComboBox->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mGridFramePenSizeSpinBox_valueChanged( double d )
@@ -1061,22 +1061,22 @@ void QgsLayoutMapGridWidget::mAnnotationPositionBottomComboBox_currentIndexChang

void QgsLayoutMapGridWidget::mAnnotationDirectionComboBoxLeft_currentIndexChanged( int index )
{
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Left, ( QgsLayoutItemMapGrid::AnnotationDirection ) mAnnotationDirectionComboBoxLeft->itemData( index ).toInt() );
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Left, static_cast< QgsLayoutItemMapGrid::AnnotationDirection >( mAnnotationDirectionComboBoxLeft->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mAnnotationDirectionComboBoxRight_currentIndexChanged( int index )
{
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Right, ( QgsLayoutItemMapGrid::AnnotationDirection ) mAnnotationDirectionComboBoxRight->itemData( index ).toInt() );
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Right, static_cast< QgsLayoutItemMapGrid::AnnotationDirection >( mAnnotationDirectionComboBoxRight->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mAnnotationDirectionComboBoxTop_currentIndexChanged( int index )
{
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Top, ( QgsLayoutItemMapGrid::AnnotationDirection ) mAnnotationDirectionComboBoxTop->itemData( index ).toInt() );
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Top, static_cast< QgsLayoutItemMapGrid::AnnotationDirection >( mAnnotationDirectionComboBoxTop->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mAnnotationDirectionComboBoxBottom_currentIndexChanged( int index )
{
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Bottom, ( QgsLayoutItemMapGrid::AnnotationDirection ) mAnnotationDirectionComboBoxBottom->itemData( index ).toInt() );
handleChangedAnnotationDirection( QgsLayoutItemMapGrid::Bottom, static_cast< QgsLayoutItemMapGrid::AnnotationDirection >( mAnnotationDirectionComboBoxBottom->itemData( index ).toInt() ) );
}

void QgsLayoutMapGridWidget::mDistanceToMapFrameSpinBox_valueChanged( double d )
@@ -1155,7 +1155,7 @@ void QgsLayoutMapGridWidget::mAnnotationFormatComboBox_currentIndexChanged( int

mMap->beginCommand( tr( "Change Annotation Format" ) );

mMapGrid->setAnnotationFormat( ( QgsLayoutItemMapGrid::AnnotationFormat )mAnnotationFormatComboBox->itemData( index ).toInt() );
mMapGrid->setAnnotationFormat( static_cast< QgsLayoutItemMapGrid::AnnotationFormat >( mAnnotationFormatComboBox->itemData( index ).toInt() ) );
mAnnotationFormatButton->setEnabled( mMapGrid->annotationFormat() == QgsLayoutItemMapGrid::CustomFormat );

mMap->updateBoundingRect();

0 comments on commit 0e64d92

Please sign in to comment.
You can’t perform that action at this time.