diff options
19 files changed, 46 insertions, 46 deletions
diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h index d3a949daa..b6deb361c 100644 --- a/examples/multimedia/audioinput/audioinput.h +++ b/examples/multimedia/audioinput/audioinput.h @@ -64,8 +64,8 @@ public: qreal level() const { return m_level; } - qint64 readData(char *data, qint64 maxlen); - qint64 writeData(const char *data, qint64 len); + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: const QAudioFormat m_format; @@ -87,7 +87,7 @@ public: void setLevel(qreal value); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: qreal m_level; diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index 7c2454209..d5c2b4cc2 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -65,9 +65,9 @@ public: void start(); void stop(); - qint64 readData(char *data, qint64 maxlen); - qint64 writeData(const char *data, qint64 len); - qint64 bytesAvailable() const; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; + qint64 bytesAvailable() const override; private: void generateData(const QAudioFormat &format, qint64 durationUs, int sampleRate); diff --git a/examples/multimedia/audiorecorder/qaudiolevel.h b/examples/multimedia/audiorecorder/qaudiolevel.h index 5c9c84000..f8e563adc 100644 --- a/examples/multimedia/audiorecorder/qaudiolevel.h +++ b/examples/multimedia/audiorecorder/qaudiolevel.h @@ -53,7 +53,7 @@ public: void setLevel(qreal level); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: qreal m_level; diff --git a/examples/multimedia/spectrum/app/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h index f44da308f..075e9af96 100644 --- a/examples/multimedia/spectrum/app/levelmeter.h +++ b/examples/multimedia/spectrum/app/levelmeter.h @@ -57,7 +57,7 @@ public: explicit LevelMeter(QWidget *parent = 0); ~LevelMeter(); - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; public slots: void reset(); diff --git a/examples/multimedia/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h index 449a021c4..c8bbce022 100644 --- a/examples/multimedia/spectrum/app/mainwidget.h +++ b/examples/multimedia/spectrum/app/mainwidget.h @@ -75,7 +75,7 @@ public: ~MainWidget(); // QObject - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; public slots: void stateChanged(QAudio::Mode mode, QAudio::State state); diff --git a/examples/multimedia/spectrum/app/progressbar.h b/examples/multimedia/spectrum/app/progressbar.h index 6b8032541..f6fed3f66 100644 --- a/examples/multimedia/spectrum/app/progressbar.h +++ b/examples/multimedia/spectrum/app/progressbar.h @@ -56,7 +56,7 @@ public: ~ProgressBar(); void reset(); - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; public slots: void bufferLengthChanged(qint64 length); diff --git a/examples/multimedia/spectrum/app/spectrograph.h b/examples/multimedia/spectrum/app/spectrograph.h index c75e31416..64182feec 100644 --- a/examples/multimedia/spectrum/app/spectrograph.h +++ b/examples/multimedia/spectrum/app/spectrograph.h @@ -60,11 +60,11 @@ public: void setParams(int numBars, qreal lowFreq, qreal highFreq); // QObject - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; // QWidget - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; signals: void infoMessage(const QString &message, int intervalMs); diff --git a/examples/multimedia/spectrum/app/waveform.h b/examples/multimedia/spectrum/app/waveform.h index b49416b20..213461e92 100644 --- a/examples/multimedia/spectrum/app/waveform.h +++ b/examples/multimedia/spectrum/app/waveform.h @@ -64,8 +64,8 @@ public: ~Waveform(); // QWidget - void paintEvent(QPaintEvent *event); - void resizeEvent(QResizeEvent *event); + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; void initialize(const QAudioFormat &format, qint64 audioBufferSize, qint64 windowDurationUs); void reset(); diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h index daef427dd..3db1347b6 100644 --- a/examples/multimediawidgets/camera/camera.h +++ b/examples/multimediawidgets/camera/camera.h @@ -100,9 +100,9 @@ private slots: void imageSaved(int id, const QString &fileName); protected: - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void closeEvent(QCloseEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void closeEvent(QCloseEvent *event) override; private: Ui::Camera *ui; diff --git a/examples/multimediawidgets/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h index bdb65e2a7..31afbd2f5 100644 --- a/examples/multimediawidgets/camera/imagesettings.h +++ b/examples/multimediawidgets/camera/imagesettings.h @@ -69,7 +69,7 @@ public: void setFormat(const QString &format); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: QVariant boxValue(const QComboBox *box) const; diff --git a/examples/multimediawidgets/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h index a4e01fd4c..c4a05face 100644 --- a/examples/multimediawidgets/camera/videosettings.h +++ b/examples/multimediawidgets/camera/videosettings.h @@ -69,7 +69,7 @@ public: void setFormat(const QString &format); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent *e) override; private: QVariant boxValue(const QComboBox*) const; diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h index 062dd1db8..6b971512e 100644 --- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h +++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h @@ -55,16 +55,16 @@ public: explicit VideoItem(QGraphicsItem *parentItem = 0); ~VideoItem(); - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override; //video surface QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const; + QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override; - bool start(const QVideoSurfaceFormat &format); - void stop(); - bool present(const QVideoFrame &frame); + bool start(const QVideoSurfaceFormat &format) override; + void stop() override; + bool present(const QVideoFrame &frame) override; private: QImage::Format imageFormat; diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h index 5edea4ce3..1b4b07dd2 100644 --- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h +++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h @@ -60,7 +60,7 @@ public: VideoPlayer(QWidget *parent = 0); ~VideoPlayer(); - QSize sizeHint() const { return QSize(800, 600); } + QSize sizeHint() const override { return QSize(800, 600); } public slots: void openFile(); diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h index f769f15b8..b57754643 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h @@ -56,11 +56,11 @@ public: QAbstractVideoSurface *videoSurface() const { return surface; } - QSize sizeHint() const; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *event); - void resizeEvent(QResizeEvent *event); + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; private: VideoWidgetSurface *surface; diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h index c869dbeb6..41d05b709 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h @@ -55,13 +55,13 @@ public: VideoWidgetSurface(QWidget *widget, QObject *parent = 0); QList<QVideoFrame::PixelFormat> supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const; - bool isFormatSupported(const QVideoSurfaceFormat &format) const; + QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override; - bool start(const QVideoSurfaceFormat &format); - void stop(); + bool start(const QVideoSurfaceFormat &format) override; + void stop() override; - bool present(const QVideoFrame &frame); + bool present(const QVideoFrame &frame) override; QRect videoRect() const { return targetRect; } void updateVideoRect(); diff --git a/examples/multimediawidgets/player/histogramwidget.h b/examples/multimediawidgets/player/histogramwidget.h index f979e8706..9462b1c84 100644 --- a/examples/multimediawidgets/player/histogramwidget.h +++ b/examples/multimediawidgets/player/histogramwidget.h @@ -70,7 +70,7 @@ public slots: void setHistogram(QVector<qreal> histogram); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: QVector<qreal> m_histogram; diff --git a/examples/multimediawidgets/player/playlistmodel.h b/examples/multimediawidgets/player/playlistmodel.h index 85a1fbef0..960943f1c 100644 --- a/examples/multimediawidgets/player/playlistmodel.h +++ b/examples/multimediawidgets/player/playlistmodel.h @@ -60,18 +60,18 @@ public: PlaylistModel(QObject *parent = 0); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &child) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QMediaPlaylist *playlist() const; void setPlaylist(QMediaPlaylist *playlist); - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole); + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole) override; private slots: void beginInsertItems(int start, int end); diff --git a/examples/multimediawidgets/player/videowidget.h b/examples/multimediawidgets/player/videowidget.h index 82093c05d..00a27a78b 100644 --- a/examples/multimediawidgets/player/videowidget.h +++ b/examples/multimediawidgets/player/videowidget.h @@ -51,9 +51,9 @@ public: VideoWidget(QWidget *parent = 0); protected: - void keyPressEvent(QKeyEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; }; #endif // VIDEOWIDGET_H diff --git a/examples/multimediawidgets/videographicsitem/videoplayer.h b/examples/multimediawidgets/videographicsitem/videoplayer.h index 9c67e1c7e..17cb8565a 100644 --- a/examples/multimediawidgets/videographicsitem/videoplayer.h +++ b/examples/multimediawidgets/videographicsitem/videoplayer.h @@ -59,7 +59,7 @@ public: VideoPlayer(QWidget *parent = 0); ~VideoPlayer(); - QSize sizeHint() const { return QSize(800, 600); } + QSize sizeHint() const override { return QSize(800, 600); } public slots: void openFile(); |