Merge pull request #42154 from nyalldawson/provider_file_based

Fix broken bad layer handler dialog
qgis · Mar 10, 2021 · 03edd71 · 03edd71
2 parents e0489b3 + fd1c9f3
commit 03edd71
Show file tree

Hide file tree

Showing 32 changed files with 533 additions and 190 deletions.
diff --git a/python/3d/auto_generated/qgsrulebased3drenderer.sip.in b/python/3d/auto_generated/qgsrulebased3drenderer.sip.in
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsRuleBased3DRendererMetadata : Qgs3DRendererAbstractMetadata
 {
 %Docstring

diff --git a/python/core/auto_generated/qgsmaplayerfactory.sip.in b/python/core/auto_generated/qgsmaplayerfactory.sip.in
@@ -0,0 +1,54 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsmaplayerfactory.h                                        *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+class QgsMapLayerFactory
+{
+%Docstring
+Contains utility functions for creating map layers.
+
+.. versionadded:: 3.18.1
+%End
+
+%TypeHeaderCode
+#include "qgsmaplayerfactory.h"
+%End
+  public:
+
+    static QgsMapLayerType typeFromString( const QString &string, bool &ok /Out/ );
+%Docstring
+Returns the map layer type corresponding a ``string`` value.
+
+:param string: string to convert to map layer type
+
+:return: - converted map layer type
+         - ok: will be set to ``True`` if ``string`` was successfully converted to a map layer type
+
+
+.. seealso:: :py:func:`typeToString`
+%End
+
+    static QString typeToString( QgsMapLayerType type );
+%Docstring
+Converts a map layer ``type`` to a string value.
+
+.. seealso:: :py:func:`typeFromString`
+%End
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsmaplayerfactory.h                                        *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/core/auto_generated/qgsprovidermetadata.sip.in b/python/core/auto_generated/qgsprovidermetadata.sip.in
@@ -115,6 +115,13 @@ library object.
     typedef QFlags<QgsProviderMetadata::ProviderMetadataCapability> ProviderMetadataCapabilities;
 
 
+    enum ProviderCapability
+    {
+      FileBasedUris,
+    };
+    typedef QFlags<QgsProviderMetadata::ProviderCapability> ProviderCapabilities;
+
+
 
     QgsProviderMetadata( const QString &key, const QString &description, const QString &library = QString() );
 %Docstring
@@ -147,6 +154,13 @@ This is used to provide a descriptive list of available data providers.
 Returns the provider metadata capabilities.
 
 .. versionadded:: 3.18
+%End
+
+    virtual QgsProviderMetadata::ProviderCapabilities providerCapabilities() const;
+%Docstring
+Returns the provider's capabilities.
+
+.. versionadded:: 3.18.1
 %End
 
  QString library() const /Deprecated/;

diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -106,6 +106,7 @@
 %Include auto_generated/qgsmaphittest.sip
 %Include auto_generated/qgsmaplayer.sip
 %Include auto_generated/qgsmaplayerdependency.sip
+%Include auto_generated/qgsmaplayerfactory.sip
 %Include auto_generated/qgsmaplayerlegend.sip
 %Include auto_generated/qgsmaplayermodel.sip
 %Include auto_generated/qgsmaplayerproxymodel.sip