Fix naming collision

qgis · Mar 13, 2019 · 46e3304 · 46e3304
1 parent 32fbf0a
commit 46e3304
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/python/gui/auto_generated/qgsscalecombobox.sip.in b/python/gui/auto_generated/qgsscalecombobox.sip.in
@@ -54,7 +54,7 @@ Returns true if the combo box is currently set to a "null" value.
 
 .. seealso:: :py:func:`setAllowNull`
 
-.. seealso:: :py:func:`clear`
+.. seealso:: :py:func:`setNull`
 
 .. versionadded:: 3.8
 %End
@@ -94,7 +94,7 @@ Sets whether the scale combobox can be set to a NULL value.
 
 .. seealso:: :py:func:`isNull`
 
-.. seealso:: :py:func:`clear`
+.. seealso:: :py:func:`setNull`
 
 .. versionadded:: 3.8
 %End
@@ -107,7 +107,7 @@ Returns ``True`` if the combobox can be set to a NULL value.
 
 .. seealso:: :py:func:`isNull`
 
-.. seealso:: :py:func:`clear`
+.. seealso:: :py:func:`setNull`
 
 .. versionadded:: 3.8
 %End
@@ -144,7 +144,7 @@ Any scale lower than the minimum scale will automatically be converted to the mi
 Except for 0 which is always allowed.
 %End
 
-    void clear();
+    void setNull();
 %Docstring
 Sets the combo box to the null value.
 

diff --git a/python/gui/auto_generated/qgsscalewidget.sip.in b/python/gui/auto_generated/qgsscalewidget.sip.in
@@ -82,7 +82,7 @@ Returns true if the widget is currently set to a "null" value.
 
 .. seealso:: :py:func:`setAllowNull`
 
-.. seealso:: :py:func:`clear`
+.. seealso:: :py:func:`setNull`
 
 .. versionadded:: 3.8
 %End
@@ -122,7 +122,7 @@ Sets whether the scale widget can be set to a NULL value.
 
 .. seealso:: :py:func:`isNull`
 
-.. seealso:: :py:func:`clear`
+.. seealso:: :py:func:`setNull`
 
 .. versionadded:: 3.8
 %End
@@ -135,7 +135,7 @@ Returns ``True`` if the widget can be set to a NULL value.
 
 .. seealso:: :py:func:`isNull`
 
-.. seealso:: :py:func:`clear`
+.. seealso:: :py:func:`setNull`
 
 .. versionadded:: 3.8
 %End
@@ -171,7 +171,7 @@ Any scale lower than the minimum scale will automatically be converted to the mi
 Except for 0 which is always allowed.
 %End
 
-    void clear();
+    void setNull();
 %Docstring
 Sets the widget to the null value.
 

diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
@@ -966,7 +966,7 @@ void QgsProcessingScaleWidgetWrapper::setWidgetValue( const QVariant &value, Qgs
   if ( mScaleWidget )
   {
     if ( mScaleWidget->allowNull() && !value.isValid() )
-      mScaleWidget->clear();
+      mScaleWidget->setNull();
     else
     {
       const double v = QgsProcessingParameters::parameterAsDouble( parameterDefinition(), value, context );

diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
@@ -281,7 +281,7 @@ void QgsScaleComboBox::setMinScale( double scale )
   }
 }
 
-void QgsScaleComboBox::clear()
+void QgsScaleComboBox::setNull()
 {
   if ( allowNull() )
     setScale( std::numeric_limits< double >::quiet_NaN() );

diff --git a/src/gui/qgsscalecombobox.h b/src/gui/qgsscalecombobox.h
@@ -63,7 +63,7 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
      * Returns true if the combo box is currently set to a "null" value.
      *
      * \see setAllowNull()
-     * \see clear()
+     * \see setNull()
      * \since QGIS 3.8
      */
     bool isNull() const;
@@ -97,7 +97,7 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
      * Sets whether the scale combobox can be set to a NULL value.
      * \see allowNull()
      * \see isNull()
-     * \see clear()
+     * \see setNull()
      * \since QGIS 3.8
      */
     void setAllowNull( bool allowNull );
@@ -106,7 +106,7 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
      * Returns TRUE if the combobox can be set to a NULL value.
      * \see setAllowNull()
      * \see isNull()
-     * \see clear()
+     * \see setNull()
      * \since QGIS 3.8
      */
     bool allowNull() const;
@@ -151,7 +151,7 @@ class GUI_EXPORT QgsScaleComboBox : public QComboBox
      * \see isNull()
      * \since QGIS 3.8
      */
-    void clear();
+    void setNull();
 
   protected:
     void showPopup() override;

diff --git a/src/gui/qgsscalewidget.cpp b/src/gui/qgsscalewidget.cpp
@@ -74,9 +74,9 @@ void QgsScaleWidget::setScaleFromCanvas()
   setScale( mCanvas->scale() );
 }
 
-void QgsScaleWidget::clear()
+void QgsScaleWidget::setNull()
 {
-  mScaleComboBox->clear();
+  mScaleComboBox->setNull();
 }
 
 void QgsScaleWidget::setScale( double scale )

diff --git a/src/gui/qgsscalewidget.h b/src/gui/qgsscalewidget.h
@@ -88,7 +88,7 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
      * Returns true if the widget is currently set to a "null" value.
      *
      * \see setAllowNull()
-     * \see clear()
+     * \see setNull()
      * \since QGIS 3.8
      */
     bool isNull() const;
@@ -122,7 +122,7 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
      * Sets whether the scale widget can be set to a NULL value.
      * \see allowNull()
      * \see isNull()
-     * \see clear()
+     * \see setNull()
      * \since QGIS 3.8
      */
     void setAllowNull( bool allowNull );
@@ -131,7 +131,7 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
      * Returns TRUE if the widget can be set to a NULL value.
      * \see setAllowNull()
      * \see isNull()
-     * \see clear()
+     * \see setNull()
      * \since QGIS 3.8
      */
     bool allowNull() const;
@@ -174,7 +174,7 @@ class GUI_EXPORT QgsScaleWidget : public QWidget
      * \see isNull()
      * \since QGIS 3.8
      */
-    void clear();
+    void setNull();
 
   signals:
 

diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp
@@ -192,7 +192,7 @@ void TestQgsScaleComboBox::allowNull()
 {
   s->setScale( 50 );
   QVERIFY( !s->allowNull() );
-  s->clear(); // no effect
+  s->setNull(); // no effect
   QCOMPARE( s->scale(), 50.0 );
   QVERIFY( !s->isNull() );
 
@@ -227,7 +227,7 @@ void TestQgsScaleComboBox::allowNull()
   enterScale( 0.02 );
   QCOMPARE( s->scale(), 50.0 );
   QCOMPARE( spyScaleChanged.count(), 4 );
-  s->clear();
+  s->setNull();
   QVERIFY( std::isnan( s->scale() ) );
   QCOMPARE( spyScaleChanged.count(), 5 );
   QVERIFY( s->lineEdit()->text().isEmpty() );

diff --git a/tests/src/python/test_qgsscalewidget.py b/tests/src/python/test_qgsscalewidget.py
@@ -51,7 +51,7 @@ def testNull(self):
 
         w.setScale(50)
         self.assertFalse(w.allowNull())
-        w.clear() # no effect
+        w.setNull() # no effect
         self.assertEqual(w.scale(), 50.0)
         self.assertFalse(w.isNull())
 
@@ -85,7 +85,7 @@ def testNull(self):
         self.assertEqual(len(spy), 4)
         self.assertEqual(spy[-1][0], 50.0)
         self.assertFalse(w.isNull())
-        w.clear()
+        w.setNull()
         self.assertTrue(math.isnan(w.scale()))
         self.assertEqual(len(spy), 5)
         self.assertTrue(math.isnan(spy[-1][0]))