[vlc-commits] [Git][videolan/vlc][master] 9 commits: qt: remove unused captured variable
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Jan 7 13:13:38 UTC 2025
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
cb196c90 by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: remove unused captured variable
- - - - -
c713043e by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: remove unused local qHash
Other variants of the same function are used in the file.
- - - - -
bf8e30a1 by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: remove unused variable
Apparently since it was introduced in 2408b38aec4742edc3130e1ceb59305f7a0793c9
- - - - -
a7011f03 by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: fix QCheckBox::stateChanged deprecated warning
See https://doc.qt.io/qt-6/qcheckbox.html#stateChanged
- - - - -
48427c74 by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: fix QVariant::Invalid deprecated warning
See https://doc.qt.io/qt-6/qvariant-obsolete.html#Type-enum
- - - - -
a83a6f7f by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: fix declaration mismatch
It's defined as a struct.
- - - - -
b3659107 by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: set the QMenu shortcuts separately
The prefered addAction signature has changed [^1] in 6.3 [^2].
We can just set it separately once the action is created.
It also makes it easier to find shortcuts we set.
[^1] https://doc.qt.io/qt-6/qmenu-obsolete.html#addAction-4
[^2] https://doc.qt.io/qt-6.5/qwidget.html#addAction-9
- - - - -
7169ff4c by Steve Lhomme at 2025-01-07T13:01:13+00:00
skins2: remove unused variables
- - - - -
9203fc06 by Steve Lhomme at 2025-01-07T13:01:13+00:00
qt: remove unused include
- - - - -
19 changed files:
- modules/gui/qt/dialogs/extended/extended_panels.cpp
- modules/gui/qt/dialogs/extensions/extensions.cpp
- modules/gui/qt/dialogs/help/help.cpp
- modules/gui/qt/dialogs/open/open.cpp
- modules/gui/qt/dialogs/open/open_panels.cpp
- modules/gui/qt/dialogs/plugins/plugins.cpp
- modules/gui/qt/dialogs/preferences/preferences.cpp
- modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
- modules/gui/qt/dialogs/preferences/simple_preferences.cpp
- modules/gui/qt/dialogs/sout/profile_selector.cpp
- modules/gui/qt/maininterface/mainctx.cpp
- modules/gui/qt/menus/custom_menus.cpp
- modules/gui/qt/menus/menus.cpp
- modules/gui/qt/menus/qml_menu_wrapper.cpp
- modules/gui/qt/network/networkdevicemodel.cpp
- modules/gui/qt/qt.hpp
- modules/gui/qt/style/systempalettethemeprovider.cpp
- modules/gui/skins2/controls/ctrl_slider.cpp
- modules/gui/skins2/controls/ctrl_slider.hpp
Changes:
=====================================
modules/gui/qt/dialogs/extended/extended_panels.cpp
=====================================
@@ -159,7 +159,7 @@ ExtVideo::ExtVideo( qt_intf_t *_p_intf, QTabWidget *_parent ) :
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_OPTION( brightnessThresholdCheck, &QtCheckboxChanged )
SETUP_VFILTER_gb( extract )
SETUP_VFILTER_OPTION( extractComponentText, &QLineEdit::textChanged )
@@ -178,8 +178,8 @@ ExtVideo::ExtVideo( qt_intf_t *_p_intf, QTabWidget *_parent ) :
SETUP_VFILTER_gb( gradient )
SETUP_VFILTER_OPTION( gradientModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged) )
- SETUP_VFILTER_OPTION( gradientColorCheck, &QCheckBox::stateChanged )
- SETUP_VFILTER_OPTION( gradientCartoonCheck, &QCheckBox::stateChanged )
+ SETUP_VFILTER_OPTION( gradientColorCheck, &QtCheckboxChanged )
+ SETUP_VFILTER_OPTION( gradientCartoonCheck, &QtCheckboxChanged )
SETUP_VFILTER_gb( motionblur )
SETUP_VFILTER_OPTION( blurFactorSlider, &QSlider::valueChanged )
=====================================
modules/gui/qt/dialogs/extensions/extensions.cpp
=====================================
@@ -248,7 +248,7 @@ QWidget* ExtensionDialog::CreateWidget( extension_widget_t *p_widget )
checkBox->setText( qfu( p_widget->psz_text ) );
checkBox->setChecked( p_widget->b_checked );
setWidgetMapping(checkBox, p_widget);
- connect( checkBox, &QCheckBox::stateChanged,
+ connect( checkBox, &QtCheckboxChanged,
this, &ExtensionDialog::TriggerClick );
p_widget->p_sys_intf = checkBox;
return checkBox;
=====================================
modules/gui/qt/dialogs/help/help.cpp
=====================================
@@ -181,10 +181,10 @@ void AboutDialog::showEvent( QShowEvent *event )
#ifdef UPDATE_CHECK
-struct UpdateModelPrivate
+class UpdateModelPrivate
{
- Q_DECLARE_PUBLIC(UpdateModel)
public:
+ Q_DECLARE_PUBLIC(UpdateModel)
UpdateModelPrivate(UpdateModel * pub)
: q_ptr(pub)
{
=====================================
modules/gui/qt/dialogs/open/open.cpp
=====================================
@@ -82,14 +82,14 @@ OpenDialog::OpenDialog(qt_intf_t *_p_intf, QWindow* parent )
/* Menu for the Play button */
QMenu * openButtonMenu = new QMenu( "Open", playButton );
- openButtonMenu->addAction( qtr( "&Enqueue" ), this, &OpenDialog::enqueue,
- QKeySequence( "Alt+E" ) );
- openButtonMenu->addAction( qtr( "&Play" ), this, &OpenDialog::play,
- QKeySequence( "Alt+P" ) );
- openButtonMenu->addAction( qtr( "&Stream" ), this, &OpenDialog::stream,
- QKeySequence( "Alt+S" ) );
- openButtonMenu->addAction( qtr( "C&onvert" ), this, &OpenDialog::transcode,
- QKeySequence( "Alt+O" ) );
+ openButtonMenu->addAction( qtr( "&Enqueue" ), this, &OpenDialog::enqueue
+ )->setShortcut( QKeySequence( "Alt+E" ) );
+ openButtonMenu->addAction( qtr( "&Play" ), this, &OpenDialog::play
+ )->setShortcut( QKeySequence( "Alt+P" ) );
+ openButtonMenu->addAction( qtr( "&Stream" ), this, &OpenDialog::stream
+ )->setShortcut( QKeySequence( "Alt+S" ) );
+ openButtonMenu->addAction( qtr( "C&onvert" ), this, &OpenDialog::transcode
+ )->setShortcut( QKeySequence( "Alt+O" ) );
playButton->setMenu( openButtonMenu );
=====================================
modules/gui/qt/dialogs/open/open_panels.cpp
=====================================
@@ -572,7 +572,7 @@ void DiscOpenPanel::updateMRL()
discPath = ui.deviceCombo->currentText();
int tmp = ui.deviceCombo->findText( discPath );
- if( tmp != -1 && ui.deviceCombo->itemData( tmp ) != QVariant::Invalid )
+ if( tmp != -1 && ui.deviceCombo->itemData( tmp ).isValid() )
discPath = ui.deviceCombo->itemData( tmp ).toString();
/* MRL scheme */
@@ -927,8 +927,8 @@ void CaptureOpenPanel::initialize()
/* Jack CONNECTs */
CuMRL( jackChannels, QOverload<int>::of(&QSpinBox::valueChanged) );
- CuMRL( jackPace, &QCheckBox::stateChanged );
- CuMRL( jackConnect, &QCheckBox::stateChanged );
+ CuMRL( jackPace, &QtCheckboxChanged );
+ CuMRL( jackConnect, &QtCheckboxChanged );
CuMRL( jackPortsSelected, &QLineEdit::textChanged );
configList << "jack-input-use-vlc-pace" << "jack-input-auto-connect";
}
=====================================
modules/gui/qt/dialogs/plugins/plugins.cpp
=====================================
@@ -401,7 +401,7 @@ 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, &QCheckBox::stateChanged, this, &AddonsTab::installChecked );
+ connect( installedOnlyBox, &QtCheckboxChanged, this, &AddonsTab::installChecked );
// Model
m_model = std::make_unique<AddonsModel>( );
=====================================
modules/gui/qt/dialogs/preferences/preferences.cpp
=====================================
@@ -258,7 +258,7 @@ void PrefsDialog::setAdvanced()
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( current_filter, &QtCheckboxChanged, this, &PrefsDialog::onlyLoadedToggled );
connect( search, &QShortcut::activated, tree_filter, QOverload<>::of(&SearchLineEdit::setFocus) );
/* Set initial selection */
=====================================
modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
=====================================
@@ -751,7 +751,7 @@ void ModuleListConfigControl::checkbox_lists( QString label, QString help, const
QCheckBox *cb = new QCheckBox( label );
checkBoxListItem *cbl = new checkBoxListItem;
- connect( cb, &QCheckBox::stateChanged, this, &ModuleListConfigControl::onUpdate );
+ connect( cb, &QtCheckboxChanged, this, &ModuleListConfigControl::onUpdate );
if( !help.isEmpty() )
cb->setToolTip( formatTooltip( help ) );
cbl->checkBox = cb;
=====================================
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
=====================================
@@ -570,7 +570,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
ui.lastfm_zone->setVisible( ui.lastfm->isChecked() );
connect( ui.lastfm, &QCheckBox::toggled, ui.lastfm_zone, &QWidget::setVisible );
- connect( ui.lastfm, &QCheckBox::stateChanged, this, &SPrefsPanel::lastfm_Changed );
+ connect( ui.lastfm, &QtCheckboxChanged, this, &SPrefsPanel::lastfm_Changed );
}
else
{
@@ -787,9 +787,9 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
configBool( "qt-minimal-view", ui.minimalviewBox );
/*Update layout radio buttons based on the checkState of the following checkboxes*/
- connect(ui.menuBarCheck, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
- connect(ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
- connect(ui.titleBarCheckBox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
+ connect(ui.menuBarCheck, &QtCheckboxChanged, this, &SPrefsPanel::updateLayoutSelection);
+ connect(ui.pinVideoControlsCheckbox, &QtCheckboxChanged, this, &SPrefsPanel::updateLayoutSelection);
+ connect(ui.titleBarCheckBox, &QtCheckboxChanged, this, &SPrefsPanel::updateLayoutSelection);
/*Clicking on image will check the corresponding layout radio button*/
layoutImages = new QButtonGroup( this );
@@ -830,7 +830,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
configBool( "qt-pin-controls", ui.pinVideoControlsCheckbox );
m_resetters.push_back(std::make_unique<PropertyResetter>(ui.pinVideoControlsCheckbox, "checked"));
- QObject::connect( ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, p_intf->p_mi, &MainCtx::setPinVideoControls );
+ QObject::connect( ui.pinVideoControlsCheckbox, &QtCheckboxChanged, p_intf->p_mi, &MainCtx::setPinVideoControls );
ui.colorSchemeComboBox->setModel( p_intf->p_mi->getColorScheme() );
ui.colorSchemeComboBox->setCurrentText( p_intf->p_mi->getColorScheme()->currentText() );
=====================================
modules/gui/qt/dialogs/sout/profile_selector.cpp
=====================================
@@ -448,11 +448,11 @@ VLCProfileEditor::VLCProfileEditor( const QString& qs_name, const QString& value
ui.buttonBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
BUTTONACT( cancelButton, &VLCProfileEditor::reject );
- connect( ui.valueholder_video_copy, &QCheckBox::stateChanged,
+ connect( ui.valueholder_video_copy, &QtCheckboxChanged,
this, &VLCProfileEditor::activatePanels );
- connect( ui.valueholder_audio_copy, &QCheckBox::stateChanged,
+ connect( ui.valueholder_audio_copy, &QtCheckboxChanged,
this, &VLCProfileEditor::activatePanels );
- connect( ui.valueholder_subtitles_overlay, &QCheckBox::stateChanged,
+ connect( ui.valueholder_subtitles_overlay, &QtCheckboxChanged,
this, &VLCProfileEditor::activatePanels );
connect( ui.valueholder_vcodec_bitrate, &QSpinBox::editingFinished,
this, &VLCProfileEditor::fixBirateState );
=====================================
modules/gui/qt/maininterface/mainctx.cpp
=====================================
@@ -65,7 +65,6 @@
#include <QInputDialog>
#include <QQmlProperty>
-#include <QQmlContext>
#include <QWindow>
#include <QScreen>
=====================================
modules/gui/qt/menus/custom_menus.cpp
=====================================
@@ -415,7 +415,7 @@ BookmarkMenu::BookmarkMenu(MediaLib * mediaLib, vlc_player_t * player, QWidget *
: QMenu(parent)
{
// FIXME: Do we really need a translation call for the string shortcut ?
- addAction(qtr("&Manage"), THEDP, &DialogsProvider::bookmarksDialog, qtr("Ctrl+B"));
+ addAction(qtr("&Manage"), THEDP, &DialogsProvider::bookmarksDialog )->setShortcut(qtr("Ctrl+B"));
addSeparator();
=====================================
modules/gui/qt/menus/menus.cpp
=====================================
@@ -87,20 +87,15 @@ QAction *addDPStaticEntry( QMenu *menu,
#ifndef __APPLE__ /* We don't set icons in menus in MacOS X */
if( !EMPTY_STR( icon ) )
{
- if( !EMPTY_STR( shortcut ) )
- action = menu->addAction( QIcon( icon ), text, THEDP,
- member, qfut( shortcut ) );
- else
- action = menu->addAction( QIcon( icon ), text, THEDP, member );
+ action = menu->addAction( QIcon( icon ), text, THEDP, member );
}
else
#endif
{
- if( !EMPTY_STR( shortcut ) )
- action = menu->addAction( text, THEDP, member, qfut( shortcut ) );
- else
- action = menu->addAction( text, THEDP, member );
+ action = menu->addAction( text, THEDP, member );
}
+ if( !EMPTY_STR( shortcut ) )
+ action->setShortcut( qfut( shortcut ) );
#ifdef __APPLE__
action->setMenuRole( role );
#else
@@ -343,7 +338,8 @@ void VLCMenuBar::ViewMenu(qt_intf_t *p_intf, QMenu *menu, std::optional<bool> pl
/* FullScreen View */
action = menu->addAction( qtr( "&Fullscreen Interface" ), mi,
- &MainCtx::toggleInterfaceFullScreen, QString( "F11" ) );
+ &MainCtx::toggleInterfaceFullScreen );
+ action->setShortcut( QString( "F11" ) );
action->setCheckable( true );
action->setChecked( mi->interfaceVisibility() == QWindow::FullScreen );
@@ -674,7 +670,8 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, qt_intf_t *p_intf,
action->setIcon( QIcon( ":/menu/ic_fluent_skip_back_10.svg") );
#endif
- action = menu->addAction( qfut( I_MENU_GOTOTIME ), THEDP, &DialogsProvider::gotoTimeDialog, qtr( "Ctrl+T" ) );
+ action = menu->addAction( qfut( I_MENU_GOTOTIME ), THEDP, &DialogsProvider::gotoTimeDialog );
+ action->setShortcut( qtr( "Ctrl+T" ) );
menu->addSeparator();
}
=====================================
modules/gui/qt/menus/qml_menu_wrapper.cpp
=====================================
@@ -505,7 +505,7 @@ bool QmlMenuPositioner::eventFilter(QObject * object, QEvent * event)
if (m_ctx->hasMediaLibrary())
{
// FIXME: Do we really need a translation call for the string shortcut ?
- m_menu->addAction(qtr("&Manage"), THEDP, &DialogsProvider::bookmarksDialog, qtr("Ctrl+B"));
+ m_menu->addAction(qtr("&Manage"), THEDP, &DialogsProvider::bookmarksDialog )->setShortcut( qtr("Ctrl+B"));
m_menu->addSeparator();
=====================================
modules/gui/qt/network/networkdevicemodel.cpp
=====================================
@@ -142,12 +142,6 @@ static inline bool operator == (const NetworkDeviceItemPtr& a, const NetworkDevi
&& QString::compare(a->protocol, b->protocol, Qt::CaseInsensitive) == 0;
}
-static inline std::size_t qHash(const NetworkDeviceItemPtr& s, size_t seed = 0) noexcept
-{
- VLC_UNUSED(seed);
- return s->id;
-}
-
bool itemMatchPattern(const NetworkDeviceItemPtr& a, const QString& pattern)
{
return a->name.contains(pattern, Qt::CaseInsensitive);
@@ -357,7 +351,7 @@ public:
std::size_t hash = qHash(media);
auto it = std::find_if(
m_items.begin(), m_items.end(),
- [hash, &media](const NetworkDeviceItemPtr& item) {
+ [hash](const NetworkDeviceItemPtr& item) {
return item->id == hash;
});
if (it == m_items.end())
=====================================
modules/gui/qt/qt.hpp
=====================================
@@ -127,6 +127,12 @@ public:
/* For marking translatable static strings (like `_()`) */
#define qtr( i ) qfut( i )
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+#define QtCheckboxChanged QCheckBox::checkStateChanged
+#else
+#define QtCheckboxChanged QCheckBox::stateChanged
+#endif
+
#define BUTTONACT( b, a ) connect( b, &QAbstractButton::clicked, this, a )
#define getSettings() p_intf->mainSettings
=====================================
modules/gui/qt/style/systempalettethemeprovider.cpp
=====================================
@@ -352,7 +352,6 @@ static int updatePalette(vlc_qt_theme_provider_t* obj)
setQtColorSetBg(obj, CS, VQTC_NAME_PRIMARY, QPalette::AlternateBase);
setQtColorSetFg(obj, CS, VQTC_NAME_PRIMARY, QPalette::Text);
- QColor textfieldBorder;
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, inputBorderNormal);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, inputBorderNormal);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, inputBorderFocused);
@@ -378,7 +377,6 @@ static int updatePalette(vlc_qt_theme_provider_t* obj)
setQtColorSetBg(obj, CS, VQTC_NAME_PRIMARY, QPalette::AlternateBase);
setQtColorSetFg(obj, CS, VQTC_NAME_PRIMARY, QPalette::Text);
- QColor textfieldBorder;
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, inputBorderNormal);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, inputBorderNormal);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, inputBorderFocused);
@@ -390,7 +388,6 @@ static int updatePalette(vlc_qt_theme_provider_t* obj)
setQtColorSetBg(obj, CS, VQTC_NAME_PRIMARY, QPalette::AlternateBase);
setQtColorSetFg(obj, CS, VQTC_NAME_PRIMARY, QPalette::Text);
- QColor textfieldBorder;
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, inputBorderNormal);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, inputBorderNormal);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, inputBorderFocused);
=====================================
modules/gui/skins2/controls/ctrl_slider.cpp
=====================================
@@ -52,7 +52,6 @@ CtrlSliderCursor::CtrlSliderCursor( intf_thread_t *pIntf,
CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ),
m_rVariable( rVariable ), m_tooltip( rTooltip ),
m_width( rCurve.getWidth() ), m_height( rCurve.getHeight() ),
- m_xPosition( 0 ), m_yPosition( 0 ),
m_cmdOverDown( this ), m_cmdDownOver( this ),
m_cmdOverUp( this ), m_cmdUpOver( this ),
m_cmdMove( this ), m_cmdScroll( this ),
=====================================
modules/gui/skins2/controls/ctrl_slider.hpp
=====================================
@@ -89,8 +89,6 @@ private:
const UString m_tooltip;
/// Initial size of the control
int m_width, m_height;
- /// Position of the cursor
- int m_xPosition, m_yPosition;
/// Callback objects
DEFINE_CALLBACK( CtrlSliderCursor, OverDown )
DEFINE_CALLBACK( CtrlSliderCursor, DownOver )
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b27546f6f36b87dd90d7b3aee2427bd1675a6be...9203fc06e9961a9d176b09fa785f6b0c177e3285
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7b27546f6f36b87dd90d7b3aee2427bd1675a6be...9203fc06e9961a9d176b09fa785f6b0c177e3285
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list