[QGIS Commit] r9525 - trunk/qgis/python/core

[svn_qgis at osgeo.org]

Author: wonder
Date: 2008-10-23 08:42:22 -0400 (Thu, 23 Oct 2008)
New Revision: 9525

Modified:
   trunk/qgis/python/core/qgsgeometry.sip
Log:
combine() must have /Factory/ annotation!


Modified: trunk/qgis/python/core/qgsgeometry.sip
===================================================================
--- trunk/qgis/python/core/qgsgeometry.sip	2008-10-23 12:25:21 UTC (rev 9524)
+++ trunk/qgis/python/core/qgsgeometry.sip	2008-10-23 12:42:22 UTC (rev 9525)
@@ -233,7 +233,7 @@
     /** Returns a geometry representing all the points in this geometry and other (a 
      * union geometry operation). 
      * @note this operation is not called union since its a reserved word in C++.*/
-    QgsGeometry* combine( QgsGeometry* geometry );
+    QgsGeometry* combine( QgsGeometry* geometry ) /Factory/;
     
     /** Returns a geometry representing the points making up this geometry that do not make up other. */
     QgsGeometry* difference(QgsGeometry* geometry) /Factory/;