Fix sip bindings for QgsStringStatisticalSummary

nyalldawson · nyalldawson · commit 7ae80b106d8f · 2016-05-10T20:14:51.000+10:00
diff --git a/python/core/qgsstringstatisticalsummary.sip b/python/core/qgsstringstatisticalsummary.sip
@@ -59,14 +59,16 @@ class QgsStringStatisticalSummary
 
     /** Calculates summary statistics for a list of strings.
      * @param values list of strings
+     * @see calculateFromVariants()
      */
     void calculate( const QStringList& values );
 
     /** Calculates summary statistics for a list of variants. Any non-string variants will be
      * ignored.
      * @param values list of variants
+     * @see calculate()
      */
-    void calculate( const QVariantList& values );
+    void calculateFromVariants( const QVariantList& values );
 
     /** Returns the value of a specified statistic
      * @param stat statistic to return
diff --git a/src/core/qgsstringstatisticalsummary.cpp b/src/core/qgsstringstatisticalsummary.cpp
@@ -54,7 +54,7 @@ void QgsStringStatisticalSummary::calculate( const QStringList& values )
   }
 }
 
-void QgsStringStatisticalSummary::calculate( const QVariantList& values )
+void QgsStringStatisticalSummary::calculateFromVariants( const QVariantList& values )
 {
   reset();
 
diff --git a/src/core/qgsstringstatisticalsummary.h b/src/core/qgsstringstatisticalsummary.h
@@ -79,14 +79,16 @@ class CORE_EXPORT QgsStringStatisticalSummary
 
     /** Calculates summary statistics for a list of strings.
      * @param values list of strings
+     * @see calculateFromVariants()
      */
     void calculate( const QStringList& values );
 
     /** Calculates summary statistics for a list of variants. Any non-string variants will be
      * ignored.
      * @param values list of variants
+     * @see calculate()
      */
-    void calculate( const QVariantList& values );
+    void calculateFromVariants( const QVariantList& values );
 
     /** Returns the value of a specified statistic
      * @param stat statistic to return
diff --git a/tests/src/python/test_qgsstringstatisticalsummary.py b/tests/src/python/test_qgsstringstatisticalsummary.py
@@ -67,7 +67,7 @@ def testIndividualStats(self):
     def testVariantStats(self):
         s = QgsStringStatisticalSummary()
         self.assertEqual(s.statistics(), QgsStringStatisticalSummary.All)
-        s.calculate(['cc', 5, 'bbbb', 'aaaa', 'eeee', 6, 9, '9', ''])
+        s.calculateFromVariants(['cc', 5, 'bbbb', 'aaaa', 'eeee', 6, 9, '9', ''])
         self.assertEqual(s.count(), 6)
         self.assertEqual(set(s.distinctValues()), set(['cc', 'aaaa', 'bbbb', 'eeee', '', '9']))
         self.assertEqual(s.countMissing(), 1)

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ void QgsStringStatisticalSummary::calculate( const QStringList& values )`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-void QgsStringStatisticalSummary::calculate( const QVariantList& values )`
	`57`	`+void QgsStringStatisticalSummary::calculateFromVariants( const QVariantList& values )`
`58`	`58`	`{`
`59`	`59`	`reset();`
`60`	`60`