sipify

qgis · Aug 12, 2024 · ed7845a · ed7845a
1 parent 2ff28c7
commit ed7845a
Show file tree

Hide file tree

Showing 12 changed files with 14,028 additions and 13,701 deletions.
diff --git a/python/3d/class_map.yaml b/python/3d/class_map.yaml
diff --git a/python/PyQt6/3d/class_map.yaml b/python/PyQt6/3d/class_map.yaml
diff --git a/python/PyQt6/analysis/class_map.yaml b/python/PyQt6/analysis/class_map.yaml
diff --git a/python/PyQt6/core/auto_generated/auth/qgsauthconfigurationstorage.sip.in b/python/PyQt6/core/auto_generated/auth/qgsauthconfigurationstorage.sip.in
@@ -129,6 +129,10 @@ Set the storage enabled status to ``enabled``.
     virtual void setReadOnly( bool readOnly );
 %Docstring
 Utility method to unset all editing capabilities.
+
+.. note::
+
+   This method does not alter existing capabilities, make sure subclasses recompute capabilities if needed.
 %End
 
     virtual bool isReadOnly() const;

diff --git a/python/PyQt6/core/class_map.yaml b/python/PyQt6/core/class_map.yaml
diff --git a/python/PyQt6/gui/class_map.yaml b/python/PyQt6/gui/class_map.yaml
diff --git a/python/PyQt6/server/class_map.yaml b/python/PyQt6/server/class_map.yaml
diff --git a/python/analysis/class_map.yaml b/python/analysis/class_map.yaml
diff --git a/python/core/class_map.yaml b/python/core/class_map.yaml
diff --git a/python/gui/class_map.yaml b/python/gui/class_map.yaml
diff --git a/python/server/class_map.yaml b/python/server/class_map.yaml
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -3681,13 +3681,10 @@ bool QgsAuthManager::reencryptAuthenticationConfig( const QString &authcfg, cons
   // Loop through all storages with capability ReadConfiguration and reencrypt the config
   const QList<QgsAuthConfigurationStorage *> storages { authConfigurationStorageRegistry()->readyStoragesWithCapability( Qgis::AuthConfigurationStorageCapability::ReadConfiguration ) };
 
-  bool found { false };
-
   for ( QgsAuthConfigurationStorage *storage : std::as_const( storages ) )
   {
     if ( storage->methodConfigExists( authcfg ) )
     {
-      found = true;
       if ( ! storage->isEncrypted() )
       {
         return true;
@@ -3723,8 +3720,7 @@ bool QgsAuthManager::reencryptAuthenticationConfig( const QString &authcfg, cons
   {
     emit messageLog( tr( "Could not connect to any default storage." ), authManTag(), Qgis::MessageLevel::Critical );
   }
-
-  if ( ! found )
+  else
   {
     emit messageLog( tr( "Reencrypt FAILED, could not find config (id: %1)" ).arg( authcfg ), authManTag(), Qgis::MessageLevel::Critical );
   }
@@ -3851,13 +3847,11 @@ bool QgsAuthManager::reencryptAuthenticationIdentity(
   // Loop through all storages with capability ReadCertificateIdentity and reencrypt the identity
   const QList<QgsAuthConfigurationStorage *> storages { authConfigurationStorageRegistry()->readyStoragesWithCapability( Qgis::AuthConfigurationStorageCapability::ReadCertificateIdentity ) };
 
-  bool found { false };
 
   for ( QgsAuthConfigurationStorage *storage : std::as_const( storages ) )
   {
     if ( storage->certIdentityExists( identid ) )
     {
-      found = true;
       if ( ! storage->isEncrypted() )
       {
         return true;
@@ -3880,8 +3874,7 @@ bool QgsAuthManager::reencryptAuthenticationIdentity(
   {
     emit messageLog( tr( "Could not connect to any default storage." ), authManTag(), Qgis::MessageLevel::Critical );
   }
-
-  if ( ! found )
+  else
   {
     emit messageLog( tr( "Reencrypt FAILED, could not find identity (id: %1)" ).arg( identid ), authManTag(), Qgis::MessageLevel::Critical );
   }