Compare revisions

Lyndon Brown · Hugo Beauzée-Luyssen · Lyndon Brown · Hugo Beauzée-Luyssen · Lyndon Brown · Hugo Beauzée-Luyssen
--- a/modules/gui/qt/dialogs/epg/EPGWidget.cpp
+++ b/modules/gui/qt/dialogs/epg/EPGWidget.cpp
@@ -36,6 +36,7 @@
 #include "EPGRuler.hpp"
 #include "EPGView.hpp"
 #include "EPGChannels.hpp"
+#include "EPGItem.hpp"

 EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
 {
@@ -70,17 +71,15 @@ EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
    layout->addWidget( rootWidget );
    setLayout( layout );

-    CONNECT( m_epgView, rangeChanged(const QDateTime &, const QDateTime &),
-             m_rulerWidget, setRange(const QDateTime &, const QDateTime &) );
-
-    CONNECT( m_epgView->horizontalScrollBar(), valueChanged(int),
-             m_rulerWidget, setOffset(int) );
-    CONNECT( m_epgView->verticalScrollBar(), valueChanged(int),
-             m_channelsWidget, setOffset(int) );
-    connect( m_epgView, SIGNAL( itemFocused(EPGItem*)),
-             this, SIGNAL(itemSelectionChanged(EPGItem*)) );
-    CONNECT( m_epgView, programAdded(const EPGProgram *), m_channelsWidget, addProgram(const EPGProgram *) );
-    CONNECT( m_epgView, programActivated(int), this, activateProgram(int) );
+    connect( m_epgView, &EPGView::rangeChanged, m_rulerWidget, &EPGRuler::setRange );
+
+    connect( m_epgView->horizontalScrollBar(), &QScrollBar::valueChanged,
+             m_rulerWidget, &EPGRuler::setOffset );
+    connect( m_epgView->verticalScrollBar(), &QScrollBar::valueChanged,
+             m_channelsWidget, &EPGChannels::setOffset );
+    connect( m_epgView, &EPGView::itemFocused, this, &EPGWidget::itemSelectionChanged );
+    connect( m_epgView, &EPGView::programAdded, m_channelsWidget, &EPGChannels::addProgram );
+    connect( m_epgView, &EPGView::programActivated, this, &EPGWidget::activateProgram );
 }

 void EPGWidget::reset()

--- a/modules/gui/qt/dialogs/epg/epg.cpp
+++ b/modules/gui/qt/dialogs/epg/epg.cpp
@@ -76,28 +76,28 @@ EpgDialog::EpgDialog( qt_intf_t *_p_intf ): QVLCFrame( _p_intf )
    layout->addWidget( epg, 10 );
    layout->addWidget( descBox );

-    CONNECT( epg, itemSelectionChanged( EPGItem *), this, displayEvent( EPGItem *) );
-    CONNECT( epg, programActivated(int), THEMIM, changeProgram(int) );
-    CONNECT( THEMIM, epgChanged(), this, scheduleUpdate() );
-    CONNECT( THEMIM, inputChanged( bool ), this, inputChanged() );
+    connect( epg, &EPGWidget::itemSelectionChanged, this, &EpgDialog::displayEvent );
+    connect( epg, &EPGWidget::programActivated, THEMIM, &PlayerController::changeProgram );
+    connect( THEMIM, &PlayerController::epgChanged, this, &EpgDialog::scheduleUpdate );
+    connect( THEMIM, &PlayerController::inputChanged, this, &EpgDialog::inputChanged );

    QDialogButtonBox *buttonsBox = new QDialogButtonBox( this );

 #if 0
    QPushButton *update = new QPushButton( qtr( "Update" ) ); // Temporary to test
    buttonsBox->addButton( update, QDialogButtonBox::ActionRole );
-    BUTTONACT( update, updateInfos() );
+    BUTTONACT( update, &EpgDialog::updateInfos );
 #endif

    buttonsBox->addButton( new QPushButton( qtr( "&Close" ) ),
                           QDialogButtonBox::RejectRole );
    boxLayout->addWidget( buttonsBox );
-    CONNECT( buttonsBox, rejected(), this, close() );
+    connect( buttonsBox, &QDialogButtonBox::rejected, this, &EpgDialog::close );

    timer = new QTimer( this );
    timer->setSingleShot( true );
    timer->setInterval( 5000 );
-    CONNECT( timer, timeout(), this, timeout() );
+    connect( timer, &QTimer::timeout, this, &EpgDialog::timeout );

    updateInfos();
    restoreWidgetPosition( "EPGDialog", QSize( 650, 450 ) );

--- a/modules/gui/qt/dialogs/errors/errors.cpp
+++ b/modules/gui/qt/dialogs/errors/errors.cpp
@@ -57,9 +57,9 @@ ErrorsDialog::ErrorsDialog( qt_intf_t *_p_intf )
    layout->addWidget( stopShowing, 1, 0 );
    layout->addWidget( buttonBox, 1, 2 );

-    CONNECT( buttonBox, rejected(), this, close() );
-    BUTTONACT( clearButton, clear() );
-    BUTTONACT( stopShowing, dontShow() );
+    connect( buttonBox, &QDialogButtonBox::rejected, this, &ErrorsDialog::close );
+    BUTTONACT( clearButton, &ErrorsDialog::clear );
+    BUTTONACT( stopShowing, &ErrorsDialog::dontShow );
 }

 void ErrorsDialog::addError( const QString& title, const QString& text )

--- a/modules/gui/qt/dialogs/extended/extended.cpp
+++ b/modules/gui/qt/dialogs/extended/extended.cpp
@@ -63,29 +63,29 @@ ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )
    QTabWidget *audioTab = new QTabWidget( audioWidget );

    equal = new Equalizer( p_intf, audioTab );
-    CONNECT( equal, configChanged(QString, QVariant), this, putAudioConfig(QString, QVariant) );
+    connect( equal, &AudioFilterControlWidget::configChanged, this, &ExtendedDialog::putAudioConfig );
    audioTab->addTab( equal, qtr( "Equalizer" ) );

    Compressor *compres = new Compressor( p_intf, audioTab );
-    CONNECT( compres, configChanged(QString, QVariant), this, putAudioConfig(QString, QVariant) );
+    connect( compres, &AudioFilterControlWidget::configChanged, this, &ExtendedDialog::putAudioConfig );
    audioTab->addTab( compres, qtr( "Compressor" ) );

    Spatializer *spatial = new Spatializer( p_intf, audioTab );
-    CONNECT( spatial, configChanged(QString, QVariant), this, putAudioConfig(QString, QVariant) );
+    connect( spatial, &AudioFilterControlWidget::configChanged, this, &ExtendedDialog::putAudioConfig );
    audioTab->addTab( spatial, qtr( "Spatializer" ) );

    StereoWidener *stereowiden = new StereoWidener( p_intf, audioTab );
-    CONNECT( stereowiden, configChanged(QString, QVariant), this, putAudioConfig(QString, QVariant) );
+    connect( stereowiden, &AudioFilterControlWidget::configChanged, this, &ExtendedDialog::putAudioConfig );
    audioTab->addTab( stereowiden, qtr( "Stereo Widener" ) );

    QWidget *advancedTab = new QWidget;
    QGridLayout *advancedTabLayout = new QGridLayout;

    PitchShifter *pitchshifter = new PitchShifter( p_intf, audioTab );
-    CONNECT( pitchshifter, configChanged(QString, QVariant), this, putAudioConfig(QString, QVariant) );
+    connect( pitchshifter, &AudioFilterControlWidget::configChanged, this, &ExtendedDialog::putAudioConfig );

    StereoPanner *stereopanner = new StereoPanner( p_intf, audioTab );
-    CONNECT( stereopanner, configChanged(QString, QVariant), this, putAudioConfig(QString, QVariant) );
+    connect( stereopanner, &AudioFilterControlWidget::configChanged, this, &ExtendedDialog::putAudioConfig );

    advancedTabLayout->setColumnStretch( 2, 10 );
    advancedTabLayout->addWidget( pitchshifter );
@@ -104,7 +104,7 @@ ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )
    QTabWidget *videoTab = new QTabWidget( videoWidget );

    videoEffect = new ExtVideo( p_intf, videoTab );
-    CONNECT( videoEffect, configChanged(QString, QVariant), this, putVideoConfig(QString, QVariant) );
+    connect( videoEffect, &ExtVideo::configChanged, this, &ExtendedDialog::putVideoConfig );
    videoLayout->addWidget( videoTab );
    videoTab->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );

@@ -120,7 +120,7 @@ ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )
    }

    layout->addWidget( mainTabW );
-    CONNECT( mainTabW, currentChanged(int), this, currentTabChanged(int) );
+    connect( mainTabW, &QTabWidget::currentChanged, this, &ExtendedDialog::currentTabChanged );

    /* Bottom buttons */
    QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal, this );
@@ -133,8 +133,8 @@ ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )
        new QPushButton( qtr("&Close"), this ), QDialogButtonBox::RejectRole );
    layout->addWidget( buttonBox );

-    CONNECT( buttonBox, rejected(), this, close() );
-    CONNECT( m_applyButton, clicked(), this, saveConfig() );
+    connect( buttonBox, &QDialogButtonBox::rejected, this, &ExtendedDialog::close );
+    connect( m_applyButton, &QPushButton::clicked, this, &ExtendedDialog::saveConfig );

    /* Restore geometry or move this dialog on the left pane of the MI */
    if( !restoreGeometry( getSettings()->value("EPanel/geometry").toByteArray() ) )

--- a/modules/gui/qt/dialogs/extended/extended_panels.cpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.cpp
@@ -139,137 +139,138 @@ static inline void setup_vfilter( qt_intf_t *p_intf, const char* psz_name, QWidg
    free( psz_filters );
 }

-#define SETUP_VFILTER( widget ) \
+#define SETUP_VFILTER( widget, type ) \
    setup_vfilter( p_intf, #widget, ui.widget##Enable ); \
-    CONNECT( ui.widget##Enable, clicked(), this, updateFilters() );
+    connect( ui.widget##Enable, &type::clicked, this, &ExtVideo::updateFilters );
+
+#define SETUP_VFILTER_cb( widget ) SETUP_VFILTER( widget, QCheckBox )
+#define SETUP_VFILTER_gb( widget ) SETUP_VFILTER( widget, QGroupBox )

 #define SETUP_VFILTER_OPTION( widget, signal ) \
    initComboBoxItems( ui.widget ); \
    setWidgetValue( ui.widget ); \
-    CONNECT( ui.widget, signal, this, updateFilterOptions() );
+    connect( ui.widget, signal, this, &ExtVideo::updateFilterOptions );

 ExtVideo::ExtVideo( qt_intf_t *_p_intf, QTabWidget *_parent ) :
            QObject( _parent ), p_intf( _p_intf )
 {
    ui.setupUi( _parent );

-    SETUP_VFILTER( adjust )
-    SETUP_VFILTER_OPTION( hueSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( contrastSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( brightnessSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( saturationSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( gammaSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( brightnessThresholdCheck, stateChanged( int ) )
+    SETUP_VFILTER_gb( adjust )
+    SETUP_VFILTER_OPTION( hueSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( contrastSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( brightnessSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( saturationSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( gammaSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( brightnessThresholdCheck, &QCheckBox::stateChanged )

-    SETUP_VFILTER( extract )
-    SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) )
+    SETUP_VFILTER_gb( extract )
+    SETUP_VFILTER_OPTION( extractComponentText, &QLineEdit::textChanged )

-    SETUP_VFILTER( posterize )
+    SETUP_VFILTER_cb( posterize )

-    SETUP_VFILTER( colorthres )
-    SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) )
-    SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( colorthres )
+    SETUP_VFILTER_OPTION( colorthresColorText, &QLineEdit::textChanged )
+    SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( sepia )
-    SETUP_VFILTER_OPTION( sepiaIntensitySpin, valueChanged( int ) )
+    SETUP_VFILTER_gb( sepia )
+    SETUP_VFILTER_OPTION( sepiaIntensitySpin, QOverload<int>::of(&QSpinBox::valueChanged) )

-    SETUP_VFILTER( invert )
+    SETUP_VFILTER_cb( invert )

-    SETUP_VFILTER( gradient )
-    SETUP_VFILTER_OPTION( gradientModeCombo, currentIndexChanged( QString ) )
-    SETUP_VFILTER_OPTION( gradientTypeCheck, stateChanged( int ) )
-    SETUP_VFILTER_OPTION( gradientCartoonCheck, stateChanged( int ) )
+    SETUP_VFILTER_gb( gradient )
+    SETUP_VFILTER_OPTION( gradientModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged) )
+    SETUP_VFILTER_OPTION( gradientTypeCheck, &QCheckBox::stateChanged )
+    SETUP_VFILTER_OPTION( gradientCartoonCheck, &QCheckBox::stateChanged )

-    SETUP_VFILTER( motionblur )
-    SETUP_VFILTER_OPTION( blurFactorSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( motionblur )
+    SETUP_VFILTER_OPTION( blurFactorSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( motiondetect )
+    SETUP_VFILTER_cb( motiondetect )

-    SETUP_VFILTER( psychedelic )
+    SETUP_VFILTER_cb( psychedelic )

-    SETUP_VFILTER( sharpen )
-    SETUP_VFILTER_OPTION( sharpenSigmaSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( sharpen )
+    SETUP_VFILTER_OPTION( sharpenSigmaSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( ripple )
+    SETUP_VFILTER_cb( ripple )

-    SETUP_VFILTER( wave )
+    SETUP_VFILTER_cb( wave )

-    SETUP_VFILTER( transform )
-    SETUP_VFILTER_OPTION( transformTypeCombo, currentIndexChanged( QString ) )
+    SETUP_VFILTER_gb( transform )
+    SETUP_VFILTER_OPTION( transformTypeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged) )

-    SETUP_VFILTER( rotate )
-    SETUP_VFILTER_OPTION( rotateAngleDial, valueChanged( int ) )
+    SETUP_VFILTER_gb( rotate )
+    SETUP_VFILTER_OPTION( rotateAngleDial, &VLCQDial::valueChanged )
    ui.rotateAngleDial->setWrapping( true );
    ui.rotateAngleDial->setNotchesVisible( true );

-    SETUP_VFILTER( puzzle )
-    SETUP_VFILTER_OPTION( puzzleRowsSpin, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( puzzleColsSpin, valueChanged( int ) )
+    SETUP_VFILTER_gb( puzzle )
+    SETUP_VFILTER_OPTION( puzzleRowsSpin, QOverload<int>::of(&QSpinBox::valueChanged) )
+    SETUP_VFILTER_OPTION( puzzleColsSpin, QOverload<int>::of(&QSpinBox::valueChanged) )

-    SETUP_VFILTER( magnify )
+    SETUP_VFILTER_cb( magnify )

-    SETUP_VFILTER( clone )
-    SETUP_VFILTER_OPTION( cloneCountSpin, valueChanged( int ) )
+    SETUP_VFILTER_gb( clone )
+    SETUP_VFILTER_OPTION( cloneCountSpin, QOverload<int>::of(&QSpinBox::valueChanged) )

-    SETUP_VFILTER( wall )
-    SETUP_VFILTER_OPTION( wallRowsSpin, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( wallColsSpin, valueChanged( int ) )
+    SETUP_VFILTER_gb( wall )
+    SETUP_VFILTER_OPTION( wallRowsSpin, QOverload<int>::of(&QSpinBox::valueChanged) )
+    SETUP_VFILTER_OPTION( wallColsSpin, QOverload<int>::of(&QSpinBox::valueChanged) )


-    SETUP_VFILTER( erase )
-    SETUP_VFILTER_OPTION( eraseMaskText, editingFinished() )
-    SETUP_VFILTER_OPTION( eraseYSpin, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) )
-    BUTTONACT( ui.eraseBrowseBtn, browseEraseFile() );
+    SETUP_VFILTER_gb( erase )
+    SETUP_VFILTER_OPTION( eraseMaskText, &QLineEdit::editingFinished )
+    SETUP_VFILTER_OPTION( eraseYSpin, QOverload<int>::of(&QSpinBox::valueChanged) )
+    SETUP_VFILTER_OPTION( eraseXSpin, QOverload<int>::of(&QSpinBox::valueChanged) )
+    BUTTONACT( ui.eraseBrowseBtn, &ExtVideo::browseEraseFile );

-    SETUP_VFILTER( marq )
-    SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) )
-    SETUP_VFILTER_OPTION( marqPositionCombo, currentIndexChanged( QString ) )
+    SETUP_VFILTER_gb( marq )
+    SETUP_VFILTER_OPTION( marqMarqueeText, &QLineEdit::textChanged )
+    SETUP_VFILTER_OPTION( marqPositionCombo, QOverload<int>::of(&QComboBox::currentIndexChanged) )

-    SETUP_VFILTER( logo )
-    SETUP_VFILTER_OPTION( logoFileText, editingFinished() )
-    SETUP_VFILTER_OPTION( logoYSpin, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( logoOpacitySlider, valueChanged( int ) )
-    BUTTONACT( ui.logoBrowseBtn, browseLogo() );
+    SETUP_VFILTER_gb( logo )
+    SETUP_VFILTER_OPTION( logoFileText, &QLineEdit::editingFinished )
+    SETUP_VFILTER_OPTION( logoYSpin, QOverload<int>::of(&QSpinBox::valueChanged) )
+    SETUP_VFILTER_OPTION( logoXSpin, QOverload<int>::of(&QSpinBox::valueChanged) )
+    SETUP_VFILTER_OPTION( logoOpacitySlider, &QSlider::valueChanged )
+    BUTTONACT( ui.logoBrowseBtn, &ExtVideo::browseLogo );

-    SETUP_VFILTER( gradfun )
-    SETUP_VFILTER_OPTION( gradfunRadiusSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( gradfun )
+    SETUP_VFILTER_OPTION( gradfunRadiusSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( grain )
-    SETUP_VFILTER_OPTION( grainVarianceSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( grain )
+    SETUP_VFILTER_OPTION( grainVarianceSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( mirror )
+    SETUP_VFILTER_cb( mirror )

-    SETUP_VFILTER( gaussianblur )
-    SETUP_VFILTER_OPTION( gaussianblurSigmaSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( gaussianblur )
+    SETUP_VFILTER_OPTION( gaussianblurSigmaSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( antiflicker )
-    SETUP_VFILTER_OPTION( antiflickerSofteningSizeSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( antiflicker )
+    SETUP_VFILTER_OPTION( antiflickerSofteningSizeSlider, &QSlider::valueChanged )

-    SETUP_VFILTER( hqdn3d )
-    SETUP_VFILTER_OPTION( hqdn3dLumaSpatSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( hqdn3dLumaTempSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( hqdn3dChromaSpatSlider, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( hqdn3dChromaTempSlider, valueChanged( int ) )
+    SETUP_VFILTER_gb( hqdn3d )
+    SETUP_VFILTER_OPTION( hqdn3dLumaSpatSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( hqdn3dLumaTempSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( hqdn3dChromaSpatSlider, &QSlider::valueChanged )
+    SETUP_VFILTER_OPTION( hqdn3dChromaTempSlider, &QSlider::valueChanged )


-    SETUP_VFILTER( anaglyph )
+    SETUP_VFILTER_cb( anaglyph )

 #undef SETUP_VFILTER
 #undef SETUP_VFILTER_OPTION

-    CONNECT( ui.cropTopPx, valueChanged( int ), this, cropChange() );
-    CONNECT( ui.cropBotPx, valueChanged( int ), this, cropChange() );
-    CONNECT( ui.cropLeftPx, valueChanged( int ), this, cropChange() );
-    CONNECT( ui.cropRightPx, valueChanged( int ), this, cropChange() );
-    CONNECT( ui.leftRightCropSync, toggled ( bool ), this, cropChange() );
-    CONNECT( ui.topBotCropSync, toggled ( bool ), this, cropChange() );
-    CONNECT( ui.topBotCropSync, toggled( bool ),
-             ui.cropBotPx, setDisabled( bool ) );
-    CONNECT( ui.leftRightCropSync, toggled( bool ),
-             ui.cropRightPx, setDisabled( bool ) );
+    connect( ui.cropTopPx, QOverload<int>::of(&QSpinBox::valueChanged), this, &ExtVideo::cropChange );
+    connect( ui.cropBotPx, QOverload<int>::of(&QSpinBox::valueChanged), this, &ExtVideo::cropChange );
+    connect( ui.cropLeftPx, QOverload<int>::of(&QSpinBox::valueChanged), this, &ExtVideo::cropChange );
+    connect( ui.cropRightPx, QOverload<int>::of(&QSpinBox::valueChanged), this, &ExtVideo::cropChange );
+    connect( ui.leftRightCropSync, &QCheckBox::toggled, this, &ExtVideo::cropChange );
+    connect( ui.topBotCropSync, &QCheckBox::toggled, this, &ExtVideo::cropChange );
+    connect( ui.topBotCropSync, &QCheckBox::toggled, ui.cropBotPx, &QSpinBox::setDisabled );
+    connect( ui.leftRightCropSync, &QCheckBox::toggled, ui.cropRightPx, &QSpinBox::setDisabled );
 }

 void ExtVideo::cropChange()
@@ -358,8 +359,7 @@ void ExtVideo::updateFilters()
 }

 #define UPDATE_AND_APPLY_TEXT( widget, file ) \
-    CONNECT( ui.widget, textChanged( const QString& ), \
-             this, updateFilterOptions() ); \
+    connect( ui.widget, &QLineEdit::textChanged, this, &ExtVideo::updateFilterOptions ); \
    ui.widget->setText( toNativeSeparators( file ) ); \
    ui.widget->disconnect( SIGNAL( textChanged( const QString& ) ) );

@@ -701,8 +701,8 @@ void ExtV4l2::Refresh( void )
                        free(text2);
                        free(val2);

-                        CONNECT( combobox, currentIndexChanged( int ), this,
-                                 ValueChange( int ) );
+                        connect( combobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                                 this, QOverload<int>::of(&ExtV4l2::ValueChange) );
                        hlayout->addWidget( combobox );
                    }
                    else
@@ -723,8 +723,8 @@ void ExtV4l2::Refresh( void )
                                         &val2 ) )
                            slider->setSingleStep( val2.i_int );
                        slider->setValue( i_val );
-                        CONNECT( slider, valueChanged( int ), this,
-                                 ValueChange( int ) );
+                        connect( slider, &QSlider::valueChanged,
+                                 this, QOverload<int>::of(&ExtV4l2::ValueChange) );
                        hlayout->addWidget( slider );
                    }
                    layout->addLayout( hlayout );
@@ -736,8 +736,8 @@ void ExtV4l2::Refresh( void )
                    button->setObjectName( qfu( psz_var ) );
                    button->setChecked( var_GetBool( p_obj, psz_var ) );

-                    CONNECT( button, clicked( bool ), this,
-                             ValueChange( bool ) );
+                    connect( button, &QCheckBox::clicked,
+                             this, QOverload<bool>::of(&ExtV4l2::ValueChange) );
                    layout->addWidget( button );
                    break;
                }
@@ -748,8 +748,8 @@ void ExtV4l2::Refresh( void )
                        QPushButton *button = new QPushButton( name, box );
                        button->setObjectName( qfu( psz_var ) );

-                        CONNECT( button, clicked( bool ), this,
-                                 ValueChange( bool ) );
+                        connect( button, &QPushButton::clicked,
+                                 this, QOverload<bool>::of(&ExtV4l2::ValueChange) );
                        layout->addWidget( button );
                    }
                    else
@@ -773,7 +773,7 @@ void ExtV4l2::Refresh( void )
        msg_Dbg( p_intf, "Couldn't find v4l2 instance" );
        help->show();
        if ( isVisible() )
-            QTimer::singleShot( 2000, this, SLOT(Refresh()) );
+            QTimer::singleShot( 2000, this, &ExtV4l2::Refresh );
    }
    vlc_player_Unlock(p_intf->p_player);
 }
@@ -839,13 +839,13 @@ FilterSliderData::FilterSliderData( QObject *parent,
    slider->setMinimum( p_data->f_min / p_data->f_resolution );
    slider->setMaximum( p_data->f_max / p_data->f_resolution );
    nameLabel->setText( p_data->descs );
-    CONNECT( slider, valueChanged( int ), this, updateText( int ) );
+    connect( slider, &QSlider::valueChanged, this, &FilterSliderData::updateText );
    setValue( initialValue() );
    /* In case current == min|max text would not be first updated */
    if ( slider->value() == slider->maximum() ||
         slider->value() == slider->minimum() )
        updateText( slider->value() );
-    CONNECT( slider, valueChanged( int ), this, onValueChanged( int ) );
+    connect( slider, &QSlider::valueChanged, this, &FilterSliderData::onValueChanged );
 }

 void FilterSliderData::setValue( float f )
@@ -904,8 +904,7 @@ AudioFilterControlWidget::AudioFilterControlWidget

 void AudioFilterControlWidget::connectConfigChanged( FilterSliderData *slider )
 {
-    connect( slider, SIGNAL( configChanged(QString, QVariant) ),
-             this, SIGNAL( configChanged(QString, QVariant) ) );
+    connect( slider, &FilterSliderData::configChanged, this, &AudioFilterControlWidget::configChanged );
 }

 void AudioFilterControlWidget::build()
@@ -947,7 +946,7 @@ void AudioFilterControlWidget::build()
        slidersBox->setChecked( true );
    else
        slidersBox->setChecked( false );
-    CONNECT( slidersBox, toggled(bool), this, enable(bool) );
+    connect( slidersBox, &QGroupBox::toggled, this, &AudioFilterControlWidget::enable );

    free( psz_af );
 }
@@ -985,10 +984,10 @@ EqualizerSliderData::EqualizerSliderData( QObject *parent, qt_intf_t *_p_intf,
    slider->setMinimum( p_data->f_min / p_data->f_resolution );
    slider->setMaximum( p_data->f_max / p_data->f_resolution );
    nameLabel->setText( p_data->descs );
-    CONNECT( slider, valueChanged( int ), this, updateText( int ) );
+    connect( slider, &QSlider::valueChanged, this, &EqualizerSliderData::updateText );
    setValue( initialValue() );
    updateText( slider->value() );
-    CONNECT( slider, valueChanged( int ), this, onValueChanged( int ) );
+    connect( slider, &QSlider::valueChanged, this, &EqualizerSliderData::onValueChanged );
 }

 QStringList EqualizerSliderData::getBandsFromAout() const
@@ -1180,7 +1179,7 @@ void Equalizer::build()
        ui.presetsCombo->addItem( icon, qfut( preset_list_text[i] ),
                                     QVariant( preset_list[i] ) );
    }
-    CONNECT( ui.presetsCombo, activated(int), this, setCorePreset(int) );
+    connect( ui.presetsCombo, QOverload<int>::of(&QComboBox::activated), this, &Equalizer::setCorePreset );

    /* Set enable checkbox */
    PlayerController::AoutPtr p_aout = THEMIM->getAout();
@@ -1191,14 +1190,16 @@ void Equalizer::build()
        psz_af = var_InheritString( p_intf, "audio-filter" );

    /* To enable or disable subwidgets */
-    /* If that list grows, better iterate over layout's childs */
-    CONNECT( ui.enableCheck, toggled(bool), ui.presetsCombo, setEnabled(bool) );
-    CONNECT( ui.enableCheck, toggled(bool), ui.presetLabel, setEnabled(bool) );
-    CONNECT( ui.enableCheck, toggled(bool), ui.eq2PassCheck, setEnabled(bool) );
-    CONNECT( ui.enableCheck, toggled(bool), ui.slidersPlaceholder, setEnabled(bool) );
-    CONNECT( ui.enableCheck, toggled(bool), ui.preampSlider, setEnabled(bool) );
-    CONNECT( ui.enableCheck, toggled(bool), ui.preampValue, setEnabled(bool) );
-    CONNECT( ui.enableCheck, toggled(bool), ui.preampLabel, setEnabled(bool) );
+    /* If that list grows, better iterate over layout's children */
+    connect( ui.enableCheck, &QCheckBox::toggled, [=]( bool checked ) {
+        ui.presetsCombo->setEnabled( checked );
+        ui.presetLabel->setEnabled( checked );
+        ui.eq2PassCheck->setEnabled( checked );
+        ui.slidersPlaceholder->setEnabled( checked );
+        ui.preampSlider->setEnabled( checked );
+        ui.preampValue->setEnabled( checked );
+        ui.preampLabel->setEnabled( checked );
+    } );

    if( psz_af && filterIsPresent( qfu(psz_af), name ) )
        ui.enableCheck->setChecked( true );
@@ -1209,11 +1210,11 @@ void Equalizer::build()
    ui.enableCheck->toggle(); ui.enableCheck->toggle();

    free( psz_af );
-    CONNECT( ui.enableCheck, toggled(bool), this, enable(bool) );
+    connect( ui.enableCheck, &QCheckBox::toggled, this, &Equalizer::enable );

    /* Connect and set 2 Pass checkbox */
    ui.eq2PassCheck->setChecked( var_InheritBool( p_aout.get(), "equalizer-2pass" ) );
-    CONNECT( ui.eq2PassCheck, toggled(bool), this, enable2Pass(bool) );
+    connect( ui.eq2PassCheck, &QCheckBox::toggled, this, &Equalizer::enable2Pass );
 }

 void Equalizer::setCorePreset( int i_preset )
@@ -1354,7 +1355,8 @@ SyncWidget::SyncWidget( QWidget *_parent ) : QWidget( _parent )
    spinBox.setSingleStep( 0.1 );
    spinBox.setSuffix( " s" );
    spinBox.setButtonSymbols( QDoubleSpinBox::PlusMinus );
-    CONNECT( &spinBox, valueChanged( double ), this, valueChangedHandler( double ) );
+    connect( &spinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+             this, &SyncWidget::valueChangedHandler );
    layout->addWidget( &spinBox );
    layout->addWidget( &spinLabel );
    layout->setContentsMargins( 0, 0, 0, 0 );
@@ -1480,7 +1482,7 @@ SyncControls::SyncControls( qt_intf_t *_p_intf, QWidget *_parent )
    connect( &m_SubsDelayCfgFactor, &QVLCFloat::valueChanged, subDurationSpin, &QDoubleSpinBox::setValue);

    BUTTON_SET_ACT_I( updateButton, "", update,
-            qtr( "Force update of this dialog's values" ), update() );
+            qtr( "Force update of this dialog's values" ), &SyncControls::update );

    initSubsDuration();


--- a/modules/gui/qt/dialogs/extensions/extensions.cpp
+++ b/modules/gui/qt/dialogs/extensions/extensions.cpp
@@ -52,8 +52,8 @@ ExtensionsDialogProvider::ExtensionsDialogProvider( qt_intf_t *_p_intf,
 {
    vlc_dialog_provider_set_ext_callback( p_intf, DialogCallback, NULL );

-    CONNECT( this, SignalDialog( extension_dialog_t* ),
-             this, UpdateExtDialog( extension_dialog_t* ) );
+    connect( this, &ExtensionsDialogProvider::SignalDialog,
+             this, &ExtensionsDialogProvider::UpdateExtDialog );
 }

 ExtensionsDialogProvider::~ExtensionsDialogProvider()
@@ -71,8 +71,8 @@ ExtensionDialog* ExtensionsDialogProvider::CreateExtDialog(
                                                   p_extensions_manager,
                                                   p_dialog );
    p_dialog->p_sys_intf = (void*) dialog;
-    CONNECT( dialog, destroyDialog( extension_dialog_t* ),
-             this, DestroyExtDialog( extension_dialog_t* ) );
+    connect( dialog, &ExtensionDialog::destroyDialog,
+             this, &ExtensionsDialogProvider::DestroyExtDialog );
    return dialog;
 }

@@ -167,8 +167,8 @@ ExtensionDialog::ExtensionDialog( qt_intf_t *_p_intf,
         , p_dialog( _p_dialog ), has_lock(true)
 {
    assert( p_dialog );
-    CONNECT( ExtensionsDialogProvider::getInstance(), destroyed(),
-             this, parentDestroyed() );
+    connect( ExtensionsDialogProvider::getInstance(), &ExtensionsDialogProvider::destroyed,
+             this, &ExtensionDialog::parentDestroyed );

    msg_Dbg( p_intf, "Creating a new dialog: '%s'", p_dialog->psz_title );
    this->setWindowFlags( Qt::WindowMinMaxButtonsHint
@@ -177,11 +177,11 @@ ExtensionDialog::ExtensionDialog( qt_intf_t *_p_intf,

    layout = new QGridLayout( this );
    clickMapper = new QSignalMapper( this );
-    CONNECT( clickMapper, mapped( QObject* ), this, TriggerClick( QObject* ) );
+    connect( clickMapper, QSIGNALMAPPER_MAPPEDOBJ_SIGNAL, this, &ExtensionDialog::TriggerClick );
    inputMapper = new QSignalMapper( this );
-    CONNECT( inputMapper, mapped( QObject* ), this, SyncInput( QObject* ) );
+    connect( inputMapper, QSIGNALMAPPER_MAPPEDOBJ_SIGNAL, this, &ExtensionDialog::SyncInput );
    selectMapper = new QSignalMapper( this );
-    CONNECT( selectMapper, mapped( QObject* ), this, SyncSelection(QObject*) );
+    connect( selectMapper, QSIGNALMAPPER_MAPPEDOBJ_SIGNAL, this, &ExtensionDialog::SyncSelection );

    UpdateWidgets();
 }
@@ -217,7 +217,8 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
        case EXTENSION_WIDGET_BUTTON:
            button = new QPushButton( qfu( p_widget->psz_text ), this );
            clickMapper->setMapping( button, new WidgetMapper( button, p_widget ) );
-            CONNECT( button, clicked(), clickMapper, map() );
+            connect( button, &QPushButton::clicked,
+                     clickMapper, QOverload<>::of(&QSignalMapper::map) );
            p_widget->p_sys_intf = button;
            return button;

@@ -246,8 +247,8 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
            textInput->setEchoMode( QLineEdit::Normal );
            inputMapper->setMapping( textInput, new WidgetMapper( textInput, p_widget ) );
            /// @note: maybe it would be wiser to use textEdited here?
-            CONNECT( textInput, textChanged(const QString &),
-                     inputMapper, map() );
+            connect( textInput, &QLineEdit::textChanged,
+                     inputMapper, QOverload<>::of(&QSignalMapper::map) );
            p_widget->p_sys_intf = textInput;
            return textInput;

@@ -258,8 +259,8 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
            textInput->setEchoMode( QLineEdit::Password );
            inputMapper->setMapping( textInput, new WidgetMapper( textInput, p_widget ) );
            /// @note: maybe it would be wiser to use textEdited here?
-            CONNECT( textInput, textChanged(const QString &),
-                     inputMapper, map() );
+            connect( textInput, &QLineEdit::textChanged,
+                     inputMapper, QOverload<>::of(&QSignalMapper::map) );
            p_widget->p_sys_intf = textInput;
            return textInput;

@@ -268,7 +269,8 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
            checkBox->setText( qfu( p_widget->psz_text ) );
            checkBox->setChecked( p_widget->b_checked );
            clickMapper->setMapping( checkBox, new WidgetMapper( checkBox, p_widget ) );
-            CONNECT( checkBox, stateChanged( int ), clickMapper, map() );
+            connect( checkBox, &QCheckBox::stateChanged,
+                     clickMapper, QOverload<>::of(&QSignalMapper::map) );
            p_widget->p_sys_intf = checkBox;
            return checkBox;

@@ -289,8 +291,8 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
                    comboBox->setCurrentIndex( idx );
            }
            selectMapper->setMapping( comboBox, new WidgetMapper( comboBox, p_widget ) );
-            CONNECT( comboBox, currentIndexChanged( const QString& ),
-                     selectMapper, map() );
+            connect( comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                     selectMapper, QOverload<>::of(&QSignalMapper::map) );
            return comboBox;

        case EXTENSION_WIDGET_LIST:
@@ -306,8 +308,8 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
                list->addItem( item );
            }
            selectMapper->setMapping( list, new WidgetMapper( list, p_widget ) );
-            CONNECT( list, itemSelectionChanged(),
-                     selectMapper, map() );
+            connect( list, &QListWidget::itemSelectionChanged,
+                     selectMapper, QOverload<>::of(&QSignalMapper::map) );
            return list;

        case EXTENSION_WIDGET_SPIN_ICON:
@@ -567,7 +569,8 @@ QWidget* ExtensionDialog::UpdateWidget( extension_widget_t *p_widget )
            button->setText( qfu( p_widget->psz_text ) );
            clickMapper->removeMappings( button );
            clickMapper->setMapping( button, new WidgetMapper( button, p_widget ) );
-            CONNECT( button, clicked(), clickMapper, map() );
+            connect( button, &QPushButton::clicked,
+                     clickMapper, QOverload<>::of(&QSignalMapper::map) );
            return button;

        case EXTENSION_WIDGET_IMAGE:

--- a/modules/gui/qt/dialogs/extensions/extensions_manager.cpp
+++ b/modules/gui/qt/dialogs/extensions/extensions_manager.cpp
@@ -46,12 +46,10 @@ ExtensionsManager::ExtensionsManager( qt_intf_t *_p_intf, QObject *parent )
    instance = this;

    menuMapper = new QSignalMapper( this );
-    CONNECT( menuMapper, mapped( int ), this, triggerMenu( int ) );
+    connect( menuMapper, QSIGNALMAPPER_MAPPEDINT_SIGNAL, this, &ExtensionsManager::triggerMenu );
    connect( THEMIM, &PlayerController::playingStateChanged, this, &ExtensionsManager::playingChanged );
-    DCONNECT( THEMIM, inputChanged( bool ),
-              this, inputChanged( ) );
-    CONNECT( THEMIM, metaChanged( input_item_t* ),
-             this, metaChanged( input_item_t* ) );
+    connect( THEMIM, &PlayerController::inputChanged, this, &ExtensionsManager::inputChanged, Qt::DirectConnection );
+    connect( THEMIM, &PlayerController::metaChanged, this, &ExtensionsManager::metaChanged );
    b_unloading = false;
    b_failed = false;
 }
@@ -172,7 +170,7 @@ void ExtensionsManager::menu( QMenu *current )
                    action = submenu->addAction( qfu( ppsz_titles[i] ) );
                    menuMapper->setMapping( action,
                                            MENU_MAP( pi_ids[i], i_ext ) );
-                    CONNECT( action, triggered(), menuMapper, map() );
+                    connect( action, &QAction::triggered, menuMapper, QOverload<>::of(&QSignalMapper::map) );
                    free( ppsz_titles[i] );
                }
                if( !i_num )
@@ -195,14 +193,14 @@ void ExtensionsManager::menu( QMenu *current )
            action = submenu->addAction( QIcon( ":/toolbar/clear.svg" ),
                                         qtr( "Deactivate" ) );
            menuMapper->setMapping( action, MENU_MAP( 0, i_ext ) );
-            CONNECT( action, triggered(), menuMapper, map() );
+            connect( action, &QAction::triggered, menuMapper, QOverload<>::of(&QSignalMapper::map) );
        }
        else
        {
            action = current->addAction(
                    qfu( p_ext->psz_shortdescription ? p_ext->psz_shortdescription: p_ext->psz_title ) );
            menuMapper->setMapping( action, MENU_MAP( 0, i_ext ) );
-            CONNECT( action, triggered(), menuMapper, map() );
+            connect( action, &QAction::triggered, menuMapper, QOverload<>::of(&QSignalMapper::map) );

            if( !extension_TriggerOnly( p_extensions_manager, p_ext ) )
            {

--- a/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
+++ b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
@@ -48,14 +48,14 @@ FingerprintDialog::FingerprintDialog(QWidget *parent, qt_intf_t *p_intf,
    ui->buttonsBox->addButton( "&Discard all identities",
                                QDialogButtonBox::RejectRole );

-    CONNECT( ui->buttonsBox, accepted(), this, applyIdentity() );
-    CONNECT( ui->buttonBox, rejected(), this, close() );
-    CONNECT( ui->buttonsBox, rejected(), this, close() );
+    connect( ui->buttonsBox, &QDialogButtonBox::accepted, this, &FingerprintDialog::applyIdentity );
+    connect( ui->buttonBox, &QDialogButtonBox::rejected, this, &FingerprintDialog::close );
+    connect( ui->buttonsBox, &QDialogButtonBox::rejected, this, &FingerprintDialog::close );

    t = new (std::nothrow) Chromaprint( p_intf );
    if ( t )
    {
-        CONNECT( t, finished(), this, handleResults() );
+        connect( t, &Chromaprint::finished, this, &FingerprintDialog::handleResults );
        t->enqueue( p_item );
    }
 }

--- a/modules/gui/qt/dialogs/gototime/gototime.cpp
+++ b/modules/gui/qt/dialogs/gototime/gototime.cpp
@@ -70,9 +70,9 @@ GotoTimeDialog::GotoTimeDialog( qt_intf_t *_p_intf)

    mainLayout->addWidget( buttonBox, 1, 0, 1, 3 );

-    BUTTONACT( gotoButton, close() );
-    BUTTONACT( cancelButton, cancel() );
-    BUTTONACT( resetButton, reset() );
+    BUTTONACT( gotoButton, &GotoTimeDialog::close );
+    BUTTONACT( cancelButton, &GotoTimeDialog::cancel );
+    BUTTONACT( resetButton, &GotoTimeDialog::reset );

    QVLCTools::restoreWidgetPosition( p_intf, "gototimedialog", this );
 }

--- a/modules/gui/qt/dialogs/help/help.cpp
+++ b/modules/gui/qt/dialogs/help/help.cpp
@@ -68,7 +68,7 @@ HelpDialog::HelpDialog( qt_intf_t *_p_intf ) : QVLCFrame( _p_intf )
    layout->addWidget( helpBrowser );
    layout->addWidget( closeButtonBox );

-    CONNECT( closeButtonBox, rejected(), this, close() );
+    connect( closeButtonBox, &QDialogButtonBox::rejected, this, &HelpDialog::close );
    restoreWidgetPosition( "Help", QSize( 500, 450 ) );
 }

@@ -221,11 +221,11 @@ UpdateDialog::UpdateDialog( qt_intf_t *_p_intf ) : QVLCFrame( _p_intf )
    setWindowTitle( qtr( "VLC media player updates" ) );
    setWindowRole( "vlc-update" );

-    BUTTONACT( recheckButton, UpdateOrDownload() );
-    CONNECT( ui.updateDialogButtonBox, rejected(), this, close() );
+    BUTTONACT( recheckButton, &UpdateDialog::UpdateOrDownload );
+    connect( ui.updateDialogButtonBox, &QDialogButtonBox::rejected, this, &UpdateDialog::close );

-    CONNECT( ui.updateNotifyButtonBox, accepted(), this, UpdateOrDownload() );
-    CONNECT( ui.updateNotifyButtonBox, rejected(), this, close() );
+    connect( ui.updateNotifyButtonBox, &QDialogButtonBox::accepted, this, &UpdateDialog::UpdateOrDownload );
+    connect( ui.updateNotifyButtonBox, &QDialogButtonBox::rejected, this, &UpdateDialog::close );

    /* Create the update structure */
    p_update = update_New( p_intf );

--- a/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
@@ -76,7 +76,7 @@ MetaPanel::MetaPanel( QWidget *parent,
    metaLayout->addWidget( label, line++, col, 1, colspan );              \
    widget = new QLineEdit;                                               \
    metaLayout->addWidget( widget, line, col, 1, colspan );               \
-    CONNECT( widget, textEdited( QString ), this, enterEditMode() );      \
+    connect( widget, &QLineEdit::textEdited, this, &MetaPanel::enterEditMode );      \
 }

    /* Title, artist and album*/
@@ -132,7 +132,7 @@ MetaPanel::MetaPanel( QWidget *parent,
    fingerprintButton->setToolTip( qtr( "Find meta data using audio fingerprinting" ) );
    fingerprintButton->setVisible( false );
    metaLayout->addWidget( fingerprintButton, line, 7 , 3, -1 );
-    CONNECT( fingerprintButton, clicked(), this, fingerprint() );
+    connect( fingerprintButton, &QPushButton::clicked, this, &MetaPanel::fingerprint );

    line++;

@@ -156,7 +156,7 @@ MetaPanel::MetaPanel( QWidget *parent,
    description_text = new QTextEdit;
    description_text->setAcceptRichText( false );
    metaLayout->addWidget( description_text, line, 0, 1, 7 );
-    CONNECT( description_text, textChanged(), this, enterEditMode() );
+    connect( description_text, &QTextEdit::textChanged, this, &MetaPanel::enterEditMode );
    line++;

    /* VLC_META_SETTING: Useless */
@@ -168,11 +168,12 @@ MetaPanel::MetaPanel( QWidget *parent,
    metaLayout->setRowStretch( line, 10 );
 #undef ADD_META

-    CONNECT( seqnum_text, textEdited( QString ), this, enterEditMode() );
-    CONNECT( seqtot_text, textEdited( QString ), this, enterEditMode() );
+    connect( seqnum_text, &QLineEdit::textEdited, this, &MetaPanel::enterEditMode );
+    connect( seqtot_text, &QLineEdit::textEdited, this, &MetaPanel::enterEditMode );

-    CONNECT( date_text, textEdited( QString ), this, enterEditMode() );
-//    CONNECT( THEMIM, artChanged( QString ), this, enterEditMode() );
+    connect( date_text, &QLineEdit::textEdited, this, &MetaPanel::enterEditMode );
+//    connect( THEMIM, QOverload<input_item_t *>::of(&PlayerController::artChanged),
+//             this, &MetaPanel::enterEditMode );

    /* We are not yet in Edit Mode */
    b_inEditMode = false;
@@ -227,10 +228,9 @@ void MetaPanel::update( input_item_t *p_item )
    UPDATE_META( Genre, genre_text );
    UPDATE_META( Copyright, copyright_text );
    UPDATE_META( Album, collection_text );
-    disconnect( description_text, SIGNAL(textChanged()), this,
-                SLOT(enterEditMode()) );
+    disconnect( description_text, &QTextEdit::textChanged, this, &MetaPanel::enterEditMode );
    UPDATE_META( Description, description_text );
-    CONNECT( description_text, textChanged(), this, enterEditMode() );
+    connect( description_text, &QTextEdit::textChanged, this, &MetaPanel::enterEditMode );
    UPDATE_META( Language, language_text );
    UPDATE_META( Publisher, publisher_text );
    UPDATE_META( EncodedBy, encodedby_text );
@@ -335,10 +335,9 @@ void MetaPanel::clear()
    collection_text->clear();
    seqnum_text->clear();
    seqtot_text->clear();
-    disconnect( description_text, SIGNAL(textChanged()), this,
-                SLOT(enterEditMode()) );
+    disconnect( description_text, &QTextEdit::textChanged, this, &MetaPanel::enterEditMode );
    description_text->clear();
-    CONNECT( description_text, textChanged(), this, enterEditMode() );
+    connect( description_text, &QTextEdit::textChanged, this, &MetaPanel::enterEditMode );
    date_text->clear();
    language_text->clear();
    nowplaying_text->clear();
@@ -355,7 +354,7 @@ void MetaPanel::clear()
 void MetaPanel::fingerprint()
 {
    FingerprintDialog *dialog = new FingerprintDialog( this, p_intf, p_input );
-    CONNECT( dialog, metaApplied( input_item_t * ), this, fingerprintUpdate( input_item_t * ) );
+    connect( dialog, &FingerprintDialog::metaApplied, this, &MetaPanel::fingerprintUpdate );
    dialog->setAttribute( Qt::WA_DeleteOnClose, true );
    dialog->show();
 }

--- a/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
@@ -89,17 +89,17 @@ MediaInfoDialog::MediaInfoDialog( qt_intf_t *_p_intf,
    layout->addWidget( saveMetaButton, 2, 6 );
    layout->addWidget( closeButton, 2, 7 );

-    BUTTONACT( closeButton, close() );
+    BUTTONACT( closeButton, &MediaInfoDialog::close );

    /* The tabs buttons are shown in the main dialog for space and cosmetics */
-    BUTTONACT( saveMetaButton, saveMeta() );
+    BUTTONACT( saveMetaButton, &MediaInfoDialog::saveMeta );

    /* Let the MetaData Panel update the URI */
-    CONNECT( MP, uriSet( const QString& ), this, updateURI( const QString& ) );
-    CONNECT( MP, editing(), saveMetaButton, show() );
+    connect( MP, &MetaPanel::uriSet, this, &MediaInfoDialog::updateURI );
+    connect( MP, &MetaPanel::editing, saveMetaButton, &QPushButton::show );

    /* Display the buttonBar according to the Tab selected */
-    CONNECT( infoTabW, currentChanged( int ), this, updateButtons( int ) );
+    connect( infoTabW, &QTabWidget::currentChanged, this, &MediaInfoDialog::updateButtons );

    /* If using the General Mode */
    if( isMainInputInfo )

--- a/modules/gui/qt/dialogs/messages/messages.cpp
+++ b/modules/gui/qt/dialogs/messages/messages.cpp
@@ -122,15 +122,15 @@ MessagesDialog::MessagesDialog( qt_intf_t *_p_intf)

    tabChanged(0);

-    BUTTONACT( updateButton, updateOrClear() );
-    BUTTONACT( ui.saveLogButton, save() );
-    CONNECT( ui.filterEdit, editingFinished(), this, updateConfig() );
-    CONNECT( ui.filterEdit, textChanged(QString), this, filterMessages() );
-    CONNECT( ui.bottomButtonsBox, rejected(), this, hide() );
-    CONNECT( ui.verbosityBox, valueChanged( int ),
-             this, changeVerbosity( int ) );
-
-    CONNECT( ui.mainTab, currentChanged( int ), this, tabChanged( int ) );
+    BUTTONACT( updateButton, &MessagesDialog::updateOrClear );
+    BUTTONACT( ui.saveLogButton, &MessagesDialog::save );
+    connect( ui.filterEdit, &QLineEdit::editingFinished, this, &MessagesDialog::updateConfig );
+    connect( ui.filterEdit, &QLineEdit::textChanged, this, &MessagesDialog::filterMessages );
+    connect( ui.bottomButtonsBox, &QDialogButtonBox::rejected, this, &MessagesDialog::hide );
+    connect( ui.verbosityBox, QOverload<int>::of(&QVLCDebugLevelSpinBox::valueChanged),
+             this, &MessagesDialog::changeVerbosity );
+
+    connect( ui.mainTab, &QTabWidget::currentChanged, this, &MessagesDialog::tabChanged );

    /* General action */
    restoreWidgetPosition( "Messages", QSize( 600, 450 ) );

--- a/modules/gui/qt/dialogs/open/open.cpp
+++ b/modules/gui/qt/dialogs/open/open.cpp
@@ -110,13 +110,13 @@ OpenDialog::OpenDialog( QWindow *parent,

    /* Menu for the Play button */
    QMenu * openButtonMenu = new QMenu( "Open", playButton );
-    openButtonMenu->addAction( qtr( "&Enqueue" ), this, SLOT( enqueue() ),
+    openButtonMenu->addAction( qtr( "&Enqueue" ), this, &OpenDialog::enqueue,
                                    QKeySequence( "Alt+E" ) );
-    openButtonMenu->addAction( qtr( "&Play" ), this, SLOT( play() ),
+    openButtonMenu->addAction( qtr( "&Play" ), this, &OpenDialog::play,
                                    QKeySequence( "Alt+P" ) );
-    openButtonMenu->addAction( qtr( "&Stream" ), this, SLOT( stream() ) ,
+    openButtonMenu->addAction( qtr( "&Stream" ), this, &OpenDialog::stream,
                                    QKeySequence( "Alt+S" ) );
-    openButtonMenu->addAction( qtr( "C&onvert" ), this, SLOT( transcode() ) ,
+    openButtonMenu->addAction( qtr( "C&onvert" ), this, &OpenDialog::transcode,
                                    QKeySequence( "Alt+O" ) );

    playButton->setMenu( openButtonMenu );
@@ -129,39 +129,40 @@ OpenDialog::OpenDialog( QWindow *parent,
    setMenuAction();

    /* Force MRL update on tab change */
-    CONNECT( ui.Tab, currentChanged( int ), this, signalCurrent( int ) );
-
-    CONNECT( fileOpenPanel, mrlUpdated( const QStringList&, const QString& ),
-             this, updateMRL( const QStringList&, const QString& ) );
-    CONNECT( netOpenPanel, mrlUpdated( const QStringList&, const QString& ),
-             this, updateMRL( const QStringList&, const QString& ) );
-    CONNECT( discOpenPanel, mrlUpdated( const QStringList&, const QString& ),
-             this, updateMRL( const QStringList&, const QString& ) );
-    CONNECT( captureOpenPanel, mrlUpdated( const QStringList&, const QString& ),
-             this, updateMRL( const QStringList&, const QString& ) );
-
-    CONNECT( fileOpenPanel, methodChanged( const QString& ),
-             this, newCachingMethod( const QString& ) );
-    CONNECT( netOpenPanel, methodChanged( const QString& ),
-             this, newCachingMethod( const QString& ) );
-    CONNECT( discOpenPanel, methodChanged( const QString& ),
-             this, newCachingMethod( const QString& ) );
-    CONNECT( captureOpenPanel, methodChanged( const QString& ),
-             this, newCachingMethod( const QString& ) );
+    connect( ui.Tab, &QTabWidget::currentChanged, this, &OpenDialog::signalCurrent );
+
+    connect( fileOpenPanel, &FileOpenPanel::mrlUpdated,
+             this, QOverload<const QStringList&, const QString&>::of(&OpenDialog::updateMRL) );
+    connect( netOpenPanel, &NetOpenPanel::mrlUpdated,
+             this, QOverload<const QStringList&, const QString&>::of(&OpenDialog::updateMRL) );
+    connect( discOpenPanel, &DiscOpenPanel::mrlUpdated,
+             this, QOverload<const QStringList&, const QString&>::of(&OpenDialog::updateMRL) );
+    connect( captureOpenPanel, &CaptureOpenPanel::mrlUpdated,
+             this, QOverload<const QStringList&, const QString&>::of(&OpenDialog::updateMRL) );
+
+    connect( fileOpenPanel, &FileOpenPanel::methodChanged, this, &OpenDialog::newCachingMethod );
+    connect( netOpenPanel, &NetOpenPanel::methodChanged, this, &OpenDialog::newCachingMethod );
+    connect( discOpenPanel, &DiscOpenPanel::methodChanged, this, &OpenDialog::newCachingMethod );
+    connect( captureOpenPanel, &CaptureOpenPanel::methodChanged, this, &OpenDialog::newCachingMethod );

    /* Advanced frame Connects */
-    CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() );
-    CONNECT( ui.slaveText, textChanged( const QString& ), this, updateMRL() );
-    CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() );
-    CONNECT( ui.startTimeTimeEdit, timeChanged ( const QTime& ), this, updateMRL() );
-    CONNECT( ui.stopTimeTimeEdit, timeChanged ( const QTime& ), this, updateMRL() );
-    BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() );
-    BUTTONACT( ui.slaveBrowseButton, browseInputSlave() );
+    connect( ui.slaveCheckbox, &QCheckBox::toggled,
+             this, QOverload<>::of(&OpenDialog::updateMRL) );
+    connect( ui.slaveText, &QLineEdit::textChanged,
+             this, QOverload<>::of(&OpenDialog::updateMRL) );
+    connect( ui.cacheSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+             this, QOverload<>::of(&OpenDialog::updateMRL) );
+    connect( ui.startTimeTimeEdit, &QTimeEdit::timeChanged,
+             this, QOverload<>::of(&OpenDialog::updateMRL) );
+    connect( ui.stopTimeTimeEdit, &QTimeEdit::timeChanged,
+             this, QOverload<>::of(&OpenDialog::updateMRL) );
+    BUTTONACT( ui.advancedCheckBox, &OpenDialog::toggleAdvancedPanel );
+    BUTTONACT( ui.slaveBrowseButton, &OpenDialog::browseInputSlave );

    /* Buttons action */
-    BUTTONACT( playButton, selectSlots() );
-    BUTTONACT( selectButton, close() );
-    BUTTONACT( cancelButton, cancel() );
+    BUTTONACT( playButton, &OpenDialog::selectSlots );
+    BUTTONACT( selectButton, &OpenDialog::close );
+    BUTTONACT( cancelButton, &OpenDialog::cancel );

    /* Hide the advancedPanel */
    if( !getSettings()->value( "OpenDialog/advanced", false ).toBool())

--- a/modules/gui/qt/dialogs/open/open_panels.cpp
+++ b/modules/gui/qt/dialogs/open/open_panels.cpp
@@ -113,14 +113,14 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, qt_intf_t *_p_intf ) :
    ui.subGroupBox->setEnabled( false );

    /* Connects  */
-    BUTTONACT( ui.fileBrowseButton, browseFile() );
-    BUTTONACT( ui.removeFileButton, removeFile() );
+    BUTTONACT( ui.fileBrowseButton, &FileOpenPanel::browseFile );
+    BUTTONACT( ui.removeFileButton, &FileOpenPanel::removeFile );

-    BUTTONACT( ui.subBrowseButton, browseFileSub() );
-    CONNECT( ui.subGroupBox, toggled( bool ), this, updateMRL() );
+    BUTTONACT( ui.subBrowseButton, &FileOpenPanel::browseFileSub );
+    connect( ui.subGroupBox, &QGroupBox::toggled, this, &FileOpenPanel::updateMRL );

-    CONNECT( ui.fileListWidg, itemChanged( QListWidgetItem * ), this, updateMRL() );
-    CONNECT( ui.subInput, textChanged( const QString& ), this, updateMRL() );
+    connect( ui.fileListWidg, &QListWidget::itemChanged, this, &FileOpenPanel::updateMRL );
+    connect( ui.subInput, &QLineEdit::textChanged, this, &FileOpenPanel::updateMRL );
    updateButtons();
 }

@@ -174,7 +174,7 @@ inline void FileOpenPanel::BuildOldPanel()
    if( !lineEdits.isEmpty() )
    {
        QLineEdit *lineFileEdit = lineEdits[0];
-        CONNECT( lineFileEdit, textChanged( const QString& ), this, updateMRL() );
+        connect( lineFileEdit, &QLineEdit::textChanged, this, &FileOpenPanel::updateMRL );
    }

    dialogBox->layout()->setMargin( 0 );
@@ -374,22 +374,27 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, qt_intf_t *_p_intf ) :
 #endif

    /* CONNECTs */
-    BUTTONACT( ui.dvdRadioButton,     updateButtons() );
-    BUTTONACT( ui.bdRadioButton,      updateButtons() );
-    BUTTONACT( ui.vcdRadioButton,     updateButtons() );
-    BUTTONACT( ui.audioCDRadioButton, updateButtons() );
-    BUTTONACT( ui.dvdsimple,          updateButtons() );
-    BUTTONACT( ui.browseDiscButton, browseDevice() );
+    BUTTONACT( ui.dvdRadioButton,     &DiscOpenPanel::updateButtons );
+    BUTTONACT( ui.bdRadioButton,      &DiscOpenPanel::updateButtons );
+    BUTTONACT( ui.vcdRadioButton,     &DiscOpenPanel::updateButtons );
+    BUTTONACT( ui.audioCDRadioButton, &DiscOpenPanel::updateButtons );
+    BUTTONACT( ui.dvdsimple,          &DiscOpenPanel::updateButtons );
+    BUTTONACT( ui.browseDiscButton,   &DiscOpenPanel::browseDevice );
    BUTTON_SET_ACT_I( ui.ejectButton, "", toolbar/eject, qtr( "Eject the disc" ),
-            eject() );
-
-    CONNECT( ui.deviceCombo, editTextChanged( QString ), this, updateMRL());
-    CONNECT( ui.deviceCombo, currentIndexChanged( QString ), this, updateMRL());
-    CONNECT( ui.titleSpin, valueChanged( int ), this, updateMRL());
-    CONNECT( ui.chapterSpin, valueChanged( int ), this, updateMRL());
-    CONNECT( ui.audioSpin, valueChanged( int ), this, updateMRL());
-    CONNECT( ui.subtitlesSpin, valueChanged( int ), this, updateMRL());
-    CONNECT( ui.dvdsimple, toggled( bool ), this, updateMRL());
+            &DiscOpenPanel::eject );
+
+    connect( ui.deviceCombo, &QComboBox::editTextChanged, this, &DiscOpenPanel::updateMRL );
+    connect( ui.deviceCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+             this, &DiscOpenPanel::updateMRL );
+    connect( ui.titleSpin, QOverload<int>::of(&QSpinBox::valueChanged),
+             this, &DiscOpenPanel::updateMRL );
+    connect( ui.chapterSpin, QOverload<int>::of(&QSpinBox::valueChanged),
+             this, &DiscOpenPanel::updateMRL );
+    connect( ui.audioSpin, QOverload<int>::of(&QSpinBox::valueChanged),
+             this, &DiscOpenPanel::updateMRL );
+    connect( ui.subtitlesSpin, QOverload<int>::of(&QSpinBox::valueChanged),
+             this, &DiscOpenPanel::updateMRL );
+    connect( ui.dvdsimple, &QCheckBox::toggled, this, &DiscOpenPanel::updateMRL );

    /* Run once the updateButtons function in order to fill correctly the comboBoxes */
    updateButtons();
@@ -678,7 +683,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, qt_intf_t *_p_intf ) :
                                OpenPanel( _parent, _p_intf )
 {
    ui.setupUi( this );
-    CONNECT( ui.urlComboBox, editTextChanged( const QString& ), this, updateMRL());
+    connect( ui.urlComboBox, &QComboBox::editTextChanged, this, &NetOpenPanel::updateMRL );

    /* */
    if( var_InheritBool( p_intf, "save-recentplay" ) )
@@ -782,8 +787,9 @@ void CaptureOpenPanel::initialize()

    ui.setupUi( this );

-    BUTTONACT( ui.advancedButton, advancedDialog() );
-    CONNECT( ui.deviceCombo, currentIndexChanged(int), this, enableAdvancedDialog(int) );
+    BUTTONACT( ui.advancedButton, &CaptureOpenPanel::advancedDialog );
+    connect( ui.deviceCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+             this, &CaptureOpenPanel::enableAdvancedDialog );

    /* Create two stacked layouts in the main comboBoxes */
    QStackedLayout *stackedDevLayout = new QStackedLayout;
@@ -804,7 +810,7 @@ void CaptureOpenPanel::initialize()
    name ## PropPage->setLayout( name ## PropLayout );                \
    ui.deviceCombo->addItem( qfut( label ), QVariant( number ) );

-#define CuMRL( widget, slot ) CONNECT( widget , slot , this, updateMRL() );
+#define CuMRL( widget, slot ) connect( widget, slot, this, &CaptureOpenPanel::updateMRL );

 #ifdef _WIN32
    /*********************
@@ -835,9 +841,9 @@ void CaptureOpenPanel::initialize()
            1, 0, 3, 1 );

    /* dshow CONNECTs */
-    CuMRL( vdevDshowW, changed() );
-    CuMRL( adevDshowW, changed() );
-    CuMRL( dshowVSizeLine, textChanged( const QString& ) );
+    CuMRL( vdevDshowW, &StringListConfigControl::changed );
+    CuMRL( adevDshowW, &StringListConfigControl::changed );
+    CuMRL( dshowVSizeLine, &QLineEdit::textChanged );
    configList << "dshow-vdev" << "dshow-adev" << "dshow-size";
    }
 #else /* _WIN32 */
@@ -889,11 +895,11 @@ void CaptureOpenPanel::initialize()
            1, 0, 3, 2 );

    /* v4l2 CONNECTs */
-    CuMRL( v4l2VideoDevice->lineEdit(), textChanged( const QString& ) );
-    CuMRL( v4l2VideoDevice,  currentIndexChanged ( int ) );
-    CuMRL( v4l2AudioDevice->lineEdit(), textChanged( const QString& ) );
-    CuMRL( v4l2AudioDevice,  currentIndexChanged ( int ) );
-    CuMRL( v4l2StdBox,  currentIndexChanged ( int ) );
+    CuMRL( v4l2VideoDevice->lineEdit(), &QLineEdit::textChanged );
+    CuMRL( v4l2VideoDevice, QOverload<int>::of(&QComboBox::currentIndexChanged) );
+    CuMRL( v4l2AudioDevice->lineEdit(), &QLineEdit::textChanged );
+    CuMRL( v4l2AudioDevice, QOverload<int>::of(&QComboBox::currentIndexChanged) );
+    CuMRL( v4l2StdBox, QOverload<int>::of(&QComboBox::currentIndexChanged) );
    configList << "v4l2-standard";
    }

@@ -935,10 +941,10 @@ void CaptureOpenPanel::initialize()
    jackPropLayout->addWidget( jackConnect, 1, 2 );

    /* Jack CONNECTs */
-    CuMRL( jackChannels, valueChanged( int ) );
-    CuMRL( jackPace, stateChanged( int ) );
-    CuMRL( jackConnect, stateChanged( int ) );
-    CuMRL( jackPortsSelected, textChanged( const QString& ) );
+    CuMRL( jackChannels, QOverload<int>::of(&QSpinBox::valueChanged) );
+    CuMRL( jackPace, &QCheckBox::stateChanged );
+    CuMRL( jackConnect, &QCheckBox::stateChanged );
+    CuMRL( jackPortsSelected, &QLineEdit::textChanged );
    configList << "jack-input-use-vlc-pace" << "jack-input-auto-connect";
    }
 #endif
@@ -1038,27 +1044,27 @@ void CaptureOpenPanel::initialize()
            2, 0, 2, 1 );

    /* DVB CONNECTs */
-    CuMRL( dvbCard, valueChanged ( int ) );
-    CuMRL( dvbFreq, valueChanged ( int ) );
-    CuMRL( dvbSrate, valueChanged ( int ) );
-    CuMRL( dvbQamBox, currentIndexChanged ( int ) );
-    CuMRL( dvbPskBox, currentIndexChanged ( int ) );
-    CuMRL( dvbBandBox, currentIndexChanged ( int ) );
-
-    BUTTONACT( dvbc, updateButtons() );
-    BUTTONACT( dvbs, updateButtons() );
-    BUTTONACT( dvbs2, updateButtons() );
-    BUTTONACT( dvbt, updateButtons() );
-    BUTTONACT( dvbt2, updateButtons() );
-    BUTTONACT( atsc, updateButtons() );
-    BUTTONACT( cqam, updateButtons() );
-    BUTTONACT( dvbc, updateMRL() );
-    BUTTONACT( dvbt, updateMRL() );
-    BUTTONACT( dvbt2, updateMRL() );
-    BUTTONACT( dvbs, updateMRL() );
-    BUTTONACT( dvbs2, updateMRL() );
-    BUTTONACT( atsc, updateMRL() );
-    BUTTONACT( cqam, updateMRL() );
+    CuMRL( dvbCard, QOverload<int>::of(&QSpinBox::valueChanged) );
+    CuMRL( dvbFreq, QOverload<int>::of(&QSpinBox::valueChanged) );
+    CuMRL( dvbSrate, QOverload<int>::of(&QSpinBox::valueChanged) );
+    CuMRL( dvbQamBox, QOverload<int>::of(&QComboBox::currentIndexChanged) );
+    CuMRL( dvbPskBox, QOverload<int>::of(&QComboBox::currentIndexChanged) );
+    CuMRL( dvbBandBox, QOverload<int>::of(&QComboBox::currentIndexChanged) );
+
+    BUTTONACT( dvbc, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( dvbs, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( dvbs2, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( dvbt, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( dvbt2, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( atsc, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( cqam, &CaptureOpenPanel::updateButtons );
+    BUTTONACT( dvbc, &CaptureOpenPanel::updateMRL );
+    BUTTONACT( dvbt, &CaptureOpenPanel::updateMRL );
+    BUTTONACT( dvbt2, &CaptureOpenPanel::updateMRL );
+    BUTTONACT( dvbs, &CaptureOpenPanel::updateMRL );
+    BUTTONACT( dvbs2, &CaptureOpenPanel::updateMRL );
+    BUTTONACT( atsc, &CaptureOpenPanel::updateMRL );
+    BUTTONACT( cqam, &CaptureOpenPanel::updateMRL );
    configList << "dvb-adapter" << "dvb-frequency" << "dvb-modulation"
               << "dvb-bandwidth";
    }
@@ -1120,10 +1126,10 @@ void CaptureOpenPanel::initialize()
                            2, 0, 1, 1 );

    /* PVR CONNECTs */
-    CuMRL( pvrDevice, editTextChanged( const QString& ) );
-    CuMRL( pvrAudioDevice, editTextChanged( const QString& ) );
-    CuMRL( pvrFreq, valueChanged ( int ) );
-    CuMRL( pvrNormBox, currentIndexChanged ( int ) );
+    CuMRL( pvrDevice, &QComboBox::editTextChanged );
+    CuMRL( pvrAudioDevice, &QComboBox::editTextChanged );
+    CuMRL( pvrFreq, QOverload<int>::of(&QSpinBox::valueChanged) );
+    CuMRL( pvrNormBox, QOverload<int>::of(&QComboBox::currentIndexChanged) );
    }
 #endif

@@ -1149,15 +1155,15 @@ void CaptureOpenPanel::initialize()
    screenPropLayout->addWidget( screenFPS, 0, 1 );

    /* Screen connect */
-    CuMRL( screenFPS, valueChanged( double ) );
+    CuMRL( screenFPS, QOverload<double>::of(&QDoubleSpinBox::valueChanged) );

    /* General connects */
-    CONNECT( ui.deviceCombo, activated( int ) ,
-             stackedDevLayout, setCurrentIndex( int ) );
-    CONNECT( ui.deviceCombo, activated( int ),
-             stackedPropLayout, setCurrentIndex( int ) );
-    CONNECT( ui.deviceCombo, activated( int ), this, updateMRL() );
-    CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() );
+    connect( ui.deviceCombo, QOverload<int>::of(&QComboBox::activated), [=]( int index ) {
+        stackedDevLayout->setCurrentIndex( index );
+        stackedPropLayout->setCurrentIndex( index );
+        this->updateMRL();
+        this->updateButtons();
+    } );

 #undef CuMRL
 #undef addModuleAndLayouts
@@ -1396,8 +1402,8 @@ void CaptureOpenPanel::advancedDialog()
    QPushButton *closeButton = new QPushButton( qtr( "OK" ) );
    QPushButton *cancelButton = new QPushButton( qtr( "Cancel" ) );

-    CONNECT( closeButton, clicked(), adv, accept() );
-    CONNECT( cancelButton, clicked(), adv, reject() );
+    connect( closeButton, &QPushButton::clicked, adv, &QDialog::accept );
+    connect( cancelButton, &QPushButton::clicked, adv, &QDialog::reject );

    advButtonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
    advButtonBox->addButton( cancelButton, QDialogButtonBox::RejectRole );

--- a/modules/gui/qt/dialogs/open/openurl.cpp
+++ b/modules/gui/qt/dialogs/open/openurl.cpp
@@ -51,13 +51,13 @@ OpenUrlDialog::OpenUrlDialog( qt_intf_t *_p_intf,

    QDialogButtonBox *box = new QDialogButtonBox( this );
    but = box->addButton( qtr( "&Play" ), QDialogButtonBox::AcceptRole );
-    CONNECT( but, clicked(), this, play() );
+    connect( but, &QPushButton::clicked, this, &OpenUrlDialog::play );

    but = box->addButton( qtr( "&Enqueue" ), QDialogButtonBox::AcceptRole );
-    CONNECT( but, clicked(), this, enqueue() );
+    connect( but, &QPushButton::clicked, this, &OpenUrlDialog::enqueue );

    but = box->addButton( qtr( "&Cancel" ) , QDialogButtonBox::RejectRole );
-    CONNECT( box, rejected(), this, reject() );
+    connect( box, &QDialogButtonBox::rejected, this, &OpenUrlDialog::reject );

    /* Info label and line edit */
    edit = new ClickLineEdit( qtr( "Enter URL here..." ), this );

--- a/modules/gui/qt/dialogs/plugins/plugins.cpp
+++ b/modules/gui/qt/dialogs/plugins/plugins.cpp
@@ -93,7 +93,7 @@ PluginDialog::PluginDialog( qt_intf_t *_p_intf ) : QVLCFrame( _p_intf )
    QPushButton *okButton = new QPushButton( qtr( "&Close" ), this );
    box->addButton( okButton, QDialogButtonBox::RejectRole );
    layout->addWidget( box );
-    BUTTONACT( okButton, close() );
+    BUTTONACT( okButton, &PluginDialog::close );
    restoreWidgetPosition( "PluginsDialog", QSize( 435, 280 ) );
 }

@@ -143,8 +143,7 @@ PluginTab::PluginTab( qt_intf_t *p_intf_ )

    layout->addWidget( label, 1, 0 );
    layout->addWidget( edit, 1, 1, 1, 1 );
-    CONNECT( edit, textChanged( const QString& ),
-            this, search( const QString& ) );
+    connect( edit, &SearchLineEdit::textChanged, this, &PluginTab::search );

    setMinimumSize( 500, 300 );
    restoreWidgetPosition( "Plugins", QSize( 540, 400 ) );
@@ -226,8 +225,7 @@ ExtensionTab::ExtensionTab( qt_intf_t *p_intf_ )

    // ListView
    extList = new QListView( this );
-    CONNECT( extList, activated( const QModelIndex& ),
-             this, moreInformation() );
+    connect( extList, &QListView::activated, this, &ExtensionTab::moreInformation );
    layout->addWidget( extList );

    // List item delegate
@@ -250,7 +248,7 @@ ExtensionTab::ExtensionTab( qt_intf_t *p_intf_ )
    butMoreInfo = new QPushButton( QIcon( ":/menu/info.svg" ),
                                   qtr( "More information..." ),
                                   this );
-    CONNECT( butMoreInfo, clicked(), this, moreInformation() );
+    connect( butMoreInfo, &QPushButton::clicked, this, &ExtensionTab::moreInformation );
    buttonsBox->addButton( butMoreInfo, QDialogButtonBox::ActionRole );

    // Reload button
@@ -258,12 +256,10 @@ ExtensionTab::ExtensionTab( qt_intf_t *p_intf_ )
    QPushButton *reload = new QPushButton( QIcon( ":/update.svg" ),
                                           qtr( "Reload extensions" ),
                                           this );
-    CONNECT( reload, clicked(), EM, reloadExtensions() );
-    CONNECT( reload, clicked(), this, updateButtons() );
-    CONNECT( extList->selectionModel(),
-             selectionChanged( const QItemSelection &, const QItemSelection & ),
-             this,
-             updateButtons() );
+    connect( reload, &QPushButton::clicked, EM, &ExtensionsManager::reloadExtensions );
+    connect( reload, &QPushButton::clicked, this, &ExtensionTab::updateButtons );
+    connect( extList->selectionModel(), &QItemSelectionModel::selectionChanged,
+             this, &ExtensionTab::updateButtons );
    buttonsBox->addButton( reload, QDialogButtonBox::ResetRole );

    layout->addWidget( buttonsBox );
@@ -370,7 +366,7 @@ AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )
    button->setCheckable( true );\
    if ( numb == -1 ) button->setChecked( true );\
    button->setAutoExclusive( true );\
-    CONNECT( button, clicked(), signalMapper, map() );\
+    connect( button, &QToolButton::clicked, signalMapper, QOverload<>::of(&QSignalMapper::map) );\
    signalMapper->setMapping( button, numb );\
    leftPane->layout()->addWidget( button );

@@ -419,14 +415,14 @@ AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )
    QCheckBox *installedOnlyBox = new QCheckBox( qtr("Only installed") );
    installedOnlyBox->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
    switchStack->insertWidget( WITHONLINEADDONS, installedOnlyBox );
-    CONNECT( installedOnlyBox, stateChanged(int), this, installChecked(int) );
+    connect( installedOnlyBox, &QCheckBox::stateChanged, this, &AddonsTab::installChecked );

    QPushButton *reposyncButton = new QPushButton( QIcon( ":/update.svg" ),
                                              qtr("Find more addons online") );
    reposyncButton->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
    switchStack->insertWidget( ONLYLOCALADDONS, reposyncButton );
    switchStack->setCurrentIndex( ONLYLOCALADDONS );
-    CONNECT( reposyncButton, clicked(), this, reposync() );
+    connect( reposyncButton, &QPushButton::clicked, this, &AddonsTab::reposync );

    leftPane->layout()->addItem( new QSpacerItem( 0, 0, QSizePolicy::Maximum, QSizePolicy::Expanding ) );

@@ -435,14 +431,14 @@ AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )

    // ListView
    addonsView = new QListView( this );
-    CONNECT( addonsView, activated( const QModelIndex& ), this, moreInformation() );
+    connect( addonsView, &QListView::activated, this, &AddonsTab::moreInformation );
    layout->addWidget( addonsView );

    // List item delegate
    AddonItemDelegate *addonsDelegate = new AddonItemDelegate( addonsView );
    addonsView->setItemDelegate( addonsDelegate );
    addonsDelegate->setAnimator( new DelegateAnimationHelper( addonsView ) );
-    CONNECT( addonsDelegate, showInfo(), this, moreInformation() );
+    connect( addonsDelegate, &AddonItemDelegate::showInfo, this, &AddonsTab::moreInformation );

    // Extension list look & feeling
    addonsView->setAlternatingRowColors( true );
@@ -465,18 +461,19 @@ AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )
    addonsModel->setFilterRole( Qt::DisplayRole );
    addonsView->setModel( addonsModel );

-    CONNECT( signalMapper, mapped(int), addonsModel, setTypeFilter(int) );
+    connect( signalMapper, QSIGNALMAPPER_MAPPEDINT_SIGNAL,
+             addonsModel, &AddonsSortFilterProxyModel::setTypeFilter );

-    CONNECT( searchInput, textChanged( const QString &),
-             addonsModel, setFilterFixedString( QString ) );
+    connect( searchInput, &SearchLineEdit::textChanged,
+             addonsModel, &AddonsSortFilterProxyModel::setFilterFixedString );

-    CONNECT( addonsView->selectionModel(), currentChanged(QModelIndex,QModelIndex),
-             addonsView, edit(QModelIndex) );
+    connect( addonsView->selectionModel(), &QItemSelectionModel::currentChanged,
+             addonsView, QOverload<const QModelIndex&>::of(&QListView::edit) );

-    CONNECT( AM, addonAdded( addon_entry_t * ),
-             model, addonAdded( addon_entry_t * ) );
-    CONNECT( AM, addonChanged( const addon_entry_t * ),
-             model, addonChanged( const addon_entry_t * ) );
+    connect( AM, SIGNAL(addonAdded( addon_entry_t * )),
+             model, SLOT(addonAdded( addon_entry_t * )) );
+    connect( AM, SIGNAL(addonChanged( const addon_entry_t * )),
+             model, SLOT(addonChanged( const addon_entry_t * )) );

    QList<QString> frames;
    frames << ":/util/wait1.svg";
@@ -484,8 +481,8 @@ AddonsTab::AddonsTab( qt_intf_t *p_intf_ ) : QVLCFrame( p_intf_ )
    frames << ":/util/wait3.svg";
    frames << ":/util/wait4.svg";
    spinnerAnimation = new PixmapAnimator( this, frames, SPINNER_SIZE, SPINNER_SIZE );
-    CONNECT( spinnerAnimation, pixmapReady( const QPixmap & ),
-             addonsView->viewport(), update() );
+    connect( spinnerAnimation, &PixmapAnimator::pixmapReady,
+             addonsView->viewport(), QOverload<>::of(&QWidget::update) );
    addonsView->viewport()->installEventFilter( this );
 }

@@ -615,8 +612,8 @@ void AddonsTab::reposync()
    {
        tab->setCurrentIndex( WITHONLINEADDONS );
        AddonsManager *AM = AddonsManager::getInstance( p_intf );
-        CONNECT( AM, discoveryEnded(), spinnerAnimation, stop() );
-        CONNECT( AM, discoveryEnded(), addonsView->viewport(), update() );
+        connect( AM, &AddonsManager::discoveryEnded, spinnerAnimation, &PixmapAnimator::stop );
+        connect( AM, &AddonsManager::discoveryEnded, addonsView->viewport(), QOverload<>::of(&QWidget::update) );
        spinnerAnimation->start();
        AM->findNewAddons();
    }
@@ -679,7 +676,7 @@ ExtensionListModel::ExtensionListModel( QObject *parent, ExtensionsManager* EM_
        : QAbstractListModel( parent ), EM( EM_ )
 {
    // Connect to ExtensionsManager::extensionsUpdated()
-    CONNECT( EM, extensionsUpdated(), this, updateList() );
+    connect( EM, &ExtensionsManager::extensionsUpdated, this, &ExtensionListModel::updateList );

    // Load extensions now if not already loaded
    EM->loadExtensions();
@@ -1283,7 +1280,7 @@ QWidget *AddonItemDelegate::createEditor( QWidget *parent,

    infoButton = new QPushButton( QIcon( ":/menu/info.svg" ),
                                  qtr( "More information..." ) );
-    connect( infoButton, SIGNAL(clicked()), this, SIGNAL(showInfo()) );
+    connect( infoButton, &QPushButton::clicked, this, &AddonItemDelegate::showInfo );
    editorWidget->layout()->addWidget( infoButton );

    if ( ADDON_MANAGEABLE &
@@ -1295,7 +1292,7 @@ QWidget *AddonItemDelegate::createEditor( QWidget *parent,
        else
            installButton = new QPushButton( QIcon( ":/buttons/playlist/playlist_add.svg" ),
                                             qtr("&Install"), parent );
-        CONNECT( installButton, clicked(), this, editButtonClicked() );
+        connect( installButton, &QPushButton::clicked, this, &AddonItemDelegate::editButtonClicked );
        editorWidget->layout()->addWidget( installButton );
    }

@@ -1430,7 +1427,7 @@ ExtensionInfoDialog::ExtensionInfoDialog( const QModelIndex &index,
    QDialogButtonBox *group = new QDialogButtonBox( this );
    QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
    group->addButton( closeButton, QDialogButtonBox::RejectRole );
-    BUTTONACT( closeButton, close() );
+    BUTTONACT( closeButton, &ExtensionInfoDialog::close );

    layout->addWidget( group, 7, 0, 1, -1 );

@@ -1543,7 +1540,7 @@ AddonInfoDialog::AddonInfoDialog( const QModelIndex &index,
    QDialogButtonBox *group = new QDialogButtonBox( this );
    QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
    group->addButton( closeButton, QDialogButtonBox::RejectRole );
-    BUTTONACT( closeButton, close() );
+    BUTTONACT( closeButton, &AddonInfoDialog::close );

    layout->addWidget( group, 7, 0, 1, -1 );


--- a/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
+++ b/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
@@ -37,9 +37,9 @@ PodcastConfigDialog::PodcastConfigDialog( qt_intf_t *_p_intf)
    ui.okCancel->addButton( okButton, QDialogButtonBox::AcceptRole );
    ui.okCancel->addButton( cancelButton, QDialogButtonBox::RejectRole );

-    CONNECT( ui.podcastAdd, clicked(), this, add() );
-    CONNECT( ui.podcastDelete, clicked(), this, remove() );
-    CONNECT( okButton, clicked(), this, close() );
+    connect( ui.podcastAdd, &QPushButton::clicked, this, &PodcastConfigDialog::add );
+    connect( ui.podcastDelete, &QPushButton::clicked, this, &PodcastConfigDialog::remove );
+    connect( okButton, &QPushButton::clicked, this, &PodcastConfigDialog::close );

    char *psz_urls = config_GetPsz( "podcast-urls" );
    if( psz_urls )

--- a/modules/gui/qt/dialogs/preferences/complete_preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/complete_preferences.cpp
@@ -60,7 +60,7 @@ PrefsTree::PrefsTree( qt_intf_t *_p_intf, QWidget *_parent,
    setTextElideMode( Qt::ElideNone );

    setUniformRowHeights( true );
-    CONNECT( this, itemExpanded(QTreeWidgetItem*), this, resizeColumns() );
+    connect( this, &PrefsTree::itemExpanded, this, &PrefsTree::resizeColumns );

    main_module = module_get_main();
    assert( main_module );

--- a/modules/gui/qt/dialogs/preferences/preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/preferences.cpp
@@ -144,12 +144,12 @@ PrefsDialog::PrefsDialog( QWindow *parent, qt_intf_t *_p_intf )
    else
        setSimple();

-    BUTTONACT( save, save() );
-    BUTTONACT( cancel, cancel() );
-    BUTTONACT( reset, reset() );
+    BUTTONACT( save, &PrefsDialog::save );
+    BUTTONACT( cancel, &PrefsDialog::cancel );
+    BUTTONACT( reset, &PrefsDialog::reset );

-    BUTTONACT( simple, setSimple() );
-    BUTTONACT( all, setAdvanced() );
+    BUTTONACT( simple, &PrefsDialog::setSimple );
+    BUTTONACT( all, &PrefsDialog::setAdvanced );

    QVLCTools::restoreWidgetPosition( p_intf, "Preferences", this, QSize( 850, 700 ) );
 }
@@ -182,14 +182,10 @@ void PrefsDialog::setAdvanced()
        advanced_tree_panel->layout()->addWidget( advanced_tree );
        advanced_tree_panel->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );

-        CONNECT( advanced_tree,
-                 currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ),
-                 this, changeAdvPanel( QTreeWidgetItem * ) );
-        CONNECT( tree_filter, textChanged( const QString &  ),
-                 this, advancedTreeFilterChanged( const QString & ) );
-        CONNECT( current_filter, stateChanged(int),
-                 this, onlyLoadedToggled() );
-        CONNECT( search, activated(), tree_filter, setFocus() );
+        connect( advanced_tree, &PrefsTree::currentItemChanged, this, &PrefsDialog::changeAdvPanel );
+        connect( tree_filter, &SearchLineEdit::textChanged, this, &PrefsDialog::advancedTreeFilterChanged );
+        connect( current_filter, &QCheckBox::stateChanged, this, &PrefsDialog::onlyLoadedToggled );
+        connect( search, &QShortcut::activated, tree_filter, QOverload<>::of(&SearchLineEdit::setFocus) );

        /* Set initial selection */
        advanced_tree->setCurrentIndex(
@@ -206,10 +202,9 @@ void PrefsDialog::setSimple()
    /* If no simple_tree, create one, connect it */
    if( !simple_tree )
    {
-         simple_tree = new SPrefsCatList( p_intf, simple_tree_panel );
-         CONNECT( simple_tree,
-                  currentItemChanged( int ),
-                  this, changeSimplePanel( int ) );
+        simple_tree = new SPrefsCatList( p_intf, simple_tree_panel );
+        connect( simple_tree, &SPrefsCatList::currentItemChanged,
+                 this, &PrefsDialog::changeSimplePanel );
        simple_tree_panel->layout()->addWidget( simple_tree );
        simple_tree_panel->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
    }
No results found