Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor WFS code cleanup #60959

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Minor WFS code cleanup #60959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d8ddf4
Reformat to match standard
nyalldawson Mar 12, 2025
0036e4e
Const correctness
nyalldawson Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions python/PyQt6/core/auto_generated/qgsogcutils.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ Exports the geometry to GML2
:return: QDomElement
%End

static QDomElement rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc, int precision = 17 );
static QDomElement rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc, int precision = 17 );
%Docstring
Exports the rectangle to GML2 Box

:return: QDomElement
%End

static QDomElement rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc,
static QDomElement rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision = 17 );
Expand All @@ -113,14 +113,14 @@ Exports the rectangle to GML2 Box
:return: QDomElement
%End

static QDomElement rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc, int precision = 17 );
static QDomElement rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc, int precision = 17 );
%Docstring
Exports the rectangle to GML3 Envelope

:return: QDomElement
%End

static QDomElement rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc,
static QDomElement rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision = 17 );
Expand Down
8 changes: 4 additions & 4 deletions python/core/auto_generated/qgsogcutils.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ Exports the geometry to GML2
:return: QDomElement
%End

static QDomElement rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc, int precision = 17 );
static QDomElement rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc, int precision = 17 );
%Docstring
Exports the rectangle to GML2 Box

:return: QDomElement
%End

static QDomElement rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc,
static QDomElement rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision = 17 );
Expand All @@ -113,14 +113,14 @@ Exports the rectangle to GML2 Box
:return: QDomElement
%End

static QDomElement rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc, int precision = 17 );
static QDomElement rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc, int precision = 17 );
%Docstring
Exports the rectangle to GML3 Envelope

:return: QDomElement
%End

static QDomElement rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc,
static QDomElement rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision = 17 );
Expand Down
8 changes: 4 additions & 4 deletions src/core/qgsogcutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,12 +1125,12 @@ QgsRectangle QgsOgcUtils::rectangleFromGMLEnvelope( const QDomNode &envelopeNode
return rect;
}

QDomElement QgsOgcUtils::rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc, int precision )
QDomElement QgsOgcUtils::rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc, int precision )
{
return rectangleToGMLBox( box, doc, QString(), false, precision );
}

QDomElement QgsOgcUtils::rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc,
QDomElement QgsOgcUtils::rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision )
Expand Down Expand Up @@ -1165,12 +1165,12 @@ QDomElement QgsOgcUtils::rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc
return boxElem;
}

QDomElement QgsOgcUtils::rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc, int precision )
QDomElement QgsOgcUtils::rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc, int precision )
{
return rectangleToGMLEnvelope( env, doc, QString(), false, precision );
}

QDomElement QgsOgcUtils::rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc,
QDomElement QgsOgcUtils::rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision )
Expand Down
8 changes: 4 additions & 4 deletions src/core/qgsogcutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ class CORE_EXPORT QgsOgcUtils
* Exports the rectangle to GML2 Box
* \returns QDomElement
*/
static QDomElement rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc, int precision = 17 );
static QDomElement rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc, int precision = 17 );

/**
* Exports the rectangle to GML2 Box
* \returns QDomElement
*/
static QDomElement rectangleToGMLBox( QgsRectangle *box, QDomDocument &doc,
static QDomElement rectangleToGMLBox( const QgsRectangle *box, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision = 17 );
Expand All @@ -145,13 +145,13 @@ class CORE_EXPORT QgsOgcUtils
* Exports the rectangle to GML3 Envelope
* \returns QDomElement
*/
static QDomElement rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc, int precision = 17 );
static QDomElement rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc, int precision = 17 );

/**
* Exports the rectangle to GML3 Envelope
* \returns QDomElement
*/
static QDomElement rectangleToGMLEnvelope( QgsRectangle *env, QDomDocument &doc,
static QDomElement rectangleToGMLEnvelope( const QgsRectangle *env, QDomDocument &doc,
const QString &srsName,
bool invertAxisOrientation,
int precision = 17 );
Expand Down
3 changes: 2 additions & 1 deletion src/providers/wfs/qgsbackgroundcachedfeatureiterator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ void QgsFeatureDownloaderProgressTask::setDownloaded( long long count )
// -------------------------

QgsFeatureDownloaderImpl::QgsFeatureDownloaderImpl( QgsBackgroundCachedSharedData *shared, QgsFeatureDownloader *downloader )
: mSharedBase( shared ), mDownloader( downloader )
: mSharedBase( shared )
, mDownloader( downloader )
{
// Needed because used by a signal
qRegisterMetaType<QVector<QgsFeatureUniqueIdPair>>( "QVector<QgsFeatureUniqueIdPair>" );
Expand Down
6 changes: 5 additions & 1 deletion src/providers/wfs/qgswfsfeatureiterator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ QString QgsWFSFeatureHitsAsyncRequest::errorMessageWithReason( const QString &re
// -------------------------

QgsWFSFeatureDownloaderImpl::QgsWFSFeatureDownloaderImpl( QgsWFSSharedData *shared, QgsFeatureDownloader *downloader, bool requestMadeFromMainThread )
: QgsWfsRequest( shared->mURI ), QgsFeatureDownloaderImpl( shared, downloader ), mShared( shared ), mPageSize( shared->mPageSize ), mFeatureHitsAsyncRequest( shared->mURI )
: QgsWfsRequest( shared->mURI )
, QgsFeatureDownloaderImpl( shared, downloader )
, mShared( shared )
, mPageSize( shared->mPageSize )
, mFeatureHitsAsyncRequest( shared->mURI )
{
QGS_FEATURE_DOWNLOADER_IMPL_CONNECT_SIGNALS( requestMadeFromMainThread );
}
Expand Down
Loading