[vlc-commits] [Git][videolan/vlc][master] 6 commits: qt: help: add missing override
Hugo Beauzée-Luyssen (@chouquette)
gitlab at videolan.org
Thu Aug 11 07:42:00 UTC 2022
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
c56c2678 by Johannes Kauffmann at 2022-08-11T07:26:56+00:00
qt: help: add missing override
- - - - -
32968793 by Johannes Kauffmann at 2022-08-11T07:26:56+00:00
qt: help: use override
- - - - -
64f86598 by Johannes Kauffmann at 2022-08-11T07:26:56+00:00
qt: open_panels: add missing override
- - - - -
50c09bb3 by Johannes Kauffmann at 2022-08-11T07:26:56+00:00
qt: open_panels: use override
- - - - -
ffe48a40 by Johannes Kauffmann at 2022-08-11T07:26:56+00:00
qt: expert_model: add missing override
- - - - -
9cd16083 by Johannes Kauffmann at 2022-08-11T07:26:56+00:00
qt: roundimage: add missing override
- - - - -
4 changed files:
- modules/gui/qt/dialogs/help/help.hpp
- modules/gui/qt/dialogs/open/open_panels.hpp
- modules/gui/qt/dialogs/preferences/expert_model.hpp
- modules/gui/qt/widgets/native/roundimage.cpp
Changes:
=====================================
modules/gui/qt/dialogs/help/help.hpp
=====================================
@@ -46,7 +46,7 @@ private:
virtual ~HelpDialog();
public slots:
- void close() Q_DECL_OVERRIDE { toggleVisible(); }
+ void close() override { toggleVisible(); }
friend class Singleton<HelpDialog>;
};
@@ -62,8 +62,8 @@ public slots:
friend class Singleton<AboutDialog>;
protected:
- virtual bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE;
- virtual void showEvent ( QShowEvent * ) Q_DECL_OVERRIDE;
+ virtual bool eventFilter(QObject *obj, QEvent *event) override;
+ virtual void showEvent ( QShowEvent * ) override;
private:
bool b_advanced;
@@ -90,11 +90,11 @@ private:
Ui::updateWidget ui;
update_t *p_update;
- void customEvent( QEvent * );
+ void customEvent( QEvent * ) override;
bool b_checked;
private slots:
- void close() Q_DECL_OVERRIDE { toggleVisible(); }
+ void close() override { toggleVisible(); }
void UpdateOrDownload();
=====================================
modules/gui/qt/dialogs/open/open_panels.hpp
=====================================
@@ -112,10 +112,10 @@ class FileOpenPanel: public OpenPanel
public:
FileOpenPanel( QWidget *, qt_intf_t * );
virtual ~FileOpenPanel();
- void clear() Q_DECL_OVERRIDE;
+ void clear() override;
virtual void accept() ;
protected:
- bool eventFilter(QObject *, QEvent *event) Q_DECL_OVERRIDE
+ bool eventFilter(QObject *, QEvent *event) override
{
if( event->type() == QEvent::Hide ||
event->type() == QEvent::HideToParent )
@@ -125,10 +125,10 @@ protected:
}
return false;
}
- void dropEvent( QDropEvent *) Q_DECL_OVERRIDE;
- void dragEnterEvent( QDragEnterEvent * ) Q_DECL_OVERRIDE;
- void dragMoveEvent( QDragMoveEvent * ) Q_DECL_OVERRIDE;
- void dragLeaveEvent( QDragLeaveEvent * ) Q_DECL_OVERRIDE;
+ void dropEvent( QDropEvent *) override;
+ void dragEnterEvent( QDragEnterEvent * ) override;
+ void dragMoveEvent( QDragMoveEvent * ) override;
+ void dragLeaveEvent( QDragLeaveEvent * ) override;
private:
Ui::OpenFile ui;
QList<QUrl> urlList;
@@ -136,7 +136,7 @@ private:
FileOpenBox *dialogBox;
void BuildOldPanel();
public slots:
- void updateMRL() Q_DECL_OVERRIDE;
+ void updateMRL() override;
private slots:
void browseFileSub();
void browseFile();
@@ -150,14 +150,14 @@ class NetOpenPanel: public OpenPanel
public:
NetOpenPanel( QWidget *, qt_intf_t * );
virtual ~NetOpenPanel();
- void clear() Q_DECL_OVERRIDE;
- void onFocus() Q_DECL_OVERRIDE;
- void onAccept() Q_DECL_OVERRIDE;
+ void clear() override;
+ void onFocus() override;
+ void onAccept() override;
private:
Ui::OpenNetwork ui;
bool b_recentList;
public slots:
- void updateMRL() Q_DECL_OVERRIDE;
+ void updateMRL() override;
};
class DiscOpenPanel: public OpenPanel
@@ -174,18 +174,18 @@ class DiscOpenPanel: public OpenPanel
public:
DiscOpenPanel( QWidget *, qt_intf_t * );
virtual ~DiscOpenPanel();
- void clear() Q_DECL_OVERRIDE;
+ void clear() override;
virtual void accept();
#if defined( _WIN32 ) || defined( __OS2__ )
- virtual void onFocus();
+ virtual void onFocus() override;
#endif
- virtual void updateContext(int) Q_DECL_OVERRIDE;
+ virtual void updateContext(int) override;
private:
Ui::OpenDisk ui;
char *psz_dvddiscpath, *psz_vcddiscpath, *psz_cddadiscpath;
DiscType m_discType;
public slots:
- void updateMRL() Q_DECL_OVERRIDE;
+ void updateMRL() override;
private slots:
void browseDevice();
void updateButtons() ;
@@ -199,7 +199,7 @@ class CaptureOpenPanel: public OpenPanel
public:
CaptureOpenPanel( QWidget *, qt_intf_t * );
virtual ~CaptureOpenPanel();
- void clear() Q_DECL_OVERRIDE;
+ void clear() override;
private:
Ui::OpenCapture ui;
bool isInitialized;
@@ -226,7 +226,7 @@ private:
QDoubleSpinBox *screenFPS;
public slots:
- void updateMRL() Q_DECL_OVERRIDE;
+ void updateMRL() override;
void initialize();
private slots:
void updateButtons();
=====================================
modules/gui/qt/dialogs/preferences/expert_model.hpp
=====================================
@@ -101,7 +101,7 @@ public:
void toggleBoolean( const QModelIndex & );
void setItemToDefault( const QModelIndex & );
void notifyUpdatedRow( int );
- bool submit();
+ bool submit() override;
/* Standard model interface */
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
=====================================
modules/gui/qt/widgets/native/roundimage.cpp
=====================================
@@ -123,7 +123,7 @@ namespace
QString errorString() const { return errorStr; }
- QImage execute()
+ QImage execute() override
{
QImageReader reader;
reader.setDevice(device);
@@ -276,7 +276,7 @@ namespace
{
}
- QImage execute()
+ QImage execute() override
{
return prepareImage(sourceImg.size(), radius, sourceImg);
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dc9511c282ec329e2ee22e1443cba825a8c4e144...9cd160830b9459cacc614e514b8878b220096e93
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/dc9511c282ec329e2ee22e1443cba825a8c4e144...9cd160830b9459cacc614e514b8878b220096e93
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