Apply editor widget project upgrades in any case

m-kuhn · m-kuhn · commit a332ff92f83f · 2016-12-20T01:20:08.000+01:00
diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -35,7 +35,7 @@
 typedef QgsProjectVersion PFV;
 
 
-QgsProjectFileTransform::transform QgsProjectFileTransform::transformers[] =
+QgsProjectFileTransform::TransformItem QgsProjectFileTransform::sTransformers[] =
 {
   {PFV( 0, 8, 0 ), PFV( 0, 8, 1 ), &QgsProjectFileTransform::transformNull},
   {PFV( 0, 8, 1 ), PFV( 0, 9, 0 ), &QgsProjectFileTransform::transform081to090},
@@ -60,23 +60,27 @@ QgsProjectFileTransform::transform QgsProjectFileTransform::transformers[] =
   {PFV( 2, 0, 0 ), PFV( 2, 1, 0 ), &QgsProjectFileTransform::transformNull},
   {PFV( 2, 1, 0 ), PFV( 2, 2, 0 ), &QgsProjectFileTransform::transformNull},
   {PFV( 2, 2, 0 ), PFV( 2, 3, 0 ), &QgsProjectFileTransform::transform2200to2300},
-  {PFV( 2, 18, 0 ), PFV( 2, 99, 0 ), &QgsProjectFileTransform::transform2180to2990},
+  // 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},
 };
 
 bool QgsProjectFileTransform::updateRevision( const QgsProjectVersion& newVersion )
 {
   Q_UNUSED( newVersion );
   bool returnValue = false;
 
-  if ( ! mDom.isNull() )
+  if ( !mDom.isNull() )
   {
-    for ( std::size_t i = 0; i < sizeof( transformers ) / sizeof( transform ); i++ )
+    for ( std::size_t i = 0; i < sizeof( sTransformers ) / sizeof( TransformItem ); i++ )
     {
-      if ( transformers[i].from == mCurrentVersion )
+      const TransformItem& transformer = sTransformers[i];
+      if ( transformer.from == mCurrentVersion || transformer.from.isNull() )
       {
         // Run the transformer, and update the revision in every case
-        ( this->*( transformers[i].transformFunc ) )();
-        mCurrentVersion = transformers[i].to;
+        ( this->*( transformer.transformFunc ) )();
+        mCurrentVersion = transformer.to;
         returnValue = true;
       }
     }
@@ -614,7 +618,7 @@ void QgsProjectFileTransform::transform2200to2300()
   }
 }
 
-void QgsProjectFileTransform::transform2180to2990()
+void QgsProjectFileTransform::transform2990()
 {
   QDomNodeList mapLayers = mDom.elementsByTagName( QStringLiteral( "maplayer" ) );
 
diff --git a/src/core/qgsprojectfiletransform.h b/src/core/qgsprojectfiletransform.h
@@ -28,7 +28,6 @@
 
 #include <QString>
 #include <QDomDocument>
-#include <vector>
 #include "qgsprojectversion.h"
 
 class QgsRasterLayer;
@@ -69,9 +68,9 @@ class CORE_EXPORT QgsProjectFileTransform
       QgsProjectVersion from;
       QgsProjectVersion to;
       void ( QgsProjectFileTransform::* transformFunc )();
-    } transform;
+    } TransformItem;
 
-    static transform transformers[];
+    static TransformItem sTransformers[];
 
     QDomDocument mDom;
     QgsProjectVersion mCurrentVersion;
@@ -88,7 +87,7 @@ class CORE_EXPORT QgsProjectFileTransform
     void transform1400to1500();
     void transform1800to1900();
     void transform2200to2300();
-    void transform2180to2990();
+    void transform2990();
 
     //helper functions
     static int rasterBandNumber( const QDomElement &rasterPropertiesElem, const QString &bandName, QgsRasterLayer *rlayer );
diff --git a/src/core/qgsprojectversion.cpp b/src/core/qgsprojectversion.cpp
@@ -100,3 +100,8 @@ QString QgsProjectVersion::text()
     return QStringLiteral( "%1.%2.%3-%4" ).arg( mMajor ).arg( mMinor ).arg( mSub ).arg( mName );
   }
 }
+
+bool QgsProjectVersion::isNull() const
+{
+  return mMajor == 0 && mMinor == 0 && mSub == 0;
+}
diff --git a/src/core/qgsprojectversion.h b/src/core/qgsprojectversion.h
@@ -32,6 +32,9 @@ class CORE_EXPORT QgsProjectVersion
 
   public:
 
+    /**
+     * Creates a new NULL version
+     */
     QgsProjectVersion()
         : mMajor( 0 )
         , mMinor( 0 )
@@ -45,6 +48,11 @@ class CORE_EXPORT QgsProjectVersion
     int subVersion()   { return mSub;}
     QString text();
 
+    /**
+     * Returns true if this is a NULL project version.
+     */
+    bool isNull() const;
+
     /** Boolean equal operator
      */
     bool operator==( const QgsProjectVersion &other ) const;

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`typedef QgsProjectVersion PFV;`
`36`	`36`
`37`	`37`
`38`		`-QgsProjectFileTransform::transform QgsProjectFileTransform::transformers[] =`
	`38`	`+QgsProjectFileTransform::TransformItem QgsProjectFileTransform::sTransformers[] =`
`39`	`39`	`{`
`40`	`40`	`{PFV( 0, 8, 0 ), PFV( 0, 8, 1 ), &QgsProjectFileTransform::transformNull},`
`41`	`41`	`{PFV( 0, 8, 1 ), PFV( 0, 9, 0 ), &QgsProjectFileTransform::transform081to090},`
`@@ -60,23 +60,27 @@ QgsProjectFileTransform::transform QgsProjectFileTransform::transformers[] =`
`60`	`60`	`{PFV( 2, 0, 0 ), PFV( 2, 1, 0 ), &QgsProjectFileTransform::transformNull},`
`61`	`61`	`{PFV( 2, 1, 0 ), PFV( 2, 2, 0 ), &QgsProjectFileTransform::transformNull},`
`62`	`62`	`{PFV( 2, 2, 0 ), PFV( 2, 3, 0 ), &QgsProjectFileTransform::transform2200to2300},`
`63`		`- {PFV( 2, 18, 0 ), PFV( 2, 99, 0 ), &QgsProjectFileTransform::transform2180to2990},`
	`63`	`+ // A transformer with a NULL from version means that it should be run when upgrading`
	`64`	`+ // from any version and will take care that it's not going to cause trouble if it's`
	`65`	`+ // run several times on the same file.`
	`66`	`+ {PFV(), PFV( 2, 99, 0 ), &QgsProjectFileTransform::transform2990},`
`64`	`67`	`};`
`65`	`68`
`66`	`69`	`bool QgsProjectFileTransform::updateRevision( const QgsProjectVersion& newVersion )`
`67`	`70`	`{`
`68`	`71`	`Q_UNUSED( newVersion );`
`69`	`72`	`bool returnValue = false;`
`70`	`73`
`71`		`- if ( ! mDom.isNull() )`
	`74`	`+ if ( !mDom.isNull() )`
`72`	`75`	`{`
`73`		`- for ( std::size_t i = 0; i < sizeof( transformers ) / sizeof( transform ); i++ )`
	`76`	`+ for ( std::size_t i = 0; i < sizeof( sTransformers ) / sizeof( TransformItem ); i++ )`
`74`	`77`	`{`
`75`		`- if ( transformers[i].from == mCurrentVersion )`
	`78`	`+ const TransformItem& transformer = sTransformers[i];`
	`79`	`+ if ( transformer.from == mCurrentVersion \|\| transformer.from.isNull() )`
`76`	`80`	`{`
`77`	`81`	`// Run the transformer, and update the revision in every case`
`78`		`- ( this->*( transformers[i].transformFunc ) )();`
`79`		`- mCurrentVersion = transformers[i].to;`
	`82`	`+ ( this->*( transformer.transformFunc ) )();`
	`83`	`+ mCurrentVersion = transformer.to;`
`80`	`84`	`returnValue = true;`
`81`	`85`	`}`
`82`	`86`	`}`
`@@ -614,7 +618,7 @@ void QgsProjectFileTransform::transform2200to2300()`
`614`	`618`	`}`
`615`	`619`	`}`
`616`	`620`
`617`		`-void QgsProjectFileTransform::transform2180to2990()`
	`621`	`+void QgsProjectFileTransform::transform2990()`
`618`	`622`	`{`
`619`	`623`	`QDomNodeList mapLayers = mDom.elementsByTagName( QStringLiteral( "maplayer" ) );`
`620`	`624`
Original file line number	Diff line number	Diff line change
`@@ -100,3 +100,8 @@ QString QgsProjectVersion::text()`
`100`	`100`	`return QStringLiteral( "%1.%2.%3-%4" ).arg( mMajor ).arg( mMinor ).arg( mSub ).arg( mName );`
`101`	`101`	`}`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+bool QgsProjectVersion::isNull() const`
	`105`	`+{`
	`106`	`+ return mMajor == 0 && mMinor == 0 && mSub == 0;`
	`107`	`+}`