Remove more ununused composer code, fix updating existing

nyalldawson · nyalldawson · commit 5722f15a6e5e · 2017-03-21T10:32:52.000+10:00
compositions when settings change
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -3361,22 +3361,6 @@ void QgsComposer::restoreWindowState()
   }
 }
 
-void  QgsComposer::templateXml( QDomDocument &doc )
-{
-  QDomElement composerElem = doc.createElement( QStringLiteral( "Composer" ) );
-  composerElem.setAttribute( QStringLiteral( "title" ), mTitle );
-  doc.appendChild( composerElem );
-
-  //store composition
-  if ( mComposition )
-  {
-    mComposition->writeXml( composerElem, doc );
-  }
-
-  // store atlas
-  mComposition->atlasComposition().writeXml( composerElem, doc );
-}
-
 void QgsComposer::createCompositionWidget()
 {
   if ( !mComposition )
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -433,10 +433,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! Shows the configuration widget for a composer item
     void showItemOptions( QgsComposerItem *i );
 
-
-    //! Stores only template as base Dom node
-    void templateXml( QDomDocument &doc );
-
     void setSelectionTool();
 
     //! Raise, unminimize and activate this window
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9243,12 +9243,9 @@ void QgisApp::showOptionsDialog( QWidget *parent, const QString &currentPage )
     //update any open compositions so they reflect new composer settings
     //we have to push the changes to the compositions here, because compositions
     //have no access to qgisapp and accordingly can't listen in to changes
-    QSet<QgsComposer *> composers = instance()->printComposers();
-    QSet<QgsComposer *>::iterator composer_it = composers.begin();
-    for ( ; composer_it != composers.end(); ++composer_it )
+    Q_FOREACH ( QgsComposition *c, QgsProject::instance()->layoutManager()->compositions() )
     {
-      QgsComposition *composition = ( *composer_it )->composition();
-      composition->updateSettings();
+      c->updateSettings();
     }
 
     //do we need this? TS

Original file line number	Diff line number	Diff line change
`@@ -9243,12 +9243,9 @@ void QgisApp::showOptionsDialog( QWidget *parent, const QString &currentPage )`
`9243`	`9243`	`//update any open compositions so they reflect new composer settings`
`9244`	`9244`	`//we have to push the changes to the compositions here, because compositions`
`9245`	`9245`	`//have no access to qgisapp and accordingly can't listen in to changes`
`9246`		`- QSet<QgsComposer *> composers = instance()->printComposers();`
`9247`		`- QSet<QgsComposer *>::iterator composer_it = composers.begin();`
`9248`		`- for ( ; composer_it != composers.end(); ++composer_it )`
	`9246`	`+ Q_FOREACH ( QgsComposition *c, QgsProject::instance()->layoutManager()->compositions() )`
`9249`	`9247`	`{`
`9250`		`- QgsComposition composition = ( composer_it )->composition();`
`9251`		`- composition->updateSettings();`
	`9248`	`+ c->updateSettings();`
`9252`	`9249`	`}`
`9253`	`9250`
`9254`	`9251`	`//do we need this? TS`