Fix spelling

qgis · Dec 4, 2019 · d63714a · d63714a
1 parent 22ea01b
commit d63714a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/python/gui/auto_generated/qgslabelobstaclesettingswidget.sip.in b/python/gui/auto_generated/qgslabelobstaclesettingswidget.sip.in
@@ -29,7 +29,7 @@ Constructor for QgsLabelObstacleSettingsWidget.
 :param vl: associated vector layer
 %End
 
-    void setObstacleSettings( const QgsLabelObstacleSettings &settings );
+    void setSettings( const QgsLabelObstacleSettings &settings );
 %Docstring
 Sets the obstacle ``settings`` to show in the widget.
 

diff --git a/python/gui/auto_generated/qgslabelsettingswidgetbase.sip.in b/python/gui/auto_generated/qgslabelsettingswidgetbase.sip.in
@@ -13,7 +13,7 @@
 class QgsLabelSettingsWidgetBase : QgsPanelWidget, protected QgsExpressionContextGenerator
 {
 %Docstring
-Base class for widgets which allow customisation of label engine properties, such as label placement settings.
+Base class for widgets which allow customization of label engine properties, such as label placement settings.
 
 .. versionadded:: 3.12
 %End

diff --git a/src/gui/qgslabelinggui.cpp b/src/gui/qgslabelinggui.cpp
@@ -136,7 +136,7 @@ void QgsLabelingGui::showObstacleSettings()
 
   QgsLabelObstacleSettingsWidget *widget = new QgsLabelObstacleSettingsWidget( nullptr, mLayer );
   widget->setDataDefinedProperties( mDataDefinedProperties );
-  widget->setObstacleSettings( mObstacleSettings );
+  widget->setSettings( mObstacleSettings );
   widget->setGeometryType( mLayer ? mLayer->geometryType() : QgsWkbTypes::UnknownGeometry );
   widget->setContext( symbolContext );
 

diff --git a/src/gui/qgslabelobstaclesettingswidget.cpp b/src/gui/qgslabelobstaclesettingswidget.cpp
@@ -42,7 +42,7 @@ QgsLabelObstacleSettingsWidget::QgsLabelObstacleSettingsWidget( QWidget *parent,
 
 }
 
-void QgsLabelObstacleSettingsWidget::setObstacleSettings( const QgsLabelObstacleSettings &settings )
+void QgsLabelObstacleSettingsWidget::setSettings( const QgsLabelObstacleSettings &settings )
 {
   mBlockSignals = true;
   mObstacleFactorSlider->setValue( static_cast< int >( std::round( settings.factor() * 5 ) ) );

diff --git a/src/gui/qgslabelobstaclesettingswidget.h b/src/gui/qgslabelobstaclesettingswidget.h
@@ -46,7 +46,7 @@ class GUI_EXPORT QgsLabelObstacleSettingsWidget : public QgsLabelSettingsWidgetB
      *
      * \see settings()
      */
-    void setObstacleSettings( const QgsLabelObstacleSettings &settings );
+    void setSettings( const QgsLabelObstacleSettings &settings );
 
     /**
      * Returns the obstacle settings defined by the widget.

diff --git a/src/gui/qgslabelsettingswidgetbase.h b/src/gui/qgslabelsettingswidgetbase.h
@@ -31,7 +31,7 @@ class QgsPropertyOverrideButton;
 /**
  * \ingroup gui
  * \class QgsLabelSettingsWidgetBase
- * Base class for widgets which allow customisation of label engine properties, such as label placement settings.
+ * Base class for widgets which allow customization of label engine properties, such as label placement settings.
  * \since QGIS 3.12
  */
 class GUI_EXPORT QgsLabelSettingsWidgetBase : public QgsPanelWidget, protected QgsExpressionContextGenerator
@@ -115,7 +115,7 @@ class GUI_EXPORT QgsLabelSettingsWidgetBase : public QgsPanelWidget, protected Q
 
 /**
  * \ingroup gui
- * \class QgsLabelSettingsDialog
+ * \class QgsLabelSettingsWidgetDialog
  * A blocking dialog containing a QgsLabelSettingsWidgetBase.
  * \since QGIS 3.12
  */