do not transform project if current_version > transform.to (#7807)

3nids · web-flow · commit d6b2537e1e7a · 2018-09-06T11:04:40.000-04:00
* do nottransform project if current_version &gt; transform.to
* use &gt;=
diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -65,7 +65,7 @@ QgsProjectFileTransform::TransformItem QgsProjectFileTransform::sTransformers[]
   // A transformer with a NULL from version means that it should be run when upgrading
   // from any version and will take care that it's not going to cause trouble if it's
   // run several times on the same file.
-  {PFV(), PFV( 2, 99, 0 ), &QgsProjectFileTransform::transform2990},
+  {PFV(), PFV( 3, 0, 0 ), &QgsProjectFileTransform::transform3000},
 };
 
 bool QgsProjectFileTransform::updateRevision( const QgsProjectVersion &newVersion )
@@ -78,7 +78,7 @@ bool QgsProjectFileTransform::updateRevision( const QgsProjectVersion &newVersio
     for ( std::size_t i = 0; i < sizeof( sTransformers ) / sizeof( TransformItem ); i++ )
     {
       const TransformItem &transformer = sTransformers[i];
-      if ( transformer.from == mCurrentVersion || transformer.from.isNull() )
+      if ( transformer.to >= mCurrentVersion && ( transformer.from == mCurrentVersion || transformer.from.isNull() ) )
       {
         // Run the transformer, and update the revision in every case
         ( this->*( transformer.transformFunc ) )();
@@ -621,7 +621,7 @@ void QgsProjectFileTransform::transform2200to2300()
   }
 }
 
-void QgsProjectFileTransform::transform2990()
+void QgsProjectFileTransform::transform3000()
 {
   // transform OTF off to "no projection" for project
   QDomElement propsElem = mDom.firstChildElement( QStringLiteral( "qgis" ) ).toElement().firstChildElement( QStringLiteral( "properties" ) );
diff --git a/src/core/qgsprojectfiletransform.h b/src/core/qgsprojectfiletransform.h
@@ -92,7 +92,7 @@ class CORE_EXPORT QgsProjectFileTransform
     void transform1400to1500();
     void transform1800to1900();
     void transform2200to2300();
-    void transform2990();
+    void transform3000();
 
     //helper functions
     static int rasterBandNumber( const QDomElement &rasterPropertiesElem, const QString &bandName, QgsRasterLayer *rlayer );

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ QgsProjectFileTransform::TransformItem QgsProjectFileTransform::sTransformers[]`
`65`	`65`	`// A transformer with a NULL from version means that it should be run when upgrading`
`66`	`66`	`// from any version and will take care that it's not going to cause trouble if it's`
`67`	`67`	`// run several times on the same file.`
`68`		`- {PFV(), PFV( 2, 99, 0 ), &QgsProjectFileTransform::transform2990},`
	`68`	`+ {PFV(), PFV( 3, 0, 0 ), &QgsProjectFileTransform::transform3000},`
`69`	`69`	`};`
`70`	`70`
`71`	`71`	`bool QgsProjectFileTransform::updateRevision( const QgsProjectVersion &newVersion )`
`@@ -78,7 +78,7 @@ bool QgsProjectFileTransform::updateRevision( const QgsProjectVersion &newVersio`
`78`	`78`	`for ( std::size_t i = 0; i < sizeof( sTransformers ) / sizeof( TransformItem ); i++ )`
`79`	`79`	`{`
`80`	`80`	`const TransformItem &transformer = sTransformers[i];`
`81`		`- if ( transformer.from == mCurrentVersion \|\| transformer.from.isNull() )`
	`81`	`+ if ( transformer.to >= mCurrentVersion && ( transformer.from == mCurrentVersion \|\| transformer.from.isNull() ) )`
`82`	`82`	`{`
`83`	`83`	`// Run the transformer, and update the revision in every case`
`84`	`84`	`( this->*( transformer.transformFunc ) )();`
`@@ -621,7 +621,7 @@ void QgsProjectFileTransform::transform2200to2300()`
`621`	`621`	`}`
`622`	`622`	`}`
`623`	`623`
`624`		`-void QgsProjectFileTransform::transform2990()`
	`624`	`+void QgsProjectFileTransform::transform3000()`
`625`	`625`	`{`
`626`	`626`	`// transform OTF off to "no projection" for project`
`627`	`627`	`QDomElement propsElem = mDom.firstChildElement( QStringLiteral( "qgis" ) ).toElement().firstChildElement( QStringLiteral( "properties" ) );`