[vlc-commits] [Git][videolan/vlc][master] 7 commits: qt: widgets: use override
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Aug 30 12:16:16 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
e7ec26be by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: widgets: use override
- - - - -
44471847 by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: sout: use override
- - - - -
1777ee40 by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: preferences: use override
- - - - -
79270686 by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: plugins: use override
- - - - -
5d9b0465 by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: egp: use override
- - - - -
258921fd by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: purge remaining use of Q_DECL_OVERRIDE
- - - - -
35acecef by Johannes Kauffmann at 2022-08-30T11:52:40+00:00
qt: HACKING: update virtual vs override
Now that Q_DECL_OVERRIDE is gone, update HACKING for the usage of
override.
- - - - -
22 changed files:
- modules/gui/qt/HACKING
- modules/gui/qt/dialogs/epg/EPGChannels.hpp
- modules/gui/qt/dialogs/epg/EPGItem.hpp
- modules/gui/qt/dialogs/epg/EPGRuler.hpp
- modules/gui/qt/dialogs/epg/epg.hpp
- modules/gui/qt/dialogs/extended/extended_panels.hpp
- modules/gui/qt/dialogs/extensions/extensions.hpp
- modules/gui/qt/dialogs/gototime/gototime.hpp
- modules/gui/qt/dialogs/mediainfo/info_panels.hpp
- modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
- modules/gui/qt/dialogs/open/openurl.hpp
- modules/gui/qt/dialogs/plugins/plugins.hpp
- modules/gui/qt/dialogs/preferences/expert_view.hpp
- modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
- modules/gui/qt/dialogs/sout/convert.hpp
- modules/gui/qt/dialogs/sout/profile_selector.hpp
- modules/gui/qt/dialogs/sout/sout_widgets.hpp
- modules/gui/qt/dialogs/vlm/vlm.hpp
- modules/gui/qt/util/validators.hpp
- modules/gui/qt/widgets/native/animators.hpp
- modules/gui/qt/widgets/native/customwidgets.hpp
- modules/gui/qt/widgets/native/qvlcframe.hpp
Changes:
=====================================
modules/gui/qt/HACKING
=====================================
@@ -43,13 +43,13 @@ So if your dialog is a dialog you are used to keep during a playing of a video,
QVLCFrame: extended panel, messages...
QVLCDialog: preferences, open...
-** virtual vs Q_DECL_OVERRIDE **
+** virtual vs override **
Only mark functions with the virtual keyword if this is the initial virtual
declaration. Functions that override a virtual function should have the
-Q_DECL_OVERRIDE macro appended (which expands to the override identifier
-when compiled with Qt5 and C++11). This is a visual indicator to distinguish
-virtual declarations from overriding implementations and will include a
-compile-time check in C++11 language mode.
+override identifier appended. Not only is this a visual indicator to distinguish
+virtual declarations from overriding implementations, it will also include a
+compile-time check to ensure that the function actually overrides another
+virtual function, with matching name and signature.
** HIG for Qt **
We tend to use GNOME/KDE specs over Vista ones for capitalizations:
=====================================
modules/gui/qt/dialogs/epg/EPGChannels.hpp
=====================================
@@ -42,7 +42,7 @@ public slots:
void reset();
protected:
- void paintEvent( QPaintEvent *event ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent *event ) override;
private:
EPGView *m_epgView;
=====================================
modules/gui/qt/dialogs/epg/EPGItem.hpp
=====================================
@@ -39,8 +39,8 @@ class EPGItem : public QGraphicsItem
public:
EPGItem( const vlc_epg_event_t *data, EPGView *view, EPGProgram * );
- QRectF boundingRect() const Q_DECL_OVERRIDE;
- void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 ) Q_DECL_OVERRIDE;
+ QRectF boundingRect() const override;
+ void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 ) override;
const QDateTime& start() const;
QDateTime end() const;
@@ -59,10 +59,10 @@ public:
const QList<QPair<QString, QString>> &descriptionItems() const;
protected:
- void focusInEvent( QFocusEvent * event ) Q_DECL_OVERRIDE;
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * ) Q_DECL_OVERRIDE;
- void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) Q_DECL_OVERRIDE;
- void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) Q_DECL_OVERRIDE;
+ void focusInEvent( QFocusEvent * event ) override;
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * ) override;
+ void hoverEnterEvent ( QGraphicsSceneHoverEvent * ) override;
+ void hoverLeaveEvent ( QGraphicsSceneHoverEvent * ) override;
private:
EPGProgram *program;
=====================================
modules/gui/qt/dialogs/epg/EPGRuler.hpp
=====================================
@@ -42,7 +42,7 @@ public slots:
void setOffset( int offset );
protected:
- void paintEvent( QPaintEvent *event ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent *event ) override;
private:
qreal m_scale;
=====================================
modules/gui/qt/dialogs/epg/epg.hpp
=====================================
@@ -37,7 +37,7 @@ class EpgDialog : public QVLCFrame, public Singleton<EpgDialog>
{
Q_OBJECT
protected:
- virtual void showEvent(QShowEvent * event) Q_DECL_OVERRIDE;
+ virtual void showEvent(QShowEvent * event) override;
private:
EpgDialog( qt_intf_t * );
=====================================
modules/gui/qt/dialogs/extended/extended_panels.hpp
=====================================
@@ -76,7 +76,7 @@ class ExtV4l2 : public QWidget
public:
ExtV4l2( qt_intf_t *, QWidget * );
- void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
+ void showEvent( QShowEvent *event ) override;
private:
qt_intf_t *p_intf;
@@ -164,13 +164,13 @@ public:
const slider_data_t *p_data, int index );
protected:
- float initialValue() Q_DECL_OVERRIDE;
+ float initialValue() override;
int index;
QStringList getBandsFromAout() const;
void writeToConfig() override;
public slots:
- void onValueChanged( int i ) Q_DECL_OVERRIDE;
+ void onValueChanged( int i ) override;
};
class Equalizer: public AudioFilterControlWidget
@@ -181,7 +181,7 @@ public:
Equalizer( qt_intf_t *, QWidget * );
protected:
- void build() Q_DECL_OVERRIDE;
+ void build() override;
private:
FilterSliderData *preamp;
=====================================
modules/gui/qt/dialogs/extensions/extensions.hpp
=====================================
@@ -89,8 +89,8 @@ private:
void DestroyWidget( extension_widget_t *p_widget, bool b_cond = true );
protected:
- void closeEvent( QCloseEvent* ) Q_DECL_OVERRIDE;
- void keyPressEvent( QKeyEvent* ) Q_DECL_OVERRIDE;
+ void closeEvent( QCloseEvent* ) override;
+ void keyPressEvent( QKeyEvent* ) override;
private slots:
int TriggerClick( QObject *object );
=====================================
modules/gui/qt/dialogs/gototime/gototime.hpp
=====================================
@@ -36,8 +36,8 @@ private:
virtual ~GotoTimeDialog();
QTimeEdit *timeEdit;
private slots:
- void close() Q_DECL_OVERRIDE;
- void cancel() Q_DECL_OVERRIDE;
+ void close() override;
+ void cancel() override;
void reset();
friend class Singleton<GotoTimeDialog>;
=====================================
modules/gui/qt/dialogs/mediainfo/info_panels.hpp
=====================================
@@ -112,7 +112,7 @@ class InputStatsPanel: public QWidget
public:
InputStatsPanel( QWidget * );
protected:
- void hideEvent( QHideEvent * ) Q_DECL_OVERRIDE;
+ void hideEvent( QHideEvent * ) override;
private:
QTreeWidget *StatsTree;
QTreeWidgetItem *input;
=====================================
modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
=====================================
@@ -70,7 +70,7 @@ private slots:
void updateAllTabs( input_item_t * );
void clearAllTabs();
- void close() Q_DECL_OVERRIDE;
+ void close() override;
void saveMeta();
void updateButtons( int i_tab );
=====================================
modules/gui/qt/dialogs/open/openurl.hpp
=====================================
@@ -52,10 +52,10 @@ public:
QString url() const;
bool shouldEnqueue() const;
- virtual void showEvent( QShowEvent *ev ) Q_DECL_OVERRIDE;
+ virtual void showEvent( QShowEvent *ev ) override;
public slots:
- void close() Q_DECL_OVERRIDE { play(); }
+ void close() override { play(); }
};
=====================================
modules/gui/qt/dialogs/plugins/plugins.hpp
=====================================
@@ -87,7 +87,7 @@ public:
};
protected:
- void keyPressEvent( QKeyEvent *keyEvent ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent *keyEvent ) override;
private:
PluginTab( qt_intf_t *p_intf );
@@ -108,7 +108,7 @@ class ExtensionTab : public QVLCFrame
Q_OBJECT
protected:
- void keyPressEvent( QKeyEvent *keyEvent ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent *keyEvent ) override;
private:
ExtensionTab( qt_intf_t *p_intf );
@@ -131,7 +131,7 @@ class AddonsTab : public QVLCFrame
friend class PluginDialog;
protected:
- void keyPressEvent( QKeyEvent *keyEvent ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent *keyEvent ) override;
private slots:
void moreInformation();
@@ -199,10 +199,10 @@ public:
FilenameRole
};
- QVariant data( const QModelIndex& index, int role ) const Q_DECL_OVERRIDE;
+ QVariant data( const QModelIndex& index, int role ) const override;
QModelIndex index( int row, int column = 0,
- const QModelIndex& = QModelIndex() ) const Q_DECL_OVERRIDE;
- int rowCount( const QModelIndex& = QModelIndex() ) const Q_DECL_OVERRIDE;
+ const QModelIndex& = QModelIndex() ) const override;
+ int rowCount( const QModelIndex& = QModelIndex() ) const override;
protected slots:
void updateList();
@@ -219,12 +219,12 @@ class AddonsListModel: public ExtensionListModel
public:
AddonsListModel( AddonsManager *AM, QObject *parent = 0 );
virtual ~AddonsListModel();
- QVariant data( const QModelIndex& index, int role ) const Q_DECL_OVERRIDE;
+ QVariant data( const QModelIndex& index, int role ) const override;
QModelIndex index( int row, int column = 0,
- const QModelIndex& = QModelIndex() ) const Q_DECL_OVERRIDE;
- int rowCount( const QModelIndex& = QModelIndex() ) const Q_DECL_OVERRIDE;
- Qt::ItemFlags flags( const QModelIndex &index ) const Q_DECL_OVERRIDE;
- bool setData( const QModelIndex &index, const QVariant &value, int role ) Q_DECL_OVERRIDE;
+ const QModelIndex& = QModelIndex() ) const override;
+ int rowCount( const QModelIndex& = QModelIndex() ) const override;
+ Qt::ItemFlags flags( const QModelIndex &index ) const override;
+ bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
enum
{
@@ -273,7 +273,7 @@ public slots:
virtual void setStatusFilter( int );
protected:
- bool filterAcceptsRow( int, const QModelIndex & ) const Q_DECL_OVERRIDE;
+ bool filterAcceptsRow( int, const QModelIndex & ) const override;
private:
int i_type_filter;
@@ -290,11 +290,11 @@ public:
void paint( QPainter *painter,
const QStyleOptionViewItem &option,
- const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ const QModelIndex &index ) const override;
QSize sizeHint( const QStyleOptionViewItem &option,
- const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ const QModelIndex &index ) const override;
void initStyleOption( QStyleOptionViewItem *option,
- const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ const QModelIndex &index ) const override;
protected:
QMargins margins;
@@ -311,13 +311,13 @@ public:
void paint( QPainter *painter,
const QStyleOptionViewItem &option,
- const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ const QModelIndex &index ) const override;
QSize sizeHint( const QStyleOptionViewItem &option,
- const QModelIndex &index ) const Q_DECL_OVERRIDE;
- QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
- void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
- void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE;
- void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
+ const QModelIndex &index ) const override;
+ QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
+ void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setAnimator( DelegateAnimationHelper *animator );
=====================================
modules/gui/qt/dialogs/preferences/expert_view.hpp
=====================================
@@ -56,7 +56,7 @@ public:
protected:
#ifndef QT_NO_CONTEXTMENU
- void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent *event) override;
#endif // QT_NO_CONTEXTMENU
private:
=====================================
modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
=====================================
@@ -124,12 +124,12 @@ class IntegerConfigControl : public VIntConfigControl
public:
IntegerConfigControl( module_config_t *, QWidget * );
IntegerConfigControl( module_config_t *, QLabel*, QSpinBox* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- int getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ int getValue() const override;
protected:
QSpinBox *spin;
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
QLabel *label;
void finish();
@@ -151,10 +151,10 @@ class IntegerRangeSliderConfigControl : public VIntConfigControl
Q_OBJECT
public:
IntegerRangeSliderConfigControl( module_config_t *, QLabel *, QSlider * );
- int getValue() const Q_DECL_OVERRIDE;
+ int getValue() const override;
protected:
QSlider *slider;
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
QLabel *label;
void finish();
@@ -166,11 +166,11 @@ Q_OBJECT
public:
IntegerListConfigControl( module_config_t *, QWidget * );
IntegerListConfigControl( module_config_t *, QLabel *, QComboBox* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- int getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ int getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
void finish(module_config_t * );
QLabel *label;
@@ -183,11 +183,11 @@ class BoolConfigControl : public VIntConfigControl
public:
BoolConfigControl( module_config_t *, QWidget * );
BoolConfigControl( module_config_t *, QLabel *, QAbstractButton* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- int getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ int getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
QAbstractButton *checkbox;
void finish();
@@ -200,11 +200,11 @@ public:
ColorConfigControl( module_config_t *, QWidget * );
ColorConfigControl( module_config_t *, QLabel *, QAbstractButton* );
virtual ~ColorConfigControl() { delete color_px; }
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- int getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ int getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
QLabel *label;
QAbstractButton *color_but;
@@ -235,12 +235,12 @@ class FloatConfigControl : public VFloatConfigControl
public:
FloatConfigControl( module_config_t *, QWidget * );
FloatConfigControl( module_config_t *, QLabel*, QDoubleSpinBox* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- float getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ float getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
QDoubleSpinBox *spin;
private:
@@ -278,11 +278,11 @@ class StringConfigControl : public VStringConfigControl
public:
StringConfigControl( module_config_t *, QWidget * );
StringConfigControl( module_config_t *, QLabel *, QLineEdit* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- QString getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ QString getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
QLineEdit *text;
private:
void finish();
@@ -305,13 +305,13 @@ class FileConfigControl : public VStringConfigControl
public:
FileConfigControl( module_config_t *, QWidget * );
FileConfigControl( module_config_t *, QLabel *, QLineEdit *, QPushButton * );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- QString getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ QString getValue() const override;
public slots:
virtual void updateField();
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
void finish();
QLineEdit *text;
QLabel *label;
@@ -325,7 +325,7 @@ public:
DirectoryConfigControl( module_config_t *, QWidget * );
DirectoryConfigControl( module_config_t *, QLabel *, QLineEdit *, QPushButton * );
public slots:
- void updateField() Q_DECL_OVERRIDE;
+ void updateField() override;
};
class FontConfigControl : public VStringConfigControl
@@ -334,11 +334,11 @@ class FontConfigControl : public VStringConfigControl
public:
FontConfigControl( module_config_t *, QWidget * );
FontConfigControl( module_config_t *, QLabel *, QFontComboBox *);
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- QString getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ QString getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
QLabel *label;
QFontComboBox *font;
};
@@ -349,11 +349,11 @@ class ModuleConfigControl : public VStringConfigControl
public:
ModuleConfigControl( module_config_t *, QWidget * );
ModuleConfigControl( module_config_t *, QLabel *, QComboBox* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- QString getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ QString getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
void finish( );
QLabel *label;
@@ -372,13 +372,13 @@ class ModuleListConfigControl : public VStringConfigControl
public:
ModuleListConfigControl( module_config_t *, QWidget *, bool );
virtual ~ModuleListConfigControl();
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- QString getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ QString getValue() const override;
public slots:
void onUpdate();
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
private:
void finish( bool );
void checkbox_lists(module_t*);
@@ -394,11 +394,11 @@ class StringListConfigControl : public VStringConfigControl
public:
StringListConfigControl( module_config_t *, QWidget * );
StringListConfigControl( module_config_t *, QLabel *, QComboBox* );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void insertInto( QBoxLayout*, int index = 0 ) Q_DECL_OVERRIDE;
- QString getValue() const Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void insertInto( QBoxLayout*, int index = 0 ) override;
+ QString getValue() const override;
protected:
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
QComboBox *combo;
private:
void finish(module_config_t * );
@@ -420,8 +420,8 @@ class KeySelectorControl : public ConfigControl
public:
KeySelectorControl( QWidget * );
- void insertInto( QGridLayout*, int row = 0 ) Q_DECL_OVERRIDE;
- void doApply() Q_DECL_OVERRIDE;
+ void insertInto( QGridLayout*, int row = 0 ) override;
+ void doApply() override;
void storeValue() override {};
enum ColumnIndex
{
@@ -433,11 +433,11 @@ public:
static KeyTableItem *find_conflict( QTreeWidget *, QString, KeyTableItem *, enum ColumnIndex );
protected:
- bool eventFilter( QObject *, QEvent * ) Q_DECL_OVERRIDE;
+ bool eventFilter( QObject *, QEvent * ) override;
#ifndef QT_NO_CONTEXTMENU
void tableContextMenuEvent( QContextMenuEvent * );
#endif
- void changeVisibility( bool ) Q_DECL_OVERRIDE;
+ void changeVisibility( bool ) override;
void unset( KeyTableItem *, enum ColumnIndex );
void unset( QTreeWidgetItem *, int );
void reset( KeyTableItem *, enum ColumnIndex );
=====================================
modules/gui/qt/dialogs/sout/convert.hpp
=====================================
@@ -56,8 +56,8 @@ private:
QStringList mrls;
private slots:
- void close() Q_DECL_OVERRIDE;
- void cancel() Q_DECL_OVERRIDE;
+ void close() override;
+ void cancel() override;
void fileBrowse();
void setDestinationFileExtension();
void validate();
=====================================
modules/gui/qt/dialogs/sout/profile_selector.hpp
=====================================
@@ -85,7 +85,7 @@ private:
void loadCapabilities();
void reset();
protected slots:
- void close() Q_DECL_OVERRIDE;
+ void close() override;
private slots:
void muxSelected();
void codecSelected();
=====================================
modules/gui/qt/dialogs/sout/sout_widgets.hpp
=====================================
@@ -65,7 +65,7 @@ class FileDestBox: public VirtualDestBox
Q_OBJECT
public:
FileDestBox( QWidget *_parent = NULL, qt_intf_t * = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *fileEdit;
qt_intf_t *p_intf;
@@ -78,7 +78,7 @@ class HTTPDestBox: public VirtualDestBox
Q_OBJECT
public:
HTTPDestBox( QWidget *_parent = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *HTTPEdit;
QSpinBox *HTTPPort;
@@ -89,7 +89,7 @@ class MMSHDestBox: public VirtualDestBox
Q_OBJECT
public:
MMSHDestBox( QWidget *_parent = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *MMSHEdit;
QSpinBox *MMSHPort;
@@ -100,7 +100,7 @@ class RTSPDestBox: public VirtualDestBox
Q_OBJECT
public:
RTSPDestBox( QWidget *_parent = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *RTSPEdit;
QSpinBox *RTSPPort;
@@ -111,7 +111,7 @@ class UDPDestBox: public VirtualDestBox
Q_OBJECT
public:
UDPDestBox( QWidget *_parent = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *UDPEdit;
QSpinBox *UDPPort;
@@ -122,7 +122,7 @@ class SRTDestBox: public VirtualDestBox
Q_OBJECT
public:
SRTDestBox( QWidget *_parent = NULL, const char *mux = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *SRTEdit;
QSpinBox *SRTPort;
@@ -135,7 +135,7 @@ class RISTDestBox: public VirtualDestBox
Q_OBJECT
public:
RISTDestBox( QWidget *_parent = NULL, const char *mux = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *RISTAddress;
QSpinBox *RISTPort;
@@ -148,7 +148,7 @@ class RTPDestBox: public VirtualDestBox
Q_OBJECT
public:
RTPDestBox( QWidget *_parent = NULL, const char *mux = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *RTPEdit;
QSpinBox *RTPPort;
@@ -161,7 +161,7 @@ class ICEDestBox: public VirtualDestBox
Q_OBJECT
public:
ICEDestBox( QWidget *_parent = NULL );
- QString getMRL( const QString& ) Q_DECL_OVERRIDE;
+ QString getMRL( const QString& ) override;
private:
QLineEdit *ICEEdit;
QLineEdit *ICEMountEdit;
=====================================
modules/gui/qt/dialogs/vlm/vlm.hpp
=====================================
@@ -176,7 +176,7 @@ public:
VLMBroadcast( VLMWrapper *, const QString& name, const QString& input,
const QString& inputOptions, const QString& output,
bool _enable, bool _loop, VLMDialog *parent );
- void update() Q_DECL_OVERRIDE;
+ void update() override;
private:
bool b_looped;
bool b_playing;
=====================================
modules/gui/qt/util/validators.hpp
=====================================
@@ -30,8 +30,8 @@ class UrlValidator : public QValidator
Q_OBJECT
public:
UrlValidator( QObject *parent ) : QValidator( parent ) { }
- QValidator::State validate( QString&, int& ) const Q_DECL_OVERRIDE;
- void fixup ( QString & input ) const Q_DECL_OVERRIDE;
+ QValidator::State validate( QString&, int& ) const override;
+ void fixup ( QString & input ) const override;
};
#endif // VALIDATORS_HPP
=====================================
modules/gui/qt/widgets/native/animators.hpp
=====================================
@@ -40,13 +40,13 @@ class BasicAnimator : public QAbstractAnimation
public:
BasicAnimator( QObject *parent = 0 );
void setFps( int _fps ) { fps = _fps; interval = 1000.0 / fps; }
- int duration() const Q_DECL_OVERRIDE { return 1000; }
+ int duration() const override { return 1000; }
signals:
void frameChanged();
protected:
- void updateCurrentTime ( int msecs ) Q_DECL_OVERRIDE;
+ void updateCurrentTime ( int msecs ) override;
int fps;
int interval;
int current_frame;
@@ -64,11 +64,11 @@ class PixmapAnimator : public BasicAnimator
public:
PixmapAnimator(QWidget *parent, QList<QString> _frames , int width, int height);
- int duration() const Q_DECL_OVERRIDE { return interval * pixmaps.count(); }
+ int duration() const override { return interval * pixmaps.count(); }
virtual ~PixmapAnimator();
const QPixmap& getPixmap() { return currentPixmap; }
protected:
- void updateCurrentTime ( int msecs ) Q_DECL_OVERRIDE;
+ void updateCurrentTime ( int msecs ) override;
QList<QPixmap> pixmaps;
QPixmap currentPixmap;
signals:
=====================================
modules/gui/qt/widgets/native/customwidgets.hpp
=====================================
@@ -40,9 +40,9 @@ class QFramelessButton : public QPushButton
Q_OBJECT
public:
QFramelessButton( QWidget *parent = NULL );
- QSize sizeHint() const Q_DECL_OVERRIDE { return iconSize(); }
+ QSize sizeHint() const override { return iconSize(); }
protected:
- void paintEvent( QPaintEvent * event ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent * event ) override;
};
class VLCQDial : public QDial
@@ -51,7 +51,7 @@ class VLCQDial : public QDial
public:
VLCQDial( QWidget *parent = NULL );
protected:
- void paintEvent( QPaintEvent * event ) Q_DECL_OVERRIDE;
+ void paintEvent( QPaintEvent * event ) override;
};
class QToolButtonExt : public QToolButton
@@ -76,9 +76,9 @@ class QVLCDebugLevelSpinBox : public QSpinBox
public:
QVLCDebugLevelSpinBox( QWidget *parent ) : QSpinBox( parent ) { };
protected:
- QString textFromValue( int ) const Q_DECL_OVERRIDE;
+ QString textFromValue( int ) const override;
/* QVLCDebugLevelSpinBox is read-only */
- int valueFromText( const QString& ) const Q_DECL_OVERRIDE { return -1; }
+ int valueFromText( const QString& ) const override { return -1; }
};
/** This spinning icon, to the colors of the VLC cone, will show
=====================================
modules/gui/qt/widgets/native/qvlcframe.hpp
=====================================
@@ -104,7 +104,7 @@ protected:
{
hide();
}
- void keyPressEvent( QKeyEvent *keyEvent ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent *keyEvent ) override;
};
class QVLCDialog : public QDialog
@@ -131,7 +131,7 @@ protected:
{
hide();
}
- void keyPressEvent( QKeyEvent *keyEvent ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent *keyEvent ) override;
};
class QVLCMW : public QMainWindow
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c6975859435aeefe24a0bd86f599ae857dbba0dc...35acecef6d0fac2879c1507c2362f2067d14aeb6
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c6975859435aeefe24a0bd86f599ae857dbba0dc...35acecef6d0fac2879c1507c2362f2067d14aeb6
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