Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3677 from nirvn/map_themes_signal_fix
[map themes] fix composer signal name
  • Loading branch information
nyalldawson committed Oct 27, 2016
2 parents 1d09538 + 8a809b8 commit 11e5283
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/app/composer/qgscomposermapwidget.cpp
Expand Up @@ -67,9 +67,9 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )
// follow preset combo
mFollowVisibilityPresetCombo->setModel( new QStringListModel( mFollowVisibilityPresetCombo ) );
connect( mFollowVisibilityPresetCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( followVisibilityPresetSelected( int ) ) );
connect( QgsProject::instance()->mapThemeCollection(), SIGNAL( presetsChanged() ),
this, SLOT( onPresetsChanged() ) );
onPresetsChanged();
connect( QgsProject::instance()->mapThemeCollection(), SIGNAL( mapThemesChanged() ),

This comment has been minimized.

Copy link
@m-kuhn

m-kuhn Oct 27, 2016

Member

So... any reason not to use the new style?

this, SLOT( onMapThemesChanged() ) );
onMapThemesChanged();

// keep layers from preset button
QMenu* menuKeepLayers = new QMenu( this );
Expand Down Expand Up @@ -213,7 +213,7 @@ void QgsComposerMapWidget::keepLayersVisibilityPresetSelected()
}
}

void QgsComposerMapWidget::onPresetsChanged()
void QgsComposerMapWidget::onMapThemesChanged()
{
if ( QStringListModel* model = qobject_cast<QStringListModel*>( mFollowVisibilityPresetCombo->model() ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposermapwidget.h
Expand Up @@ -116,7 +116,7 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
void followVisibilityPresetSelected( int currentIndex );
void keepLayersVisibilityPresetSelected();

void onPresetsChanged();
void onMapThemesChanged();

void updateOverviewFrameStyleFromWidget();
void cleanUpOverviewFrameStyleSelector( QgsPanelWidget* container );
Expand Down

0 comments on commit 11e5283

Please sign in to comment.