Skip to content

Commit 70f51ae

Browse files
committed
adapt bindings to sip 4.19 (fixes #16071)
(cherry picked from commit 718581f)
1 parent aba58a2 commit 70f51ae

17 files changed

+19
-17
lines changed

python/analysis/analysis.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%Module(name=qgis._analysis,
2-
version=0,
32
keyword_arguments="Optional")
43

54
%Import QtCore/QtCoremod.sip

python/analysis/network/networkanalysis.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%Module(name=qgis._networkanalysis,
2-
version=0,
32
keyword_arguments="Optional")
43

54
%Import QtCore/QtCoremod.sip

python/core/conversions.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ template<TYPE>
745745

746746
// QMap<qint64, TYPE> is implemented as a Python dictionary.
747747
template<TYPE>
748-
%MappedType QMap<qint64, TYPE> /DocType="dict-of-qint64-TYPE"/
748+
%MappedType QMap<qint64, TYPE>
749749
{
750750
%TypeHeaderCode
751751
#include <qmap.h>
@@ -1806,7 +1806,7 @@ template <TYPE>
18061806
};
18071807

18081808
// QList<QgsField> is implemented as a Python list of QgsField.
1809-
%MappedType QList<QgsField> /DocType="list-of-qgsfield"/
1809+
%MappedType QList<QgsField>
18101810
{
18111811
%TypeHeaderCode
18121812
#include <qgsfield.h>
@@ -1911,7 +1911,7 @@ template <TYPE>
19111911

19121912
%If (QVECTORINT_CONVERSION)
19131913
// QVector<int> is implemented as a Python list of integers.
1914-
%MappedType QVector<int> /DocType="list-of-int"/
1914+
%MappedType QVector<int>
19151915
{
19161916
%TypeHeaderCode
19171917
#include <qvector.h>

python/core/core.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%Module(name=qgis._core,
2-
version=0,
32
keyword_arguments="Optional")
43

54
%Feature QT5_SUPPORT

python/core/qgscoordinatetransform.sip

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
class QgsCoordinateTransform : QObject
1616
{
1717
%TypeHeaderCode
18+
extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part
1819
#include <qgscoordinatetransform.h>
1920
%End
2021

@@ -215,5 +216,5 @@ class QgsCoordinateTransform : QObject
215216

216217
signals:
217218
/** Signal when an invalid pj_transform() has occurred */
218-
void invalidTransformInput() const;
219+
void invalidTransformInput() const;
219220
};

python/core/qgsfeature.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ typedef QMap<int, QVariant> QgsAttributeMap;
44
typedef QVector<QVariant> QgsAttributes;
55

66
// QgsAttributes is implemented as a Python list of Python objects.
7-
%MappedType QgsAttributes /DocType="list-of-attributes"/
7+
%MappedType QgsAttributes
88
{
99
%TypeHeaderCode
1010
#include <qgsfeature.h>

python/core/qgspallabeling.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// 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*>
33
{
44
%TypeHeaderCode
55
#include <qmap.h>

python/core/qgsvectorlayerfeatureiterator.sip

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator
7070
//void updateFeatureGeometry( QgsFeature& f );
7171

7272
private:
73-
QgsVectorLayerFeatureIterator();
73+
QgsVectorLayerFeatureIterator( const QgsVectorLayerFeatureIterator &rhs );
74+
7475
};

python/core/raster/qgsrasterprojector.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class QgsRasterProjector : QgsRasterInterface
5454

5555
int bandCount() const;
5656

57-
int dataType( int bandNo ) const;
57+
QGis::DataType dataType( int bandNo ) const;
5858

5959
/** \brief set source and destination CRS */
6060
void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS,

python/gui/editorwidgets/qgsdatetimeedit.sip

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class QgsDateTimeEdit : QDateTimeEdit
3333

3434
protected:
3535
virtual void resizeEvent( QResizeEvent* event );
36-
3736
void mousePressEvent( QMouseEvent*event );
37+
virtual void fixup(QString & input) const;
38+
virtual QValidator::State validate(QString &text, int &pos) const;
3839
};

python/gui/editorwidgets/qgsdoublespinbox.sip

+1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox
5858
virtual void resizeEvent( QResizeEvent* event );
5959
virtual void changeEvent( QEvent* event );
6060
virtual void paintEvent( QPaintEvent* event );
61+
virtual void fixup(QString & input) const;
6162
};

python/gui/editorwidgets/qgsspinbox.sip

+1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ class QgsSpinBox : QSpinBox
5858
virtual void resizeEvent( QResizeEvent* event );
5959
virtual void changeEvent( QEvent* event );
6060
virtual void paintEvent( QPaintEvent* event );
61+
virtual void fixup(QString &input) const;
6162
};

python/gui/gui.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%Module(name=qgis._gui,
2-
version=0,
32
keyword_arguments="Optional")
43

54
%Feature HAVE_QSCI_SIP

python/gui/qgslonglongvalidator.sip

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class QgsLongLongValidator : QValidator
88
QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );
99
~QgsLongLongValidator();
1010

11-
QValidator::State validate( QString &input, int& ) const;
11+
virtual QValidator::State validate( QString &input, int& ) const;
1212

1313
void setBottom( qint64 bottom );
1414
void setTop( qint64 top );
@@ -17,4 +17,6 @@ class QgsLongLongValidator : QValidator
1717

1818
qint64 bottom() const;
1919
qint64 top() const;
20+
21+
virtual void fixup(QString &input) const;
2022
};

python/server/qgswmsconfigparser.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class QgsWMSConfigParser
109109
virtual void setScaleDenominator( double denom ) = 0;
110110
virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0;
111111

112-
virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
112+
// virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
113113

114114
virtual int nLayers() const = 0;
115115

python/server/qgswmsprojectparser.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
6363
void setScaleDenominator( double ) /*override*/;
6464
void addExternalGMLData( const QString&, QDomDocument* ) /*override*/ ;
6565

66-
QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ;
66+
// QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ;
6767

6868
/** 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*/
6969
int layersAndStyles( QStringList& layers, QStringList& styles ) const /*override*/ ;

python/server/server.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
%Module(name=qgis._server,
2-
version=0,
32
keyword_arguments="Optional")
43

54

0 commit comments

Comments
 (0)