Use structs instead of pairs

nyalldawson · nyalldawson · commit 8d3f710005d2 · 2019-03-22T15:38:11.000+10:00
diff --git a/src/app/qgsdatumtransformtablewidget.cpp b/src/app/qgsdatumtransformtablewidget.cpp
@@ -200,9 +200,9 @@ void QgsDatumTransformTableWidget::addDatumTransform()
   QgsDatumTransformDialog dlg( QgsCoordinateReferenceSystem(), QgsCoordinateReferenceSystem(), true, false, false );
   if ( dlg.exec() )
   {
-    QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > dt = dlg.selectedDatumTransforms();
+    const QgsDatumTransformDialog::TransformInfo dt = dlg.selectedDatumTransform();
     QgsCoordinateTransformContext context = mModel->transformContext();
-    context.addSourceDestinationDatumTransform( dt.first.first, dt.second.first, dt.first.second, dt.second.second );
+    context.addSourceDestinationDatumTransform( dt.sourceCrs, dt.destinationCrs, dt.sourceTransformId, dt.destinationTransformId );
     mModel->setTransformContext( context );
     selectionChanged();
   }
@@ -253,10 +253,10 @@ void QgsDatumTransformTableWidget::editDatumTransform()
       QgsDatumTransformDialog dlg( sourceCrs, destinationCrs, true, false, false, qMakePair( sourceTransform, destinationTransform ) );
       if ( dlg.exec() )
       {
-        QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > dt = dlg.selectedDatumTransforms();
+        const QgsDatumTransformDialog::TransformInfo dt = dlg.selectedDatumTransform();
         QgsCoordinateTransformContext context = mModel->transformContext();
         // QMap::insert takes care of replacing existing value
-        context.addSourceDestinationDatumTransform( sourceCrs, destinationCrs, dt.first.second, dt.second.second );
+        context.addSourceDestinationDatumTransform( sourceCrs, destinationCrs, dt.sourceTransformId, dt.destinationTransformId );
         mModel->setTransformContext( context );
       }
     }
diff --git a/src/gui/qgsdatumtransformdialog.cpp b/src/gui/qgsdatumtransformdialog.cpp
@@ -43,9 +43,9 @@ bool QgsDatumTransformDialog::run( const QgsCoordinateReferenceSystem &sourceCrs
   {
     if ( dlg.exec() )
     {
-      QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > dt = dlg.selectedDatumTransforms();
+      const TransformInfo dt = dlg.selectedDatumTransform();
       QgsCoordinateTransformContext context = QgsProject::instance()->transformContext();
-      context.addSourceDestinationDatumTransform( dt.first.first, dt.second.first, dt.first.second, dt.second.second );
+      context.addSourceDestinationDatumTransform( dt.sourceCrs, dt.destinationCrs, dt.sourceTransformId, dt.destinationTransformId );
       QgsProject::instance()->setTransformContext( context );
       return true;
     }
@@ -255,15 +255,15 @@ void QgsDatumTransformDialog::accept()
     QgsSettings settings;
     settings.beginGroup( QStringLiteral( "/Projections" ) );
 
-    QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > dt = selectedDatumTransforms();
+    const TransformInfo dt = selectedDatumTransform();
 
-    QString srcAuthId = dt.first.first.authid();
-    QString destAuthId = dt.second.first.authid();
-    int sourceDatumTransform = dt.first.second;
+    QString srcAuthId = dt.sourceCrs.authid();
+    QString destAuthId = dt.destinationCrs.authid();
+    int sourceDatumTransform = dt.sourceTransformId;
     QString sourceDatumProj;
     if ( sourceDatumTransform >= 0 )
       sourceDatumProj = QgsDatumTransform::datumTransformToProj( sourceDatumTransform );
-    int destinationDatumTransform = dt.second.second;
+    int destinationDatumTransform = dt.destinationTransformId;
     QString destinationDatumProj;
     if ( destinationDatumTransform >= 0 )
       destinationDatumProj = QgsDatumTransform::datumTransformToProj( destinationDatumTransform );
@@ -292,23 +292,23 @@ bool QgsDatumTransformDialog::shouldAskUserForSelection() const
   return false;
 }
 
-QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > QgsDatumTransformDialog::defaultDatumTransform() const
+QgsDatumTransformDialog::TransformInfo QgsDatumTransformDialog::defaultDatumTransform() const
 {
-  QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > preferredNonDeprecated;
-  preferredNonDeprecated.first.first = mSourceCrs;
-  preferredNonDeprecated.second.first = mDestinationCrs;
+  TransformInfo preferredNonDeprecated;
+  preferredNonDeprecated.sourceCrs = mSourceCrs;
+  preferredNonDeprecated.destinationCrs = mDestinationCrs;
   bool foundPreferredNonDeprecated = false;
-  QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > preferred;
-  preferred.first.first = mSourceCrs;
-  preferred.second.first = mDestinationCrs;
+  TransformInfo preferred;
+  preferred.sourceCrs = mSourceCrs;
+  preferred.destinationCrs = mDestinationCrs;
   bool foundPreferred  = false;
-  QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > nonDeprecated;
-  nonDeprecated.first.first = mSourceCrs;
-  nonDeprecated.second.first = mDestinationCrs;
+  TransformInfo nonDeprecated;
+  nonDeprecated.sourceCrs = mSourceCrs;
+  nonDeprecated.destinationCrs = mDestinationCrs;
   bool foundNonDeprecated = false;
-  QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > fallback;
-  fallback.first.first = mSourceCrs;
-  fallback.second.first = mDestinationCrs;
+  TransformInfo fallback;
+  fallback.sourceCrs = mSourceCrs;
+  fallback.destinationCrs = mDestinationCrs;
   bool foundFallback = false;
 
   for ( const QgsDatumTransform::TransformPair &transform : qgis::as_const( mDatumTransforms ) )
@@ -321,28 +321,28 @@ QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSyst
     if ( !foundPreferredNonDeprecated && ( ( srcInfo.preferred && !srcInfo.deprecated ) || transform.sourceTransformId == -1 )
          && ( ( destInfo.preferred && !destInfo.deprecated ) || transform.destinationTransformId == -1 ) )
     {
-      preferredNonDeprecated.first.second = transform.sourceTransformId;
-      preferredNonDeprecated.second.second = transform.destinationTransformId;
+      preferredNonDeprecated.sourceTransformId = transform.sourceTransformId;
+      preferredNonDeprecated.destinationTransformId = transform.destinationTransformId;
       foundPreferredNonDeprecated = true;
     }
     else if ( !foundPreferred && ( srcInfo.preferred || transform.sourceTransformId == -1 ) &&
               ( destInfo.preferred || transform.destinationTransformId == -1 ) )
     {
-      preferred.first.second = transform.sourceTransformId;
-      preferred.second.second = transform.destinationTransformId;
+      preferred.sourceTransformId = transform.sourceTransformId;
+      preferred.destinationTransformId = transform.destinationTransformId;
       foundPreferred = true;
     }
     else if ( !foundNonDeprecated && ( !srcInfo.deprecated || transform.sourceTransformId == -1 )
               && ( !destInfo.deprecated || transform.destinationTransformId == -1 ) )
     {
-      nonDeprecated.first.second = transform.sourceTransformId;
-      nonDeprecated.second.second = transform.destinationTransformId;
+      nonDeprecated.sourceTransformId = transform.sourceTransformId;
+      nonDeprecated.destinationTransformId = transform.destinationTransformId;
       foundNonDeprecated = true;
     }
     else if ( !foundFallback )
     {
-      fallback.first.second = transform.sourceTransformId;
-      fallback.second.second = transform.destinationTransformId;
+      fallback.sourceTransformId = transform.sourceTransformId;
+      fallback.destinationTransformId = transform.destinationTransformId;
       foundFallback = true;
     }
   }
@@ -361,30 +361,30 @@ void QgsDatumTransformDialog::applyDefaultTransform()
   if ( mDatumTransforms.count() > 0 )
   {
     QgsCoordinateTransformContext context = QgsProject::instance()->transformContext();
-    const QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > dt = defaultDatumTransform();
-    context.addSourceDestinationDatumTransform( dt.first.first, dt.second.first, dt.first.second, dt.second.second );
+    const TransformInfo dt = defaultDatumTransform();
+    context.addSourceDestinationDatumTransform( dt.sourceCrs, dt.destinationCrs, dt.sourceTransformId, dt.destinationTransformId );
     QgsProject::instance()->setTransformContext( context );
   }
 }
 
-QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int> > QgsDatumTransformDialog::selectedDatumTransforms()
+QgsDatumTransformDialog::TransformInfo QgsDatumTransformDialog::selectedDatumTransform()
 {
   int row = mDatumTransformTableWidget->currentRow();
-  QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > sdt;
-  sdt.first.first = mSourceCrs;
-  sdt.second.first = mDestinationCrs;
+  TransformInfo sdt;
+  sdt.sourceCrs = mSourceCrs;
+  sdt.destinationCrs = mDestinationCrs;
 
   if ( row >= 0 )
   {
     QTableWidgetItem *srcItem = mDatumTransformTableWidget->item( row, 0 );
-    sdt.first.second = srcItem ? srcItem->data( Qt::UserRole ).toInt() : -1;
+    sdt.sourceTransformId = srcItem ? srcItem->data( Qt::UserRole ).toInt() : -1;
     QTableWidgetItem *destItem = mDatumTransformTableWidget->item( row, 1 );
-    sdt.second.second = destItem ? destItem->data( Qt::UserRole ).toInt() : -1;
+    sdt.destinationTransformId = destItem ? destItem->data( Qt::UserRole ).toInt() : -1;
   }
   else
   {
-    sdt.first.second = -1;
-    sdt.second.second = -1;
+    sdt.sourceTransformId = -1;
+    sdt.destinationTransformId = -1;
   }
   return sdt;
 }
diff --git a/src/gui/qgsdatumtransformdialog.h b/src/gui/qgsdatumtransformdialog.h
@@ -37,6 +37,22 @@ class GUI_EXPORT QgsDatumTransformDialog : public QDialog, private Ui::QgsDatumT
     Q_OBJECT
   public:
 
+    //! Dialog transformation entry info
+    struct TransformInfo
+    {
+      //! Source coordinate reference system
+      QgsCoordinateReferenceSystem sourceCrs;
+
+      //! Source transform ID
+      int sourceTransformId = -1;
+
+      //! Destination coordinate reference system
+      QgsCoordinateReferenceSystem destinationCrs;
+
+      //! Destination transform ID
+      int destinationTransformId = -1;
+    };
+
     /**
      * Runs the dialog (if required) prompting for the desired transform to use from \a sourceCrs to
      * \a destinationCrs, updating the current project transform context as required
@@ -72,7 +88,7 @@ class GUI_EXPORT QgsDatumTransformDialog : public QDialog, private Ui::QgsDatumT
      * Returns the source and destination transforms, each being a pair of QgsCoordinateReferenceSystems and datum transform code
      * \since 3.0
      */
-    QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > selectedDatumTransforms();
+    TransformInfo selectedDatumTransform();
 
   private slots:
 
@@ -101,7 +117,7 @@ class GUI_EXPORT QgsDatumTransformDialog : public QDialog, private Ui::QgsDatumT
      * \see shouldAskUserForSelection()
      * \see applyDefaultTransform()
      */
-    QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > defaultDatumTransform() const;
+    TransformInfo defaultDatumTransform() const;
 
     /**
      * Applies the defaultDatumTransform(), adding it to the current QgsProject instance.

Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,9 @@ void QgsDatumTransformTableWidget::addDatumTransform()`
`200`	`200`	`QgsDatumTransformDialog dlg( QgsCoordinateReferenceSystem(), QgsCoordinateReferenceSystem(), true, false, false );`
`201`	`201`	`if ( dlg.exec() )`
`202`	`202`	`{`
`203`		`- QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > dt = dlg.selectedDatumTransforms();`
	`203`	`+ const QgsDatumTransformDialog::TransformInfo dt = dlg.selectedDatumTransform();`
`204`	`204`	`QgsCoordinateTransformContext context = mModel->transformContext();`
`205`		`- context.addSourceDestinationDatumTransform( dt.first.first, dt.second.first, dt.first.second, dt.second.second );`
	`205`	`+ context.addSourceDestinationDatumTransform( dt.sourceCrs, dt.destinationCrs, dt.sourceTransformId, dt.destinationTransformId );`
`206`	`206`	`mModel->setTransformContext( context );`
`207`	`207`	`selectionChanged();`
`208`	`208`	`}`
`@@ -253,10 +253,10 @@ void QgsDatumTransformTableWidget::editDatumTransform()`
`253`	`253`	`QgsDatumTransformDialog dlg( sourceCrs, destinationCrs, true, false, false, qMakePair( sourceTransform, destinationTransform ) );`
`254`	`254`	`if ( dlg.exec() )`
`255`	`255`	`{`
`256`		`- QPair< QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSystem, int > > dt = dlg.selectedDatumTransforms();`
	`256`	`+ const QgsDatumTransformDialog::TransformInfo dt = dlg.selectedDatumTransform();`
`257`	`257`	`QgsCoordinateTransformContext context = mModel->transformContext();`
`258`	`258`	`// QMap::insert takes care of replacing existing value`
`259`		`- context.addSourceDestinationDatumTransform( sourceCrs, destinationCrs, dt.first.second, dt.second.second );`
	`259`	`+ context.addSourceDestinationDatumTransform( sourceCrs, destinationCrs, dt.sourceTransformId, dt.destinationTransformId );`
`260`	`260`	`mModel->setTransformContext( context );`
`261`	`261`	`}`
`262`	`262`	`}`