Skip to content
Permalink
Browse files

Start fixing some remaining old style connects

  • Loading branch information
nyalldawson committed Nov 4, 2018
1 parent d142794 commit bf21ce4661b952fc22f425619ac051d641ad9306
@@ -1159,7 +1159,7 @@ QMenu *QgsLayoutLegendMenuProvider::createContextMenu()

if ( QgsLayerTree::isLayer( mView->currentNode() ) )
{
menu->addAction( QObject::tr( "Reset to Defaults" ), mWidget, SLOT( resetLayerNodeToDefaults() ) );
menu->addAction( QObject::tr( "Reset to Defaults" ), mWidget, &QgsLayoutLegendWidget::resetLayerNodeToDefaults );
menu->addSeparator();
}

@@ -1169,7 +1169,7 @@ QMenu *QgsLayoutLegendMenuProvider::createContextMenu()
lst << QgsLegendStyle::Hidden << QgsLegendStyle::Group << QgsLegendStyle::Subgroup;
for ( QgsLegendStyle::Style style : qgis::as_const( lst ) )
{
QAction *action = menu->addAction( QgsLegendStyle::styleLabel( style ), mWidget, SLOT( setCurrentNodeStyleFromAction() ) );
QAction *action = menu->addAction( QgsLegendStyle::styleLabel( style ), mWidget, &QgsLayoutLegendWidget::setCurrentNodeStyleFromAction );
action->setCheckable( true );
action->setChecked( currentStyle == style );
action->setData( ( int ) style );
@@ -85,7 +85,7 @@ QgsLayoutManagerDialog::QgsLayoutManagerDialog( QWidget *parent, Qt::WindowFlags
#ifdef Q_OS_MAC
// Create action to select this window
mWindowAction = new QAction( windowTitle(), this );
connect( mWindowAction, SIGNAL( triggered() ), this, SLOT( activate() ) );
connect( mWindowAction, SIGNAL( triggered() ), this, &QgsLayoutManagerDialog::activate );
#endif

mTemplate->addItem( tr( "Empty layout" ) );
@@ -225,7 +225,7 @@ void QgsLayoutMapWidget::aboutToShowKeepLayersVisibilityPresetsMenu()
menu->clear();
Q_FOREACH ( const QString &presetName, QgsProject::instance()->mapThemeCollection()->mapThemes() )
{
menu->addAction( presetName, this, SLOT( keepLayersVisibilityPresetSelected() ) );
menu->addAction( presetName, this, &QgsLayoutMapWidget::keepLayersVisibilityPresetSelected );
}

if ( menu->actions().isEmpty() )
@@ -61,8 +61,8 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
{
// global menu
menu->addAction( actions->actionAddGroup( menu ) );
menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionExpandTree.svg" ) ), tr( "&Expand All" ), mView, SLOT( expandAll() ) );
menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCollapseTree.svg" ) ), tr( "&Collapse All" ), mView, SLOT( collapseAll() ) );
menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionExpandTree.svg" ) ), tr( "&Expand All" ), mView, &QgsLayerTreeView::expandAll );
menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCollapseTree.svg" ) ), tr( "&Collapse All" ), mView, &QgsLayerTreeView::collapseAll );
menu->addSeparator();
if ( QgisApp::instance()->clipboard()->hasFormat( QGSCLIPBOARD_MAPLAYER_MIME ) )
{

0 comments on commit bf21ce4

Please sign in to comment.
You can’t perform that action at this time.