Fix tests

nirvn · nirvn · commit de918fde53dc · 2020-05-18T14:34:45.000+07:00
diff --git a/python/core/auto_generated/qgstemporalutils.sip.in b/python/core/auto_generated/qgstemporalutils.sip.in
@@ -41,6 +41,8 @@ returns the maximal combined temporal extent of these layers.
 
       QString fileNameTemplate;
 
+      QList<QgsMapDecoration *> decorations;
+
     };
 
     static bool exportAnimation( const QgsMapSettings &mapSettings, const AnimationExportSettings &settings, QString &error /Out/, QgsFeedback *feedback = 0 );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2121,8 +2121,8 @@ const QList<QgsVectorLayerRef> QgisApp::findBrokenLayerDependencies( QgsVectorLa
                ! dependency.layerId.isEmpty() )
           {
             const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly(
-                QgsProject::instance(),
-                QgsVectorLayerRef::MatchType::Name ) };
+                                            QgsProject::instance(),
+                                            QgsVectorLayerRef::MatchType::Name ) };
             if ( ! depVl || ! depVl->isValid() )
             {
               brokenDependencies.append( dependency );
@@ -2272,8 +2272,8 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S
       if ( ! loaded )
       {
         const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." )
-          .arg( vl->name() )
-          .arg( dependency.name ) };
+                            .arg( vl->name() )
+                            .arg( dependency.name ) };
         messageBar()->pushWarning( tr( "Missing layer form dependency" ), msg );
       }
       else
@@ -7535,7 +7535,7 @@ QList< QgsDecorationItem * > QgisApp::activeDecorationItems()
       decorations << decoration;
     }
   }
-  return decorations; 
+  return decorations;
 }
 void QgisApp::saveMapAsImage()
 {
diff --git a/src/app/qgsanimationexportdialog.h b/src/app/qgsanimationexportdialog.h
@@ -44,7 +44,7 @@ class APP_EXPORT QgsAnimationExportDialog: public QDialog, private Ui::QgsAnimat
     /**
      * Constructor for QgsAnimationExportDialog
      */
-    QgsAnimationExportDialog( QWidget *parent = nullptr, 
+    QgsAnimationExportDialog( QWidget *parent = nullptr,
                               QgsMapCanvas *mapCanvas = nullptr,
                               const QList< QgsDecorationItem * > &decorations = QList< QgsDecorationItem * >() );
 
diff --git a/src/core/qgstemporalutils.cpp b/src/core/qgstemporalutils.cpp
@@ -119,7 +119,7 @@ bool QgsTemporalUtils::exportAnimation( const QgsMapSettings &mapSettings, const
     QgsMapRendererCustomPainterJob job( ms, &p );
     job.start();
     job.waitForFinished();
-    
+
     QgsRenderContext context = QgsRenderContext::fromMapSettings( ms );
     context.setPainter( &p );
 
diff --git a/src/core/qgstemporalutils.h b/src/core/qgstemporalutils.h
@@ -65,7 +65,7 @@ class CORE_EXPORT QgsTemporalUtils
        * e.g. my###.jpg will create frames my001.jpg, my002.jpg, etc
        */
       QString fileNameTemplate;
-      
+
       //! List of decorations to draw onto exported frames.
       QList<QgsMapDecoration *> decorations;
 

Original file line number	Diff line number	Diff line change
`@@ -2121,8 +2121,8 @@ const QList<QgsVectorLayerRef> QgisApp::findBrokenLayerDependencies( QgsVectorLa`
`2121`	`2121`	`! dependency.layerId.isEmpty() )`
`2122`	`2122`	`{`
`2123`	`2123`	`const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly(`
`2124`		`- QgsProject::instance(),`
`2125`		`- QgsVectorLayerRef::MatchType::Name ) };`
	`2124`	`+ QgsProject::instance(),`
	`2125`	`+ QgsVectorLayerRef::MatchType::Name ) };`
`2126`	`2126`	`if ( ! depVl \|\| ! depVl->isValid() )`
`2127`	`2127`	`{`
`2128`	`2128`	`brokenDependencies.append( dependency );`
`@@ -2272,8 +2272,8 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S`
`2272`	`2272`	`if ( ! loaded )`
`2273`	`2273`	`{`
`2274`	`2274`	`const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." )`
`2275`		`- .arg( vl->name() )`
`2276`		`- .arg( dependency.name ) };`
	`2275`	`+ .arg( vl->name() )`
	`2276`	`+ .arg( dependency.name ) };`
`2277`	`2277`	`messageBar()->pushWarning( tr( "Missing layer form dependency" ), msg );`
`2278`	`2278`	`}`
`2279`	`2279`	`else`
`@@ -7535,7 +7535,7 @@ QList< QgsDecorationItem * > QgisApp::activeDecorationItems()`
`7535`	`7535`	`decorations << decoration;`
`7536`	`7536`	`}`
`7537`	`7537`	`}`
`7538`		`- return decorations;`
	`7538`	`+ return decorations;`
`7539`	`7539`	`}`
`7540`	`7540`	`void QgisApp::saveMapAsImage()`
`7541`	`7541`	`{`