Spelling, sip

(cherry picked from commit def7998)
qgis · Mar 11, 2021 · 3186a130a13860601e7bb882da17f1a576254ff2 · 3186a13
1 parent 419fe14
commit 3186a130a13860601e7bb882da17f1a576254ff2
Unified Split

Showing with 16 additions and 3 deletions.

+0 −1 python/3d/auto_generated/qgsrulebased3drenderer.sip.in

+14 −0 python/core/auto_generated/qgsprovidermetadata.sip.in

+1 −1 src/app/qgshandlebadlayers.cpp

+1 −1 src/core/qgsprovidermetadata.h
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/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.20
 %End
 
  QString library() const /Deprecated/;

diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp
@@ -417,7 +417,7 @@ void QgsHandleBadLayers::apply()
       const QString correctedPath = checkBasepath( layerId, dataInfo.absoluteDir().path(), dataInfo.fileName(), fixedPath );
       if ( fixedPath && correctedPath != filePath )
       {
-        // reencode uri for provider
+        // re-encode uri for provider
         providerMap.insert( QStringLiteral( "path" ), correctedPath );
         datasource = QgsProviderRegistry::instance()->encodeUri( provider, providerMap );
       }

diff --git a/src/core/qgsprovidermetadata.h b/src/core/qgsprovidermetadata.h
@@ -160,7 +160,7 @@ class CORE_EXPORT QgsProviderMetadata : public QObject
      */
     enum ProviderCapability
     {
-      FileBasedUris = 1 << 0, //!< Indicates that the provider can utilise URIs which are based on paths to files (as opposed to database or internet paths)
+      FileBasedUris = 1 << 0, //!< Indicates that the provider can utilize URIs which are based on paths to files (as opposed to database or internet paths)
     };
     Q_DECLARE_FLAGS( ProviderCapabilities, ProviderCapability )