More coordinateTranformContext -> tranformContext

qgis · Apr 17, 2019 · 7f271d1ebdd4ade93bc49af4c9799a0822beddde · 7f271d1
1 parent 4707598
commit 7f271d1ebdd4ade93bc49af4c9799a0822beddde
diff --git a/python/core/auto_generated/qgsdataprovider.sip.in b/python/core/auto_generated/qgsdataprovider.sip.in
@@ -391,7 +391,7 @@ Returns ``True`` if metadata was successfully written to the data provider.
 %Docstring
 Returns data provider coordinate transform context
 
-.. seealso:: :py:func:`setTranformContext`
+.. seealso:: :py:func:`setTransformContext`
 
 .. versionadded:: 3.10
 %End

diff --git a/python/core/auto_generated/qgsreadwritecontext.sip.in b/python/core/auto_generated/qgsreadwritecontext.sip.in
@@ -113,20 +113,20 @@ It's usually the QgsProject where the function with the context is made and won'
 .. versionadded:: 3.4
 %End
 
-    QgsCoordinateTransformContext coordinateTransformContext() const;
+    QgsCoordinateTransformContext transformContext() const;
 %Docstring
 Returns data provider coordinate transform context
 
-.. seealso:: :py:func:`setCoordinateTranformContext`
+.. seealso:: :py:func:`setTranformContext`
 
 .. versionadded:: 3.10
 %End
 
-    void setCoordinateTransformContext( const QgsCoordinateTransformContext &coordinateTransformContext );
+    void setTransformContext( const QgsCoordinateTransformContext &transformContext );
 %Docstring
-Sets data coordinate transform context to ``coordinateTransformContext``
+Sets data coordinate transform context to ``transformContext``
 
-.. seealso:: :py:func:`coordinateTransformContext`
+.. seealso:: :py:func:`transformContext`
 
 .. versionadded:: 3.10
 %End

diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
@@ -525,7 +525,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
     /**
      * Returns data provider coordinate transform context
      *
-     * \see setTranformContext()
+     * \see setTransformContext()
      *
      * \since QGIS 3.10
      */

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -935,7 +935,7 @@ bool QgsProject::_getMapLayers( const QDomDocument &doc, QList<QDomNode> &broken
       QgsReadWriteContext context;
       context.setPathResolver( pathResolver() );
       context.setProjectTranslator( this );
-      context.setCoordinateTransformContext( transformContext() );
+      context.setTransformContext( transformContext() );
 
       if ( !addLayer( element, brokenNodes, context ) )
       {
@@ -1660,7 +1660,7 @@ bool QgsProject::readLayer( const QDomNode &layerNode )
   QgsReadWriteContext context;
   context.setPathResolver( pathResolver() );
   context.setProjectTranslator( this );
-  context.setCoordinateTransformContext( transformContext() );
+  context.setTransformContext( transformContext() );
   QList<QDomNode> brokenNodes;
   if ( addLayer( layerNode.toElement(), brokenNodes, context ) )
   {
@@ -1708,7 +1708,7 @@ bool QgsProject::write()
     }
 
     QgsReadWriteContext context;
-    context.setCoordinateTransformContext( transformContext() );
+    context.setTransformContext( transformContext() );
     if ( !storage->writeProject( mFile.fileName(), &tmpZipFile, context ) )
     {
       QString err = tr( "Unable to save project to storage %1" ).arg( mFile.fileName() );
@@ -1765,7 +1765,7 @@ bool QgsProject::writeProjectFile( const QString &filename )
 
   QgsReadWriteContext context;
   context.setPathResolver( pathResolver() );
-  context.setCoordinateTransformContext( transformContext() );
+  context.setTransformContext( transformContext() );
 
   QDomImplementation DomImplementation;
   DomImplementation.setInvalidDataPolicy( QDomImplementation::DropInvalidChars );
@@ -2321,7 +2321,7 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
   if ( !useAbsolutePaths )
     embeddedContext.setPathResolver( QgsPathResolver( projectFilePath ) );
   embeddedContext.setProjectTranslator( this );
-  embeddedContext.setCoordinateTransformContext( transformContext() );
+  embeddedContext.setTransformContext( transformContext() );
 
   QDomElement projectLayersElem = sProjectDocument.documentElement().firstChildElement( QStringLiteral( "projectlayers" ) );
   if ( projectLayersElem.isNull() )
@@ -2379,7 +2379,7 @@ QgsLayerTreeGroup *QgsProject::createEmbeddedGroup( const QString &groupName, co
   QgsReadWriteContext context;
   context.setPathResolver( pathResolver() );
   context.setProjectTranslator( this );
-  context.setCoordinateTransformContext( transformContext() );
+  context.setTransformContext( transformContext() );
 
   QgsLayerTreeGroup *root = new QgsLayerTreeGroup;
 

diff --git a/src/core/qgsreadwritecontext.cpp b/src/core/qgsreadwritecontext.cpp
@@ -56,14 +56,14 @@ void QgsReadWriteContext::leaveCategory()
     mCategories.pop_back();
 }
 
-QgsCoordinateTransformContext QgsReadWriteContext::coordinateTransformContext() const
+QgsCoordinateTransformContext QgsReadWriteContext::transformContext() const
 {
   return mCoordinateTransformContext;
 }
 
-void QgsReadWriteContext::setCoordinateTransformContext( const QgsCoordinateTransformContext &value )
+void QgsReadWriteContext::setTransformContext( const QgsCoordinateTransformContext &transformContext )
 {
-  mCoordinateTransformContext = value;
+  mCoordinateTransformContext = transformContext;
 }
 
 void QgsReadWriteContext::setProjectTranslator( QgsProjectTranslator *projectTranslator )

diff --git a/src/core/qgsreadwritecontext.h b/src/core/qgsreadwritecontext.h
@@ -118,20 +118,20 @@ class CORE_EXPORT QgsReadWriteContext
     /**
      * Returns data provider coordinate transform context
      *
-     * \see setCoordinateTranformContext()
+     * \see setTranformContext()
      *
      * \since QGIS 3.10
      */
-    QgsCoordinateTransformContext coordinateTransformContext() const;
+    QgsCoordinateTransformContext transformContext() const;
 
     /**
-     * Sets data coordinate transform context to \a coordinateTransformContext
+     * Sets data coordinate transform context to \a transformContext
      *
-     * \see coordinateTransformContext()
+     * \see transformContext()
      *
      * \since QGIS 3.10
      */
-    void setCoordinateTransformContext( const QgsCoordinateTransformContext &coordinateTransformContext );
+    void setTransformContext( const QgsCoordinateTransformContext &transformContext );
 
   private:
 

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1752,7 +1752,7 @@ bool QgsRasterLayer::readXml( const QDomNode &layer_node, QgsReadWriteContext &c
     // <<< BACKWARD COMPATIBILITY < 1.9
   }
 
-  QgsDataProvider::ProviderOptions providerOptions { context.coordinateTransformContext() };
+  QgsDataProvider::ProviderOptions providerOptions { context.transformContext() };
   setDataProvider( mProviderKey, providerOptions );
 
   if ( ! mDataProvider )