update for sip 4.13

jef-n · alexbruy · commit a450aacf17a5 · 2011-12-25T16:48:57.000+02:00
diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
         ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
       ELSE(MSVC)
         # disable all warnings
-        ADD_DEFINITIONS( -w )
+        ADD_DEFINITIONS( -w -fpermissive )
       ENDIF(MSVC)
     ENDIF(PEDANTIC)
 
diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip
@@ -1,4 +1,3 @@
-
 %Module qgis.analysis 0
 
 %Import QtCore/QtCoremod.sip
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -1,4 +1,3 @@
-
 %Module qgis.core 0
 
 %Import QtCore/QtCoremod.sip
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -42,7 +42,9 @@ class QgsVectorDataProvider : QgsDataProvider
         ChangeGeometries =             256,
         SelectGeometryAtId =           512,
         RandomSelectGeometryAtId =     1024,
-        SequentialSelectGeometryAtId = 2048
+        SequentialSelectGeometryAtId = 2048,
+        CreateAttributeIndex =         4096,
+        SetEncoding =                  8192,
       };
 
       /** bitmask of all provider's editing capabilities */
diff --git a/python/core/symbology-ng-core.sip b/python/core/symbology-ng-core.sip
@@ -619,10 +619,10 @@ class QgsSymbolV2RenderContext
     void setAlpha( qreal alpha );
 
     bool selected() const;
-    void setSelected( bool selected ) const;
+    void setSelected( bool selected );
 
     //! @note added in 1.5
-    int renderHints() const;
+    int renderHints();
     //! @note added in 1.5
     void setRenderHints( int hints );
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`%Module qgis.analysis 0`
`3`	`2`
`4`	`3`	`%Import QtCore/QtCoremod.sip`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`%Module qgis.core 0`
`3`	`2`
`4`	`3`	`%Import QtCore/QtCoremod.sip`