Skip to content
Permalink
Browse files
Fix Windows build
  • Loading branch information
nyalldawson committed Mar 21, 2017
1 parent 77706a6 commit a1160e9e36ffb9207ee1b4fe3d424bf07122dff3
Showing with 13 additions and 13 deletions.
  1. +1 −1 src/app/composer/qgscomposer.cpp
  2. +1 −1 src/app/composer/qgscomposer.h
  3. +9 −9 src/app/qgisapp.cpp
  4. +2 −2 src/app/qgisappinterface.cpp
@@ -677,7 +677,7 @@ QgsComposer::~QgsComposer()
delete mPrinter;
}

QgsComposerInterface *QgsComposer::interface()
QgsComposerInterface *QgsComposer::iface()
{
return mInterface;
}
@@ -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();
@@ -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;
}
@@ -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;
}

0 comments on commit a1160e9

Please sign in to comment.