Fix Windows build

nyalldawson · nyalldawson · commit a1160e9e36ff · 2017-03-21T11:51:22.000+10:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -677,7 +677,7 @@ QgsComposer::~QgsComposer()
   delete mPrinter;
 }
 
-QgsComposerInterface *QgsComposer::interface()
+QgsComposerInterface *QgsComposer::iface()
 {
   return mInterface;
 }
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -97,7 +97,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     QgsComposer( QgsComposition *composition );
     ~QgsComposer();
 
-    QgsComposerInterface *interface();
+    QgsComposerInterface *iface();
 
     //! Set the pixmap / icons on the toolbar buttons
     void setupTheme();
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7004,26 +7004,26 @@ QgsComposer *QgisApp::openComposer( QgsComposition *composition )
   QgsComposer *newComposerObject = new QgsComposer( composition );
   connect( newComposerObject, &QgsComposer::aboutToClose, this, [this, newComposerObject]
   {
-    emit composerWillBeClosed( newComposerObject->interface() );
+    emit composerWillBeClosed( newComposerObject->iface() );
     mPrintComposers.remove( newComposerObject );
-    emit composerClosed( newComposerObject->interface() );
+    emit composerClosed( newComposerObject->iface() );
   } );
 
   //add it to the map of existing print composers
   mPrintComposers.insert( newComposerObject );
 
   newComposerObject->open();
-  emit composerOpened( newComposerObject->interface() );
+  emit composerOpened( newComposerObject->iface() );
   connect( newComposerObject, &QgsComposer::atlasPreviewFeatureChanged, this, &QgisApp::refreshMapCanvas );
 
   return newComposerObject;
 }
 
 void QgisApp::deleteComposer( QgsComposer *c )
 {
-  emit composerWillBeClosed( c->interface() );
+  emit composerWillBeClosed( c->iface() );
   mPrintComposers.remove( c );
-  emit composerClosed( c->interface() );
+  emit composerClosed( c->iface() );
   delete c;
 }
 
@@ -7053,9 +7053,9 @@ void QgisApp::deletePrintComposers()
   while ( it != mPrintComposers.end() )
   {
     QgsComposer *c = ( *it );
-    emit composerWillBeClosed( c->interface() );
+    emit composerWillBeClosed( c->iface() );
     it = mPrintComposers.erase( it );
-    emit composerClosed( c->interface() );
+    emit composerClosed( c->iface() );
     delete ( c );
   }
 }
@@ -7173,9 +7173,9 @@ void QgisApp::compositionAboutToBeRemoved( const QString &name )
   {
     if ( composer->composition()->name() == name )
     {
-      emit composerWillBeClosed( composer->interface() );
+      emit composerWillBeClosed( composer->iface() );
       mPrintComposers.remove( composer );
-      emit composerClosed( composer->interface() );
+      emit composerClosed( composer->iface() );
       delete composer;
       return;
     }
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -380,7 +380,7 @@ QList<QgsComposerInterface *> QgisAppInterface::openComposers()
     {
       if ( *it )
       {
-        QgsComposerInterface *v = ( *it )->interface();
+        QgsComposerInterface *v = ( *it )->iface();
         if ( v )
         {
           composerInterfaceList << v;
@@ -396,7 +396,7 @@ QgsComposerInterface *QgisAppInterface::openComposer( QgsComposition *compositio
   QgsComposer *composerObj = qgis->openComposer( composition );
   if ( composerObj )
   {
-    return composerObj->interface();
+    return composerObj->iface();
   }
   return nullptr;
 }

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ QgsComposer::~QgsComposer()`
`677`	`677`	`delete mPrinter;`
`678`	`678`	`}`
`679`	`679`
`680`		`-QgsComposerInterface *QgsComposer::interface()`
	`680`	`+QgsComposerInterface *QgsComposer::iface()`
`681`	`681`	`{`
`682`	`682`	`return mInterface;`
`683`	`683`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7004,26 +7004,26 @@ QgsComposer QgisApp::openComposer( QgsComposition composition )`
`7004`	`7004`	`QgsComposer *newComposerObject = new QgsComposer( composition );`
`7005`	`7005`	`connect( newComposerObject, &QgsComposer::aboutToClose, this, [this, newComposerObject]`
`7006`	`7006`	`{`
`7007`		`- emit composerWillBeClosed( newComposerObject->interface() );`
	`7007`	`+ emit composerWillBeClosed( newComposerObject->iface() );`
`7008`	`7008`	`mPrintComposers.remove( newComposerObject );`
`7009`		`- emit composerClosed( newComposerObject->interface() );`
	`7009`	`+ emit composerClosed( newComposerObject->iface() );`
`7010`	`7010`	`} );`
`7011`	`7011`
`7012`	`7012`	`//add it to the map of existing print composers`
`7013`	`7013`	`mPrintComposers.insert( newComposerObject );`
`7014`	`7014`
`7015`	`7015`	`newComposerObject->open();`
`7016`		`- emit composerOpened( newComposerObject->interface() );`
	`7016`	`+ emit composerOpened( newComposerObject->iface() );`
`7017`	`7017`	`connect( newComposerObject, &QgsComposer::atlasPreviewFeatureChanged, this, &QgisApp::refreshMapCanvas );`
`7018`	`7018`
`7019`	`7019`	`return newComposerObject;`
`7020`	`7020`	`}`
`7021`	`7021`
`7022`	`7022`	`void QgisApp::deleteComposer( QgsComposer *c )`
`7023`	`7023`	`{`
`7024`		`- emit composerWillBeClosed( c->interface() );`
	`7024`	`+ emit composerWillBeClosed( c->iface() );`
`7025`	`7025`	`mPrintComposers.remove( c );`
`7026`		`- emit composerClosed( c->interface() );`
	`7026`	`+ emit composerClosed( c->iface() );`
`7027`	`7027`	`delete c;`
`7028`	`7028`	`}`
`7029`	`7029`
`@@ -7053,9 +7053,9 @@ void QgisApp::deletePrintComposers()`
`7053`	`7053`	`while ( it != mPrintComposers.end() )`
`7054`	`7054`	`{`
`7055`	`7055`	`QgsComposer c = ( it );`
`7056`		`- emit composerWillBeClosed( c->interface() );`
	`7056`	`+ emit composerWillBeClosed( c->iface() );`
`7057`	`7057`	`it = mPrintComposers.erase( it );`
`7058`		`- emit composerClosed( c->interface() );`
	`7058`	`+ emit composerClosed( c->iface() );`
`7059`	`7059`	`delete ( c );`
`7060`	`7060`	`}`
`7061`	`7061`	`}`
`@@ -7173,9 +7173,9 @@ void QgisApp::compositionAboutToBeRemoved( const QString &name )`
`7173`	`7173`	`{`
`7174`	`7174`	`if ( composer->composition()->name() == name )`
`7175`	`7175`	`{`
`7176`		`- emit composerWillBeClosed( composer->interface() );`
	`7176`	`+ emit composerWillBeClosed( composer->iface() );`
`7177`	`7177`	`mPrintComposers.remove( composer );`
`7178`		`- emit composerClosed( composer->interface() );`
	`7178`	`+ emit composerClosed( composer->iface() );`
`7179`	`7179`	`delete composer;`
`7180`	`7180`	`return;`
`7181`	`7181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ QList<QgsComposerInterface *> QgisAppInterface::openComposers()`
`380`	`380`	`{`
`381`	`381`	`if ( *it )`
`382`	`382`	`{`
`383`		`- QgsComposerInterface v = ( it )->interface();`
	`383`	`+ QgsComposerInterface v = ( it )->iface();`
`384`	`384`	`if ( v )`
`385`	`385`	`{`
`386`	`386`	`composerInterfaceList << v;`
`@@ -396,7 +396,7 @@ QgsComposerInterface QgisAppInterface::openComposer( QgsComposition compositio`
`396`	`396`	`QgsComposer *composerObj = qgis->openComposer( composition );`
`397`	`397`	`if ( composerObj )`
`398`	`398`	`{`
`399`		`- return composerObj->interface();`
	`399`	`+ return composerObj->iface();`
`400`	`400`	`}`
`401`	`401`	`return nullptr;`
`402`	`402`	`}`