Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix some dox + remove extra includes
  • Loading branch information
3nids committed Jan 16, 2023
1 parent 0af509d commit 53f3745
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 13 deletions.
8 changes: 4 additions & 4 deletions python/core/auto_additions/qgis.py
Expand Up @@ -2215,10 +2215,10 @@
# --
Qgis.CoordinateDisplayType.baseClass = Qgis
# monkey patching scoped based enum
Qgis.SettingsLocation.Any.__doc__ = "From any lcoation"
Qgis.SettingsLocation.Global.__doc__ = "Global settings only"
Qgis.SettingsLocation.Local.__doc__ = "Local settings only"
Qgis.SettingsLocation.__doc__ = 'Settings Location\n\n.. versionadded:: 3.30\n\n' + '* ``Any``: ' + Qgis.SettingsLocation.Any.__doc__ + '\n' + '* ``Global``: ' + Qgis.SettingsLocation.Global.__doc__ + '\n' + '* ``Local``: ' + Qgis.SettingsLocation.Local.__doc__
Qgis.SettingsLocation.Any.__doc__ = "From any location"
Qgis.SettingsLocation.Global.__doc__ = "Global settings are stored in `global_settings.ini`"
Qgis.SettingsLocation.Local.__doc__ = "Local settings are stored in the user profile"
Qgis.SettingsLocation.__doc__ = 'The setting location describes where a setting is stored.\n\n.. versionadded:: 3.30\n\n' + '* ``Any``: ' + Qgis.SettingsLocation.Any.__doc__ + '\n' + '* ``Global``: ' + Qgis.SettingsLocation.Global.__doc__ + '\n' + '* ``Local``: ' + Qgis.SettingsLocation.Local.__doc__
# --
Qgis.SettingsLocation.baseClass = Qgis
# monkey patching scoped based enum
Expand Down
4 changes: 3 additions & 1 deletion python/core/auto_generated/network/qgshttpheaders.sip.in
Expand Up @@ -10,6 +10,8 @@





class QgsHttpHeaders
{
%Docstring(signature="appended")
Expand Down Expand Up @@ -65,7 +67,7 @@ Constructor from a QDomElement ``element``

QVariantMap headers() const;
%Docstring
reeturn the headers as a variant map
Returns the headers as a variant map

.. versionadded:: 3.30
%End
Expand Down
4 changes: 3 additions & 1 deletion src/core/network/qgshttpheaders.cpp
Expand Up @@ -19,7 +19,9 @@
***************************************************************************/

#include "qgshttpheaders.h"
#include "qgsdatasourceuri.h"
#include "qgssettings.h"


#include <QDir>
#include <QNetworkRequest>
#include <QUrlQuery>
Expand Down
8 changes: 5 additions & 3 deletions src/core/network/qgshttpheaders.h
Expand Up @@ -22,14 +22,16 @@
#define QGSHTTPHEADERS_H

#include <QMap>
#include <QVariant>

#include "qgis_core.h"
#include "qgis_sip.h"
#include "qgssettingsentry.h"
#include "qgssettingsentryimpl.h"


class QNetworkRequest;
class QUrlQuery;
class QDomElement;
class QgsSettings;

/**
* \ingroup core
Expand Down Expand Up @@ -88,7 +90,7 @@ class CORE_EXPORT QgsHttpHeaders
virtual ~QgsHttpHeaders();

/**
* \brief reeturn the headers as a variant map
* \brief Returns the headers as a variant map
* \since QGIS 3.30
*/
QVariantMap headers() const {return mHeaders;}
Expand Down
8 changes: 4 additions & 4 deletions src/core/qgis.h
Expand Up @@ -2528,15 +2528,15 @@ class CORE_EXPORT Qgis
Q_ENUM( CoordinateDisplayType )

/**
* Settings Location
* The setting location describes where a setting is stored.
*
* \since QGIS 3.30
*/
enum class SettingsLocation : int
{
Any, //!< From any lcoation
Global, //!< Global settings only
Local, //!< Local settings only
Any, //!< From any location
Global, //!< Global settings are stored in `global_settings.ini`
Local, //!< Local settings are stored in the user profile
};
Q_ENUM( SettingsLocation )

Expand Down

0 comments on commit 53f3745

Please sign in to comment.