Skip to content

Commit 6188b16

Browse files
3nidsnyalldawson
3nids
authored and
nyalldawson
committedDec 15, 2017
missing const ref, remove extra argument
1 parent d404a32 commit 6188b16

10 files changed

+27
-25
lines changed
 

‎python/core/qgscoordinatetransformcontext.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@ class QgsCoordinateTransformContext
137137
:rtype: QgsCoordinateTransform.TransformPair
138138
%End
139139

140-
void readXml( const QDomElement &element, const QDomDocument &document, const QgsReadWriteContext &context );
140+
void readXml( const QDomElement &element, const QgsReadWriteContext &context );
141141
%Docstring
142142
Reads the context's state from a DOM ``element``.
143143
.. seealso:: writeXml()
144144
%End
145145

146-
void writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
146+
void writeXml( QDomElement &element, const QgsReadWriteContext &context ) const;
147147
%Docstring
148148
Writes the context's state to a DOM ``element``.
149149
.. seealso:: readXml()

‎src/app/qgisapp.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3184,7 +3184,7 @@ void QgisApp::setupConnections()
31843184
this, &QgisApp::mapCanvas_keyPressed );
31853185

31863186
// project crs connections
3187-
connect( QgsProject::instance(), &QgsProject::crsChanged, this, &QgisApp::onProjectCrsChanged );
3187+
connect( QgsProject::instance(), &QgsProject::crsChanged, this, &QgisApp::projectCrsChanged );
31883188

31893189
connect( QgsProject::instance(), &QgsProject::labelingEngineSettingsChanged,
31903190
this, [ = ]
@@ -9119,7 +9119,7 @@ void QgisApp::onFocusChanged( QWidget *oldWidget, QWidget *newWidget )
91199119
}
91209120
}
91219121

9122-
void QgisApp::onProjectCrsChanged()
9122+
void QgisApp::projectCrsChanged()
91239123
{
91249124
updateCrsStatusBar();
91259125
QgsDebugMsgLevel( QString( "QgisApp::setupConnections -1- : QgsProject::instance()->crs().description[%1]ellipsoid[%2]" ).arg( QgsProject::instance()->crs().description() ).arg( QgsProject::instance()->crs().ellipsoidAcronym() ), 3 );
@@ -9140,8 +9140,8 @@ void QgisApp::onProjectCrsChanged()
91409140
}
91419141
if ( transformsToAskFor.count() == 1 )
91429142
{
9143-
askForDatumTransform( transformsToAskFor.at( 0 ),
9144-
QgsProject::instance()->crs() );
9143+
askUserForDatumTransform( transformsToAskFor.at( 0 ),
9144+
QgsProject::instance()->crs() );
91459145
}
91469146
else if ( transformsToAskFor.count() > 1 )
91479147
{
@@ -9457,7 +9457,7 @@ void QgisApp::setLayerCrs()
94579457
{
94589458
if ( child->layer() )
94599459
{
9460-
askForDatumTransform( crs, QgsProject::instance()->crs() );
9460+
askUserForDatumTransform( crs, QgsProject::instance()->crs() );
94619461
child->layer()->setCrs( crs );
94629462
child->layer()->triggerRepaint();
94639463
}
@@ -9468,7 +9468,7 @@ void QgisApp::setLayerCrs()
94689468
QgsLayerTreeLayer *nodeLayer = QgsLayerTree::toLayer( node );
94699469
if ( nodeLayer->layer() )
94709470
{
9471-
askForDatumTransform( crs, QgsProject::instance()->crs() );
9471+
askUserForDatumTransform( crs, QgsProject::instance()->crs() );
94729472
nodeLayer->layer()->setCrs( crs );
94739473
nodeLayer->layer()->triggerRepaint();
94749474
}
@@ -12563,8 +12563,10 @@ void QgisApp::writeDockWidgetSettings( QDockWidget *dockWidget, QDomElement &ele
1256312563
elem.setAttribute( QStringLiteral( "area" ), dockWidgetArea( dockWidget ) );
1256412564
}
1256512565

12566-
bool QgisApp::askForDatumTransform( QgsCoordinateReferenceSystem sourceCrs, QgsCoordinateReferenceSystem destinationCrs )
12566+
bool QgisApp::askUserForDatumTransform( const QgsCoordinateReferenceSystem &sourceCrs, const QgsCoordinateReferenceSystem &destinationCrs )
1256712567
{
12568+
Q_ASSERT( qApp->thread() == QThread::currentThread() );
12569+
1256812570
bool ok = false;
1256912571

1257012572
QgsCoordinateTransformContext context = QgsProject::instance()->transformContext();

‎src/app/qgisapp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
697697
* \returns true if a datum transform has been specifically chosen by user or only one is available.
698698
* \since 3.0
699699
*/
700-
bool askForDatumTransform( QgsCoordinateReferenceSystem sourceCrs, QgsCoordinateReferenceSystem destinationCrs );
700+
bool askUserForDatumTransform( const QgsCoordinateReferenceSystem &sourceCrs, const QgsCoordinateReferenceSystem &destinationCrs );
701701

702702
public slots:
703703
//! save current vector layer
@@ -1616,7 +1616,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
16161616
void onFocusChanged( QWidget *oldWidget, QWidget *newWidget );
16171617

16181618
//! handle project crs changes
1619-
void onProjectCrsChanged();
1619+
void projectCrsChanged();
16201620

16211621
signals:
16221622

‎src/app/qgisappinterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,5 +827,5 @@ void QgisAppInterface::deregisterLocatorFilter( QgsLocatorFilter *filter )
827827

828828
bool QgisAppInterface::askForDatumTransform( QgsCoordinateReferenceSystem sourceCrs, QgsCoordinateReferenceSystem destinationCrs )
829829
{
830-
return qgis->askForDatumTransform( sourceCrs, destinationCrs );
830+
return qgis->askUserForDatumTransform( sourceCrs, destinationCrs );
831831
}

‎src/app/qgsclipboard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ QgsFeatureList QgsClipboard::transformedCopyOf( const QgsCoordinateReferenceSyst
270270
{
271271
QgsFeatureList featureList = copyOf( fields );
272272

273-
QgisApp::instance()->askForDatumTransform( crs(), destCRS );
273+
QgisApp::instance()->askUserForDatumTransform( crs(), destCRS );
274274
QgsCoordinateTransform ct = QgsCoordinateTransform( crs(), destCRS, QgsProject::instance() );
275275

276276
QgsDebugMsg( "transforming clipboard." );

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ void QgsRasterLayerProperties::pbnAddValuesManually_clicked()
12211221

12221222
void QgsRasterLayerProperties::mCrsSelector_crsChanged( const QgsCoordinateReferenceSystem &crs )
12231223
{
1224-
QgisApp::instance()->askForDatumTransform( crs, QgsProject::instance()->crs() );
1224+
QgisApp::instance()->askUserForDatumTransform( crs, QgsProject::instance()->crs() );
12251225
mRasterLayer->setCrs( crs );
12261226
}
12271227

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ void QgsVectorLayerProperties::mLayerOrigNameLineEdit_textEdited( const QString
831831

832832
void QgsVectorLayerProperties::mCrsSelector_crsChanged( const QgsCoordinateReferenceSystem &crs )
833833
{
834-
QgisApp::instance()->askForDatumTransform( crs, QgsProject::instance()->crs() );
834+
QgisApp::instance()->askUserForDatumTransform( crs, QgsProject::instance()->crs() );
835835
mLayer->setCrs( crs );
836836
mMetadataFilled = false;
837837
}

‎src/core/qgscoordinatetransformcontext.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ QgsCoordinateTransform::TransformPair QgsCoordinateTransformContext::calculateDa
161161
#endif
162162
}
163163

164-
void QgsCoordinateTransformContext::readXml( const QDomElement &element, const QDomDocument &, const QgsReadWriteContext & )
164+
void QgsCoordinateTransformContext::readXml( const QDomElement &element, const QgsReadWriteContext & )
165165
{
166166
d.detach();
167167
d->mLock.lockForWrite();
@@ -231,16 +231,16 @@ void QgsCoordinateTransformContext::readXml( const QDomElement &element, const Q
231231
d->mLock.unlock();
232232
}
233233

234-
void QgsCoordinateTransformContext::writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext & ) const
234+
void QgsCoordinateTransformContext::writeXml( QDomElement &element, const QgsReadWriteContext & ) const
235235
{
236236
d->mLock.lockForRead();
237237

238-
QDomElement contextElem = document.createElement( QStringLiteral( "transformContext" ) );
238+
QDomElement contextElem = element.ownerDocument().createElement( QStringLiteral( "transformContext" ) );
239239

240240
//src/dest transforms
241241
for ( auto it = d->mSourceDestDatumTransforms.constBegin(); it != d->mSourceDestDatumTransforms.constEnd(); ++ it )
242242
{
243-
QDomElement transformElem = document.createElement( QStringLiteral( "srcDest" ) );
243+
QDomElement transformElem = element.ownerDocument().createElement( QStringLiteral( "srcDest" ) );
244244
transformElem.setAttribute( QStringLiteral( "source" ), it.key().first );
245245
transformElem.setAttribute( QStringLiteral( "dest" ), it.key().second );
246246
transformElem.setAttribute( QStringLiteral( "sourceTransform" ), it.value().sourceTransformId );
@@ -252,7 +252,7 @@ void QgsCoordinateTransformContext::writeXml( QDomElement &element, QDomDocument
252252
// src transforms
253253
for ( auto it = d->mSourceDatumTransforms.constBegin(); it != d->mSourceDatumTransforms.constEnd(); ++ it )
254254
{
255-
QDomElement transformElem = document.createElement( QStringLiteral( "source" ) );
255+
QDomElement transformElem = element.ownerDocument().createElement( QStringLiteral( "source" ) );
256256
transformElem.setAttribute( QStringLiteral( "crs" ), it.key() );
257257
transformElem.setAttribute( QStringLiteral( "transform" ), it.value() );
258258
contextElem.appendChild( transformElem );
@@ -261,7 +261,7 @@ void QgsCoordinateTransformContext::writeXml( QDomElement &element, QDomDocument
261261
// dest transforms
262262
for ( auto it = d->mDestDatumTransforms.constBegin(); it != d->mDestDatumTransforms.constEnd(); ++ it )
263263
{
264-
QDomElement transformElem = document.createElement( QStringLiteral( "dest" ) );
264+
QDomElement transformElem = element.ownerDocument().createElement( QStringLiteral( "dest" ) );
265265
transformElem.setAttribute( QStringLiteral( "crs" ), it.key() );
266266
transformElem.setAttribute( QStringLiteral( "transform" ), it.value() );
267267
contextElem.appendChild( transformElem );

‎src/core/qgscoordinatetransformcontext.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,13 @@ class CORE_EXPORT QgsCoordinateTransformContext
235235
* Reads the context's state from a DOM \a element.
236236
* \see writeXml()
237237
*/
238-
void readXml( const QDomElement &element, const QDomDocument &document, const QgsReadWriteContext &context );
238+
void readXml( const QDomElement &element, const QgsReadWriteContext &context );
239239

240240
/**
241241
* Writes the context's state to a DOM \a element.
242242
* \see readXml()
243243
*/
244-
void writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
244+
void writeXml( QDomElement &element, const QgsReadWriteContext &context ) const;
245245

246246

247247
/**

‎src/core/qgsproject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ bool QgsProject::readProjectFile( const QString &filename )
925925
}
926926
mCrs = projectCrs;
927927

928-
mTransformContext.readXml( doc->documentElement(), *doc, context );
928+
mTransformContext.readXml( doc->documentElement(), context );
929929
emit transformContextChanged();
930930

931931
QDomNodeList nl = doc->elementsByTagName( QStringLiteral( "autotransaction" ) );
@@ -1464,7 +1464,7 @@ bool QgsProject::writeProjectFile( const QString &filename )
14641464

14651465
mLabelingEngineSettings->writeSettingsToProject( this );
14661466

1467-
mTransformContext.writeXml( qgisNode, *doc, context );
1467+
mTransformContext.writeXml( qgisNode, context );
14681468

14691469
QDomElement annotationsElem = mAnnotationManager->writeXml( *doc, context );
14701470
qgisNode.appendChild( annotationsElem );

0 commit comments

Comments
 (0)
Please sign in to comment.