fix headers reading in widget + deprecate method with settings

qgis · Jan 16, 2023 · 715f760 · 715f760
1 parent a88ec8b
commit 715f760
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/python/gui/auto_generated/qgshttpheaderwidget.sip.in b/python/gui/auto_generated/qgshttpheaderwidget.sip.in
@@ -37,14 +37,24 @@ Default constructor
 :return: build a new ``:py:class:`QgsHttpHeaders``` according to data in the UI
 %End
 
-    void setFromSettings( const QgsSettings &settings, const QString &key );
+    void setHeaders( const QgsHttpHeaders &headers );
+%Docstring
+Sets the widget from the headers
+
+.. versionadded:: 3.30
+%End
+
+ void setFromSettings( const QgsSettings &settings, const QString &key ) /Deprecated/;
 %Docstring
 fill the inner header map from the settings defined at ``key``
 
 .. seealso:: :py:func:`QgsHttpHeaders.setFromSettings`
 
 :param settings:
 :param key:
+
+.. deprecated:: QGIS 3.30
+   use setFromHeaders instead
 %End
 
  void updateSettings( QgsSettings &settings, const QString &key ) const /Deprecated/;

diff --git a/src/gui/qgshttpheaderwidget.cpp b/src/gui/qgshttpheaderwidget.cpp
@@ -102,7 +102,11 @@ void QgsHttpHeaderWidget::setFromSettings( const QgsSettings &settings, const QS
   // load headers from settings
   QgsHttpHeaders headers;
   headers.setFromSettings( settings, key );
+  setHeaders( headers );
+}
 
+void QgsHttpHeaderWidget::setHeaders( const QgsHttpHeaders &headers )
+{
   // clean table
   for ( int i = tblwdgQueryPairs->rowCount(); i > 0; i-- )
     tblwdgQueryPairs->removeRow( i - 1 );

diff --git a/src/gui/qgshttpheaderwidget.h b/src/gui/qgshttpheaderwidget.h
@@ -51,13 +51,20 @@ class GUI_EXPORT QgsHttpHeaderWidget : public QWidget, private Ui::QgsHttpHeader
      */
     QgsHttpHeaders httpHeaders() const;
 
+    /**
+     * Sets the widget from the headers
+     * \since QGIS 3.30
+     */
+    void setHeaders( const QgsHttpHeaders &headers );
+
     /**
      * \brief fill the inner header map from the settings defined at \a key
      * \see QgsHttpHeaders::setFromSettings( const QgsSettings &settings, const QString &key )
      * \param settings
      * \param key
+     * \deprecated since QGIS 3.30 use setFromHeaders instead
      */
-    void setFromSettings( const QgsSettings &settings, const QString &key );
+    Q_DECL_DEPRECATED void setFromSettings( const QgsSettings &settings, const QString &key ) SIP_DEPRECATED;
 
     /**
      * \brief update the \a settings with the http headers present in the inner map.

diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -94,11 +94,9 @@ QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, ConnectionTypes typ
     // populate the dialog with the information stored for the connection
     // populate the fields with the stored setting parameters
 
-    const QgsSettings settings;
-
     txtName->setText( connectionName );
     txtUrl->setText( QgsOwsConnection::settingsUrl->value( {mServiceName.toLower(), connectionName} ) );
-    mHttpHeaders->setFromSettings( settings, QStringLiteral( "qgis/connections-%1/%2" ).arg( mServiceName.toLower(), connectionName ) );
+    mHttpHeaders->setHeaders( QgsHttpHeaders( QgsOwsConnection::settingsHeaders->value( {mServiceName.toLower(), connectionName} ) ) );
 
     updateServiceSpecificSettings();
 
@@ -327,7 +325,7 @@ void QgsNewHttpConnection::updateServiceSpecificSettings()
   // Enable/disable these items per WFS versions
   wfsVersionCurrentIndexChanged( versionIdx );
 
-  mHttpHeaders->setFromSettings( QgsSettings(), QStringLiteral( "qgis/connections-%1/%2" ).arg( mServiceName.toLower(), mOriginalConnName ) );
+  mHttpHeaders->setHeaders( QgsHttpHeaders( QgsOwsConnection::settingsHeaders->value( {mServiceName.toLower(), mOriginalConnName} ) ) );
 
   txtMaxNumFeatures->setText( QgsOwsConnection::settingsMaxNumFeatures->value( detailsParameters ) );
 

diff --git a/src/providers/arcgisrest/qgsnewarcgisrestconnection.cpp b/src/providers/arcgisrest/qgsnewarcgisrestconnection.cpp
@@ -63,7 +63,9 @@ QgsNewArcGisRestConnectionDialog::QgsNewArcGisRestConnectionDialog( QWidget *par
     const QString credentialsKey = "qgis/" + mCredentialsBaseKey + '/' + connectionName;
     txtName->setText( connectionName );
     txtUrl->setText( settings.value( key + "/url" ).toString() );
+    Q_NOWARN_DEPRECATED_PUSH
     mHttpHeaders->setFromSettings( settings, key );
+    Q_NOWARN_DEPRECATED_POP
 
     // portal
     mContentEndPointLineEdit->setText( settings.value( key + "/content_endpoint" ).toString() );