Skip to content
Permalink
Browse files
Add operator for flgs and update docs
  • Loading branch information
elpaso authored and nyalldawson committed Nov 4, 2021
1 parent 2fbb830 commit d4876f3842ad24039f53bbc9ca01f74f4b55da9c
Showing with 5 additions and 4 deletions.
  1. +2 −1 python/core/auto_generated/qgis.sip.in
  2. +1 −1 python/core/auto_generated/vector/qgsvectorlayer.sip.in
  3. +1 −1 src/core/qgis.h
  4. +1 −1 src/core/vector/qgsvectorlayer.h
@@ -110,7 +110,6 @@ The development version
typedef QFlags<Qgis::VectorLayerTypeFlag> VectorLayerTypeFlags;



enum class PythonMacroMode
{
Never,
@@ -828,6 +827,8 @@ QFlags<Qgis::MapSettingsFlag> operator|(Qgis::MapSettingsFlag f1, QFlags<Qgis::M

QFlags<Qgis::RenderContextFlag> operator|(Qgis::RenderContextFlag f1, QFlags<Qgis::RenderContextFlag> f2);

QFlags<Qgis::VectorLayerTypeFlag> operator|(Qgis::VectorLayerTypeFlag f1, QFlags<Qgis::VectorLayerTypeFlag> f2);




@@ -468,7 +468,7 @@ Returns ``True`` if the layer is a query (SQL) layer.

Qgis::VectorLayerTypeFlags vectorLayerTypeFlags() const;
%Docstring
Returns ``True`` if the layer is a query (SQL) layer.
Returns the vector layer type flags.

.. seealso:: :py:func:`isSqlQuery`

@@ -148,7 +148,6 @@ class CORE_EXPORT Qgis
//! Vector layer type flags
Q_DECLARE_FLAGS( VectorLayerTypeFlags, VectorLayerTypeFlag )


/**
* Authorisation to run Python Macros
* \since QGIS 3.10
@@ -1324,6 +1323,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::AnnotationItemFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::AnnotationItemGuiFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::MapSettingsFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::RenderContextFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::VectorLayerTypeFlags )


// hack to workaround warnings when casting void pointers
@@ -583,7 +583,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
bool isSqlQuery() const;

/**
* Returns TRUE if the layer is a query (SQL) layer.
* Returns the vector layer type flags.
*
* \see isSqlQuery()
* \since QGIS 3.24

0 comments on commit d4876f3

Please sign in to comment.