Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix build
  • Loading branch information
nyalldawson committed Dec 4, 2019
1 parent 02fffdc commit 7e6c6e7
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
3 changes: 0 additions & 3 deletions src/gui/qgslabelinggui.cpp
Expand Up @@ -336,8 +336,6 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )

mObstacleSettings = mSettings.obstacleSettings();

mPolygonObstacleTypeFrame->setEnabled( mSettings.obstacleSettings().isObstacle() );
mObstaclePriorityFrame->setEnabled( mSettings.obstacleSettings().isObstacle() );
chkLabelPerFeaturePart->setChecked( mSettings.labelPerPart );
mPalShowAllLabelsForLayerChkBx->setChecked( mSettings.displayAll );
chkMergeLines->setChecked( mSettings.mergeLines );
Expand Down Expand Up @@ -770,7 +768,6 @@ void QgsLabelingGui::updateGeometryTypeBasedWidgets()
chkMergeLines->setVisible( geometryType == QgsWkbTypes::LineGeometry );
mDirectSymbolsFrame->setVisible( geometryType == QgsWkbTypes::LineGeometry );
mMinSizeFrame->setVisible( geometryType != QgsWkbTypes::PointGeometry );
mPolygonObstacleTypeFrame->setVisible( geometryType == QgsWkbTypes::PolygonGeometry );
mPolygonFeatureOptionsFrame->setVisible( geometryType == QgsWkbTypes::PolygonGeometry );


Expand Down
7 changes: 0 additions & 7 deletions src/gui/qgstextformatwidget.cpp
Expand Up @@ -90,7 +90,6 @@ void QgsTextFormatWidget::initWidget()
connect( mPreviewBackgroundBtn, &QgsColorButton::colorChanged, this, &QgsTextFormatWidget::mPreviewBackgroundBtn_colorChanged );
connect( mDirectSymbLeftToolBtn, &QToolButton::clicked, this, &QgsTextFormatWidget::mDirectSymbLeftToolBtn_clicked );
connect( mDirectSymbRightToolBtn, &QToolButton::clicked, this, &QgsTextFormatWidget::mDirectSymbRightToolBtn_clicked );
connect( mChkNoObstacle, &QCheckBox::toggled, this, &QgsTextFormatWidget::mChkNoObstacle_toggled );
connect( chkLineOrientationDependent, &QCheckBox::toggled, this, &QgsTextFormatWidget::chkLineOrientationDependent_toggled );
connect( mToolButtonConfigureSubstitutes, &QToolButton::clicked, this, &QgsTextFormatWidget::mToolButtonConfigureSubstitutes_clicked );
connect( mKerningCheckBox, &QCheckBox::toggled, this, &QgsTextFormatWidget::kerningToggled );
Expand Down Expand Up @@ -1868,12 +1867,6 @@ void QgsTextFormatWidget::mDirectSymbRightToolBtn_clicked()
mDirectSymbRightLineEdit->setText( QString( dirSymb ) );
}

void QgsTextFormatWidget::mChkNoObstacle_toggled( bool active )
{
mPolygonObstacleTypeFrame->setEnabled( active );
mObstaclePriorityFrame->setEnabled( active );
}

void QgsTextFormatWidget::chkLineOrientationDependent_toggled( bool active )
{
if ( active )
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgstextformatwidget.h
Expand Up @@ -288,7 +288,6 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte
void mPreviewBackgroundBtn_colorChanged( const QColor &color );
void mDirectSymbLeftToolBtn_clicked();
void mDirectSymbRightToolBtn_clicked();
void mChkNoObstacle_toggled( bool active );
void chkLineOrientationDependent_toggled( bool active );
void mToolButtonConfigureSubstitutes_clicked();
void collapseSample( bool collapse );
Expand Down

0 comments on commit 7e6c6e7

Please sign in to comment.