Skip to content

Commit 4f825f8

Browse files
committedJan 7, 2018
Remove some old composer theme related code
1 parent 7edab22 commit 4f825f8

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,11 +2220,7 @@ void QgisApp::setAppStyleSheet( const QString &stylesheet )
22202220
{
22212221
setStyleSheet( stylesheet );
22222222

2223-
// cascade styles to any current project composers
2224-
Q_FOREACH ( QgsComposer *c, mPrintComposers )
2225-
{
2226-
c->setStyleSheet( stylesheet );
2227-
}
2223+
// cascade styles to any current layout designers
22282224
Q_FOREACH ( QgsLayoutDesignerDialog *d, mLayoutDesignerDialogs )
22292225
{
22302226
d->setStyleSheet( stylesheet );
@@ -2959,10 +2955,6 @@ void QgisApp::setIconSizes( int size )
29592955
}
29602956
}
29612957

2962-
Q_FOREACH ( QgsComposer *c, mPrintComposers )
2963-
{
2964-
c->setIconSizes( size );
2965-
}
29662958
Q_FOREACH ( QgsLayoutDesignerDialog *d, mLayoutDesignerDialogs )
29672959
{
29682960
d->setIconSizes( size );
@@ -2997,7 +2989,6 @@ void QgisApp::setTheme( const QString &themeName )
29972989
mActionOpenProject->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFileOpen.svg" ) ) );
29982990
mActionSaveProject->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFileSave.svg" ) ) );
29992991
mActionSaveProjectAs->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFileSaveAs.svg" ) ) );
3000-
mActionShowComposerManager->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionComposerManager.svg" ) ) );
30012992
mActionSaveMapAsImage->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionSaveMapAsImage.svg" ) ) );
30022993
mActionSaveMapAsPdf->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionSaveAsPDF.svg" ) ) );
30032994
mActionExit->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFileExit.png" ) ) );
@@ -3136,13 +3127,6 @@ void QgisApp::setTheme( const QString &themeName )
31363127
mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionScaleBar.svg" ) ) );
31373128
mActionDecorationGrid->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/transformed.svg" ) ) );
31383129

3139-
//change themes of all composers
3140-
QSet<QgsComposer *>::const_iterator composerIt = mPrintComposers.constBegin();
3141-
for ( ; composerIt != mPrintComposers.constEnd(); ++composerIt )
3142-
{
3143-
( *composerIt )->setupTheme();
3144-
}
3145-
31463130
emit currentThemeChanged( themeName );
31473131
}
31483132

0 commit comments

Comments
 (0)