adapt bindings to sip 4.19 (fixes #16071)

jef-n · jef-n · commit 718581ffb12b · 2017-02-11T21:03:43.000+01:00
diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip
@@ -1,5 +1,4 @@
 %Module(name=qgis._analysis,
-        version=0,
         keyword_arguments="Optional")
 
 %Import QtCore/QtCoremod.sip
diff --git a/python/analysis/network/networkanalysis.sip b/python/analysis/network/networkanalysis.sip
@@ -1,5 +1,4 @@
 %Module(name=qgis._networkanalysis,
-        version=0,
         keyword_arguments="Optional")
 
 %Import QtCore/QtCoremod.sip
diff --git a/python/core/conversions.sip b/python/core/conversions.sip
@@ -747,7 +747,7 @@ template<TYPE>
 
 // QMap<qint64, TYPE> is implemented as a Python dictionary.
 template<TYPE>
-%MappedType QMap<qint64, TYPE> /DocType="dict-of-qint64-TYPE"/
+%MappedType QMap<qint64, TYPE>
 {
 %TypeHeaderCode
 #include <qmap.h>
@@ -1873,7 +1873,7 @@ template <TYPE>
 };
 
 // QList<QgsField> is implemented as a Python list of QgsField.
-%MappedType QList<QgsField> /DocType="list-of-qgsfield"/
+%MappedType QList<QgsField>
 {
 %TypeHeaderCode
 #include <qgsfield.h>
@@ -1978,7 +1978,7 @@ template <TYPE>
 
 %If (QVECTORINT_CONVERSION)
 // QVector<int> is implemented as a Python list of integers.
-%MappedType QVector<int> /DocType="list-of-int"/
+%MappedType QVector<int>
 {
 %TypeHeaderCode
 #include <qvector.h>
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -1,5 +1,4 @@
 %Module(name=qgis._core,
-        version=0,
         keyword_arguments="Optional")
 
 %Feature QT5_SUPPORT
diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
@@ -15,6 +15,7 @@
 class QgsCoordinateTransform : QObject
 {
 %TypeHeaderCode
+extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
 #include <qgscoordinatetransform.h>
 %End
 
@@ -215,5 +216,5 @@ class QgsCoordinateTransform : QObject
 
   signals:
     /** Signal when an invalid pj_transform() has occurred */
-    void  invalidTransformInput() const;
+    void invalidTransformInput() const;
 };
diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip
@@ -4,7 +4,7 @@ typedef QMap<int, QVariant> QgsAttributeMap;
 typedef QVector<QVariant> QgsAttributes;
 
 // QgsAttributes is implemented as a Python list of Python objects.
-%MappedType QgsAttributes /DocType="list-of-attributes"/
+%MappedType QgsAttributes
 {
 %TypeHeaderCode
 #include <qgsfeature.h>
diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -1,5 +1,5 @@
 // QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> is implemented as a Python dictionary.
-%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/
+%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*>
 {
 %TypeHeaderCode
 #include <qmap.h>
diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip
@@ -70,5 +70,6 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator
     //void updateFeatureGeometry( QgsFeature& f );
 
   private:
-    QgsVectorLayerFeatureIterator();
+    QgsVectorLayerFeatureIterator( const QgsVectorLayerFeatureIterator &rhs );
+
 };
diff --git a/python/core/raster/qgsrasterprojector.sip b/python/core/raster/qgsrasterprojector.sip
@@ -55,7 +55,7 @@ class QgsRasterProjector : QgsRasterInterface
 
     int bandCount() const;
 
-    int dataType( int bandNo ) const;
+    QGis::DataType dataType( int bandNo ) const;
 
     /** \brief set source and destination CRS */
     void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS,
diff --git a/python/gui/editorwidgets/qgsdatetimeedit.sip b/python/gui/editorwidgets/qgsdatetimeedit.sip
@@ -37,6 +37,7 @@ class QgsDateTimeEdit : QDateTimeEdit
 
   protected:
     virtual void resizeEvent( QResizeEvent* event );
-
     void mousePressEvent( QMouseEvent*event );
+    virtual void fixup(QString & input) const;
+    virtual QValidator::State validate(QString &text, int &pos) const;
 };
diff --git a/python/gui/editorwidgets/qgsdoublespinbox.sip b/python/gui/editorwidgets/qgsdoublespinbox.sip
@@ -80,4 +80,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox
   protected:
     virtual void changeEvent( QEvent* event );
     virtual void paintEvent( QPaintEvent* event );
+    virtual void fixup(QString & input) const;
 };
diff --git a/python/gui/editorwidgets/qgsspinbox.sip b/python/gui/editorwidgets/qgsspinbox.sip
@@ -78,7 +78,7 @@ class QgsSpinBox : QSpinBox
     virtual QValidator::State validate( QString & input, int & pos ) const;
 
   protected:
-
     virtual void changeEvent( QEvent* event );
     virtual void paintEvent( QPaintEvent* event );
+    virtual void fixup(QString &input) const;
 };
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -1,5 +1,4 @@
 %Module(name=qgis._gui,
-        version=0,
         keyword_arguments="Optional")
 
 %Feature HAVE_QSCI_SIP
diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip
@@ -8,7 +8,7 @@ class QgsLongLongValidator : QValidator
     QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );
     ~QgsLongLongValidator();
 
-    QValidator::State validate( QString &input, int& ) const;
+    virtual QValidator::State validate( QString &input, int& ) const;
 
     void setBottom( qint64 bottom );
     void setTop( qint64 top );
@@ -17,4 +17,6 @@ class QgsLongLongValidator : QValidator
 
     qint64 bottom() const;
     qint64 top() const;
+
+    virtual void fixup(QString &input) const;
 };
diff --git a/python/server/qgswmsconfigparser.sip b/python/server/qgswmsconfigparser.sip
@@ -115,7 +115,7 @@ class QgsWMSConfigParser
     virtual void setScaleDenominator( double denom ) = 0;
     virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0;
 
-    virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
+    // virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
 
     virtual int nLayers() const = 0;
 
diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip
@@ -63,7 +63,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
     void setScaleDenominator( double )  /*override*/;
     void addExternalGMLData( const QString&, QDomDocument* )  /*override*/ ;
 
-    QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const  /*override*/ ;
+    // QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const  /*override*/ ;
 
     /** Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/
     int layersAndStyles( QStringList& layers, QStringList& styles ) const  /*override*/ ;
diff --git a/python/server/server.sip b/python/server/server.sip
@@ -1,5 +1,4 @@
 %Module(name=qgis._server,
-        version=0,
         keyword_arguments="Optional")
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`%Module(name=qgis._analysis,`
`2`		`- version=0,`
`3`	`2`	`keyword_arguments="Optional")`
`4`	`3`
`5`	`4`	`%Import QtCore/QtCoremod.sip`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`%Module(name=qgis._networkanalysis,`
`2`		`- version=0,`
`3`	`2`	`keyword_arguments="Optional")`
`4`	`3`
`5`	`4`	`%Import QtCore/QtCoremod.sip`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`%Module(name=qgis._core,`
`2`		`- version=0,`
`3`	`2`	`keyword_arguments="Optional")`
`4`	`3`
`5`	`4`	`%Feature QT5_SUPPORT`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ typedef QMap<int, QVariant> QgsAttributeMap;`
`4`	`4`	`typedef QVector<QVariant> QgsAttributes;`
`5`	`5`
`6`	`6`	`// QgsAttributes is implemented as a Python list of Python objects.`
`7`		`-%MappedType QgsAttributes /DocType="list-of-attributes"/`
	`7`	`+%MappedType QgsAttributes`
`8`	`8`	`{`
`9`	`9`	`%TypeHeaderCode`
`10`	`10`	`#include <qgsfeature.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> is implemented as a Python dictionary.`
`2`		`-%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined> /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined"/`
	`2`	`+%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*>`
`3`	`3`	`{`
`4`	`4`	`%TypeHeaderCode`
`5`	`5`	`#include <qmap.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`%Module(name=qgis._gui,`
`2`		`- version=0,`
`3`	`2`	`keyword_arguments="Optional")`
`4`	`3`
`5`	`4`	`%Feature HAVE_QSCI_SIP`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`%Module(name=qgis._server,`
`2`		`- version=0,`
`3`	`2`	`keyword_arguments="Optional")`
`4`	`3`
`5`	`4`