Skip to content

Commit 7f271d1

Browse files
elpasonyalldawson
elpaso
authored and
nyalldawson
committedApr 17, 2019
More coordinateTranformContext -> tranformContext
·
ltr-3_40final-3_8_0
1 parent 4707598 commit 7f271d1

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed
 

‎python/core/auto_generated/qgsdataprovider.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ Returns ``True`` if metadata was successfully written to the data provider.
391391
%Docstring
392392
Returns data provider coordinate transform context
393393

394-
.. seealso:: :py:func:`setTranformContext`
394+
.. seealso:: :py:func:`setTransformContext`
395395

396396
.. versionadded:: 3.10
397397
%End

‎python/core/auto_generated/qgsreadwritecontext.sip.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,20 @@ It's usually the QgsProject where the function with the context is made and won'
113113
.. versionadded:: 3.4
114114
%End
115115

116-
QgsCoordinateTransformContext coordinateTransformContext() const;
116+
QgsCoordinateTransformContext transformContext() const;
117117
%Docstring
118118
Returns data provider coordinate transform context
119119

120-
.. seealso:: :py:func:`setCoordinateTranformContext`
120+
.. seealso:: :py:func:`setTranformContext`
121121

122122
.. versionadded:: 3.10
123123
%End
124124

125-
void setCoordinateTransformContext( const QgsCoordinateTransformContext &coordinateTransformContext );
125+
void setTransformContext( const QgsCoordinateTransformContext &transformContext );
126126
%Docstring
127-
Sets data coordinate transform context to ``coordinateTransformContext``
127+
Sets data coordinate transform context to ``transformContext``
128128

129-
.. seealso:: :py:func:`coordinateTransformContext`
129+
.. seealso:: :py:func:`transformContext`
130130

131131
.. versionadded:: 3.10
132132
%End

‎src/core/qgsdataprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
525525
/**
526526
* Returns data provider coordinate transform context
527527
*
528-
* \see setTranformContext()
528+
* \see setTransformContext()
529529
*
530530
* \since QGIS 3.10
531531
*/

‎src/core/qgsproject.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ bool QgsProject::_getMapLayers( const QDomDocument &doc, QList<QDomNode> &broken
935935
QgsReadWriteContext context;
936936
context.setPathResolver( pathResolver() );
937937
context.setProjectTranslator( this );
938-
context.setCoordinateTransformContext( transformContext() );
938+
context.setTransformContext( transformContext() );
939939

940940
if ( !addLayer( element, brokenNodes, context ) )
941941
{
@@ -1660,7 +1660,7 @@ bool QgsProject::readLayer( const QDomNode &layerNode )
16601660
QgsReadWriteContext context;
16611661
context.setPathResolver( pathResolver() );
16621662
context.setProjectTranslator( this );
1663-
context.setCoordinateTransformContext( transformContext() );
1663+
context.setTransformContext( transformContext() );
16641664
QList<QDomNode> brokenNodes;
16651665
if ( addLayer( layerNode.toElement(), brokenNodes, context ) )
16661666
{
@@ -1708,7 +1708,7 @@ bool QgsProject::write()
17081708
}
17091709

17101710
QgsReadWriteContext context;
1711-
context.setCoordinateTransformContext( transformContext() );
1711+
context.setTransformContext( transformContext() );
17121712
if ( !storage->writeProject( mFile.fileName(), &tmpZipFile, context ) )
17131713
{
17141714
QString err = tr( "Unable to save project to storage %1" ).arg( mFile.fileName() );
@@ -1765,7 +1765,7 @@ bool QgsProject::writeProjectFile( const QString &filename )
17651765

17661766
QgsReadWriteContext context;
17671767
context.setPathResolver( pathResolver() );
1768-
context.setCoordinateTransformContext( transformContext() );
1768+
context.setTransformContext( transformContext() );
17691769

17701770
QDomImplementation DomImplementation;
17711771
DomImplementation.setInvalidDataPolicy( QDomImplementation::DropInvalidChars );
@@ -2321,7 +2321,7 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
23212321
if ( !useAbsolutePaths )
23222322
embeddedContext.setPathResolver( QgsPathResolver( projectFilePath ) );
23232323
embeddedContext.setProjectTranslator( this );
2324-
embeddedContext.setCoordinateTransformContext( transformContext() );
2324+
embeddedContext.setTransformContext( transformContext() );
23252325

23262326
QDomElement projectLayersElem = sProjectDocument.documentElement().firstChildElement( QStringLiteral( "projectlayers" ) );
23272327
if ( projectLayersElem.isNull() )
@@ -2379,7 +2379,7 @@ QgsLayerTreeGroup *QgsProject::createEmbeddedGroup( const QString &groupName, co
23792379
QgsReadWriteContext context;
23802380
context.setPathResolver( pathResolver() );
23812381
context.setProjectTranslator( this );
2382-
context.setCoordinateTransformContext( transformContext() );
2382+
context.setTransformContext( transformContext() );
23832383

23842384
QgsLayerTreeGroup *root = new QgsLayerTreeGroup;
23852385

‎src/core/qgsreadwritecontext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ void QgsReadWriteContext::leaveCategory()
5656
mCategories.pop_back();
5757
}
5858

59-
QgsCoordinateTransformContext QgsReadWriteContext::coordinateTransformContext() const
59+
QgsCoordinateTransformContext QgsReadWriteContext::transformContext() const
6060
{
6161
return mCoordinateTransformContext;
6262
}
6363

64-
void QgsReadWriteContext::setCoordinateTransformContext( const QgsCoordinateTransformContext &value )
64+
void QgsReadWriteContext::setTransformContext( const QgsCoordinateTransformContext &transformContext )
6565
{
66-
mCoordinateTransformContext = value;
66+
mCoordinateTransformContext = transformContext;
6767
}
6868

6969
void QgsReadWriteContext::setProjectTranslator( QgsProjectTranslator *projectTranslator )

‎src/core/qgsreadwritecontext.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,20 @@ class CORE_EXPORT QgsReadWriteContext
118118
/**
119119
* Returns data provider coordinate transform context
120120
*
121-
* \see setCoordinateTranformContext()
121+
* \see setTranformContext()
122122
*
123123
* \since QGIS 3.10
124124
*/
125-
QgsCoordinateTransformContext coordinateTransformContext() const;
125+
QgsCoordinateTransformContext transformContext() const;
126126

127127
/**
128-
* Sets data coordinate transform context to \a coordinateTransformContext
128+
* Sets data coordinate transform context to \a transformContext
129129
*
130-
* \see coordinateTransformContext()
130+
* \see transformContext()
131131
*
132132
* \since QGIS 3.10
133133
*/
134-
void setCoordinateTransformContext( const QgsCoordinateTransformContext &coordinateTransformContext );
134+
void setTransformContext( const QgsCoordinateTransformContext &transformContext );
135135

136136
private:
137137

‎src/core/raster/qgsrasterlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,7 +1752,7 @@ bool QgsRasterLayer::readXml( const QDomNode &layer_node, QgsReadWriteContext &c
17521752
// <<< BACKWARD COMPATIBILITY < 1.9
17531753
}
17541754

1755-
QgsDataProvider::ProviderOptions providerOptions { context.coordinateTransformContext() };
1755+
QgsDataProvider::ProviderOptions providerOptions { context.transformContext() };
17561756
setDataProvider( mProviderKey, providerOptions );
17571757

17581758
if ( ! mDataProvider )

0 commit comments

Comments
 (0)
Please sign in to comment.