sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-04 00:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix API issues causing malformed python stub files

Browse Source 
Fixes #46240
This commit is contained in:
Nyall Dawson 2021-11-29 08:48:37 +10:00
parent 79ebf8ef1f
commit dcf0cfe5a3
10 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/auto_generated/processing/qgsprocessingcontext.sip.in
View File

@ -31,7 +31,8 @@ expression context.
enum Flag
{
// UseSelectionIfPresent = 1 << 0,
// For future API flexibility only and to avoid sip issues, remove when real entries are added to flags.
Unused,
};
typedef QFlags<QgsProcessingContext::Flag> Flags;

4
python/core/auto_generated/vector/qgsvectordataprovider.sip.in
View File

@ -594,11 +594,11 @@ Returns the transaction this data provider is included in, if any.
Gets the list of layer ids on which this layer depends. This in particular determines the order of layer loading.
%End
virtual QList<QgsRelation> discoverRelations( const QgsVectorLayer *self, const QList<QgsVectorLayer *> &layers ) const;
virtual QList<QgsRelation> discoverRelations( const QgsVectorLayer *target, const QList<QgsVectorLayer *> &layers ) const;
%Docstring
Discover the available relations with the given layers.
:param self: the layer using this data provider.
:param target: the layer using this data provider.
:param layers: the other layers.
:return: the list of N-1 relations from this provider.

2
python/gui/auto_generated/processing/models/qgsmodelcomponentgraphicitem.sip.in
View File

@ -36,6 +36,8 @@ Base class for graphic items representing model components in the model designer
enum Flag
{
// For future API flexibility only and to avoid sip issues, remove when real entries are added to flags.
Unused,
};
typedef QFlags<QgsModelComponentGraphicItem::Flag> Flags;

3
src/core/processing/qgsprocessingcontext.h
View File

@ -50,7 +50,8 @@ class CORE_EXPORT QgsProcessingContext
//! Flags that affect how processing algorithms are run
enum Flag
{
// UseSelectionIfPresent = 1 << 0,
// For future API flexibility only and to avoid sip issues, remove when real entries are added to flags.
Unused = 1 << 0, //!< Temporary unused entry
};
Q_DECLARE_FLAGS( Flags, Flag )

4
src/core/vector/qgsvectordataprovider.h
View File

@ -585,12 +585,12 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
/**
* Discover the available relations with the given layers.
* \param self the layer using this data provider.
* \param target the layer using this data provider.
* \param layers the other layers.
* \returns the list of N-1 relations from this provider.
* \since QGIS 3.0
*/
virtual QList<QgsRelation> discoverRelations( const QgsVectorLayer *self, const QList<QgsVectorLayer *> &layers ) const;
virtual QList<QgsRelation> discoverRelations( const QgsVectorLayer *target, const QList<QgsVectorLayer *> &layers ) const;
/**
* Gets metadata, dependent on the provider type, that will be display in the metadata tab of the layer properties.

2
src/gui/processing/models/qgsmodelcomponentgraphicitem.h
View File

@ -60,6 +60,8 @@ class GUI_EXPORT QgsModelComponentGraphicItem : public QGraphicsObject
//! Available flags
enum Flag
{
// For future API flexibility only and to avoid sip issues, remove when real entries are added to flags.
Unused = 1 << 0, //!< Temporary unused entry
};
Q_DECLARE_FLAGS( Flags, Flag )

4
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -5070,7 +5070,7 @@ QList<QgsVectorLayer *> QgsPostgresProvider::searchLayers( const QList<QgsVector
return result;
}
QList<QgsRelation> QgsPostgresProvider::discoverRelations( const QgsVectorLayer *self, const QList<QgsVectorLayer *> &layers ) const
QList<QgsRelation> QgsPostgresProvider::discoverRelations( const QgsVectorLayer *target, const QList<QgsVectorLayer *> &layers ) const
{
QList<QgsRelation> result;
@ -5161,7 +5161,7 @@ QList<QgsRelation> QgsPostgresProvider::discoverRelations( const QgsVectorLayer
{
QgsRelation relation;
relation.setName( name );
relation.setReferencingLayer( self->id() );
relation.setReferencingLayer( target->id() );
relation.setReferencedLayer( foundLayer->id() );
relation.addFieldPair( fkColumn, refColumn );
relation.generateId();

2
src/providers/postgres/qgspostgresprovider.h
View File

@ -222,7 +222,7 @@ class QgsPostgresProvider final: public QgsVectorDataProvider
QVariant convertValue( QVariant::Type type, QVariant::Type subType, const QString &value, const QString &typeName ) const;
static QVariant convertValue( QVariant::Type type, QVariant::Type subType, const QString &value, const QString &typeName, QgsPostgresConn *conn );
QList<QgsRelation> discoverRelations( const QgsVectorLayer *self, const QList<QgsVectorLayer *> &layers ) const override;
QList<QgsRelation> discoverRelations( const QgsVectorLayer *target, const QList<QgsVectorLayer *> &layers ) const override;
QgsAttrPalIndexNameHash palAttributeIndexNames() const override;
/**

4
src/providers/spatialite/qgsspatialiteprovider.cpp
View File

@ -5977,7 +5977,7 @@ QgsTransaction *QgsSpatiaLiteProvider::transaction( ) const
return static_cast<QgsTransaction *>( mTransaction );
}
QList<QgsRelation> QgsSpatiaLiteProvider::discoverRelations( const QgsVectorLayer *self, const QList<QgsVectorLayer *> &layers ) const
QList<QgsRelation> QgsSpatiaLiteProvider::discoverRelations( const QgsVectorLayer *target, const QList<QgsVectorLayer *> &layers ) const
{
QList<QgsRelation> output;
const QString sql = QStringLiteral( "PRAGMA foreign_key_list(%1)" ).arg( QgsSqliteUtils::quotedIdentifier( mTableName ) );
@ -6004,7 +6004,7 @@ QList<QgsRelation> QgsSpatiaLiteProvider::discoverRelations( const QgsVectorLaye
{
QgsRelation relation;
relation.setName( name );
relation.setReferencingLayer( self->id() );
relation.setReferencingLayer( target->id() );
relation.setReferencedLayer( foundLayer->id() );
relation.addFieldPair( fkColumn, refColumn );
relation.generateId();

2
src/providers/spatialite/qgsspatialiteprovider.h
View File

@ -144,7 +144,7 @@ class QgsSpatiaLiteProvider final: public QgsVectorDataProvider
QString description() const override;
QgsAttributeList pkAttributeIndexes() const override;
void invalidateConnections( const QString &connection ) override;
QList<QgsRelation> discoverRelations( const QgsVectorLayer *self, const QList<QgsVectorLayer *> &layers ) const override;
QList<QgsRelation> discoverRelations( const QgsVectorLayer *target, const QList<QgsVectorLayer *> &layers ) const override;
static QString providerKey();