Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix sip
  • Loading branch information
3nids committed Sep 15, 2020
1 parent fb7f7ba commit 7265d9d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 21 deletions.
6 changes: 0 additions & 6 deletions python/core/auto_generated/qgsfield.sip.in
Expand Up @@ -291,12 +291,6 @@ Sets the alias for the field (the friendly displayed name of the field ).
Formats string for display
%End

static QString readableConfigurationFlag( ConfigurationFlag flag );
%Docstring
Returns the reabable and translated value of the configuration flag

.. versionadded:: 3.16
%End


bool convertCompatible( QVariant &v ) const;
Expand Down
4 changes: 2 additions & 2 deletions python/core/auto_generated/qgsvectorlayer.sip.in
Expand Up @@ -1968,7 +1968,7 @@ Convenience function that returns the attribute alias if defined or the field na
Returns a map of field name to attribute alias
%End

QSet<QString> excludeAttributesWms() /Deprecated/ const;
QSet<QString> excludeAttributesWms() const /Deprecated/;
%Docstring
A set of attributes that are not advertised in WMS requests with QGIS server.

Expand All @@ -1984,7 +1984,7 @@ A set of attributes that are not advertised in WMS requests with QGIS server.
use setFieldConfigurationFlag instead
%End

QSet<QString> excludeAttributesWfs() /Deprecated/ const;
QSet<QString> excludeAttributesWfs() const /Deprecated/;
%Docstring
A set of attributes that are not advertised in WFS requests with QGIS server.

Expand Down
8 changes: 0 additions & 8 deletions python/gui/auto_generated/qgscheckablecombobox.sip.in
Expand Up @@ -122,14 +122,6 @@ Toggles the item check state
.. seealso:: :py:func:`setItemCheckState`
%End

QgsCheckableItemModel *model() const;
%Docstring
Returns the custom item model which handles checking the items

.. seealso:: :py:class:`QgsCheckableItemModel`

.. versionadded:: 3.16
%End

virtual void hidePopup();

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsfield.h
Expand Up @@ -333,7 +333,7 @@ class CORE_EXPORT QgsField
* Returns the reabable and translated value of the configuration flag
* \since QGIS 3.16
*/
static QString readableConfigurationFlag( ConfigurationFlag flag );
static QString readableConfigurationFlag( QgsField::ConfigurationFlag flag ) SIP_SKIP;

#ifndef SIP_RUN

Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsvectorlayer.h
Expand Up @@ -1841,7 +1841,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
* A set of attributes that are not advertised in WMS requests with QGIS server.
* \deprecated since QGIS 3.16, use fields().configurationFlags() instead
*/
Q_DECL_DEPRECATED QSet<QString> excludeAttributesWms() SIP_DEPRECATED const { return mExcludeAttributesWMS; }
Q_DECL_DEPRECATED QSet<QString> excludeAttributesWms() const SIP_DEPRECATED { return mExcludeAttributesWMS; }

/**
* A set of attributes that are not advertised in WMS requests with QGIS server.
Expand All @@ -1853,7 +1853,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
* A set of attributes that are not advertised in WFS requests with QGIS server.
* \deprecated since QGIS 3.16, use fields().configurationFlags() instead
*/
Q_DECL_DEPRECATED QSet<QString> excludeAttributesWfs() SIP_DEPRECATED const { return mExcludeAttributesWFS; }
Q_DECL_DEPRECATED QSet<QString> excludeAttributesWfs() const SIP_DEPRECATED { return mExcludeAttributesWFS; }

/**
* A set of attributes that are not advertised in WFS requests with QGIS server.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgscheckablecombobox.h
Expand Up @@ -214,7 +214,7 @@ class GUI_EXPORT QgsCheckableComboBox : public QComboBox
* \see QgsCheckableItemModel
* \since QGIS 3.16
*/
QgsCheckableItemModel *model() const {return mModel;}
QgsCheckableItemModel *model() const SIP_SKIP {return mModel;}

/**
* Hides the list of items in the combobox if it is currently
Expand Down
2 changes: 1 addition & 1 deletion src/server/services/wfs/qgswfsgetfeature.cpp
Expand Up @@ -261,7 +261,7 @@ namespace QgsWfs
QList<QString> fieldnames;
for ( int idx = 0; idx < fields.count(); ++idx )
{
if (!fields.at(idx).configurationFlags().testFlag(QgsField::ConfigurationFlag::ExposeViaWfs))
if ( !fields.at( idx ).configurationFlags().testFlag( QgsField::ConfigurationFlag::ExposeViaWfs ) )
continue;

fieldnames.append( fields[idx].name() );
Expand Down

0 comments on commit 7265d9d

Please sign in to comment.