Address PR comments

qgis · Nov 4, 2021 · 2fbb830 · 2fbb830
1 parent c5f956d
commit 2fbb830
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/python/core/auto_additions/qgis.py b/python/core/auto_additions/qgis.py
@@ -72,13 +72,10 @@
 # --
 Qgis.DataType.baseClass = Qgis
 # monkey patching scoped based enum
-Qgis.SqlQuery = Qgis.VectorLayerTypeFlag.SqlQuery
-Qgis.SqlQuery.is_monkey_patched = True
-Qgis.SqlQuery.__doc__ = "SQL query layer"
+Qgis.VectorLayerTypeFlag.SqlQuery.__doc__ = "SQL query layer"
 Qgis.VectorLayerTypeFlag.__doc__ = 'Vector layer type flags.\n\n.. versionadded:: 3.24\n\n' + '* ``SqlQuery``: ' + Qgis.VectorLayerTypeFlag.SqlQuery.__doc__
 # --
 Qgis.VectorLayerTypeFlag.baseClass = Qgis
-QgsVectorLayer.VectorLayerTypeFlags = Qgis.VectorLayerTypeFlags
 # monkey patching scoped based enum
 Qgis.Never = Qgis.PythonMacroMode.Never
 Qgis.Never.is_monkey_patched = True

diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -104,7 +104,7 @@ The development version
     };
 
     enum class VectorLayerTypeFlag
-      {
+    {
       SqlQuery
     };
     typedef QFlags<Qgis::VectorLayerTypeFlag> VectorLayerTypeFlags;

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -140,13 +140,13 @@ class CORE_EXPORT Qgis
      *
      * \since QGIS 3.24
      */
-    enum class VectorLayerTypeFlag SIP_MONKEYPATCH_SCOPEENUM_UNNEST( Qgis, VectorLayerTypeFlag ) : int
-      {
+    enum class VectorLayerTypeFlag : int
+    {
       SqlQuery = 1 << 0 //!< SQL query layer
     };
     Q_ENUM( VectorLayerTypeFlag )
     //! Vector layer type flags
-    Q_DECLARE_FLAGS( VectorLayerTypeFlags, VectorLayerTypeFlag ) SIP_MONKEYPATCH_FLAGS_UNNEST( QgsVectorLayer, VectorLayerTypeFlags )
+    Q_DECLARE_FLAGS( VectorLayerTypeFlags, VectorLayerTypeFlag )
 
 
     /**