aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-06 19:27:03 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-06 19:27:03 +0000
commit8a6f982632b4f4710576685a5647a771384ab29a (patch)
tree9ca763e18279d42aa4c7b29530612768db1bbf01 /src/plugins/Input/ffmpeg
parent1b0fef3d25ed94518f4f6b1914a7d7e71aae80c5 (diff)
downloadqmmp-8a6f982632b4f4710576685a5647a771384ab29a.tar.gz
qmmp-8a6f982632b4f4710576685a5647a771384ab29a.tar.bz2
qmmp-8a6f982632b4f4710576685a5647a771384ab29a.zip
using override keyword
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8591 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg')
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp2
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpeg.h12
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp2
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.h18
-rw-r--r--src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp2
-rw-r--r--src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h4
-rw-r--r--src/plugins/Input/ffmpeg/settingsdialog.cpp2
-rw-r--r--src/plugins/Input/ffmpeg/settingsdialog.h4
8 files changed, 23 insertions, 23 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 9548970fa..eeb61fb81 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2018 by Ilya Kotov *
+ * Copyright (C) 2006-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
index e824a4f7e..36a95d59f 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2018 by Ilya Kotov *
+ * Copyright (C) 2006-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -41,11 +41,11 @@ public:
virtual ~DecoderFFmpeg();
// Standard Decoder API
- bool initialize();
- qint64 totalTime() const;
- int bitrate() const;
- qint64 read(unsigned char *audio, qint64 maxSize);
- void seek(qint64 time);
+ bool initialize() override;
+ qint64 totalTime() const override;
+ int bitrate() const override;
+ qint64 read(unsigned char *audio, qint64 maxSize) override;
+ void seek(qint64 time) override;
private:
//helper functions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index abca4bfb6..fe05461b0 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2018 by Ilya Kotov *
+ * Copyright (C) 2008-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
index 60112ec2f..d0511cce9 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2018 by Ilya Kotov *
+ * Copyright (C) 2006-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -31,14 +31,14 @@ Q_INTERFACES(DecoderFactory)
public:
DecoderFFmpegFactory();
- bool canDecode(QIODevice *input) const;
- DecoderProperties properties() const;
- Decoder *create(const QString &, QIODevice *);
- QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
- MetaDataModel* createMetaDataModel(const QString &path, bool readOnly);
- void showSettings(QWidget *parent);
- void showAbout(QWidget *parent);
- QString translation() const;
+ bool canDecode(QIODevice *input) const override;
+ DecoderProperties properties() const override;
+ Decoder *create(const QString &, QIODevice *) override;
+ QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) override;
+ MetaDataModel* createMetaDataModel(const QString &path, bool readOnly) override;
+ void showSettings(QWidget *parent) override;
+ void showAbout(QWidget *parent) override;
+ QString translation() const override;
};
#endif
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index 17907d0cd..f60b7f79d 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2018 by Ilya Kotov *
+ * Copyright (C) 2009-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
index 32f521e62..20d1f550e 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2018 by Ilya Kotov *
+ * Copyright (C) 2009-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@ class FFmpegMetaDataModel : public MetaDataModel
public:
FFmpegMetaDataModel(const QString &path);
~FFmpegMetaDataModel();
- QPixmap cover() const;
+ QPixmap cover() const override;
private:
AVFormatContext *m_in;
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp
index b53122402..d42ff7068 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2018 by Ilya Kotov *
+ * Copyright (C) 2008-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.h b/src/plugins/Input/ffmpeg/settingsdialog.h
index 599c3481e..fa6a114cc 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.h
+++ b/src/plugins/Input/ffmpeg/settingsdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2018 by Ilya Kotov *
+ * Copyright (C) 2008-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@ public:
~SettingsDialog();
public slots:
- virtual void accept();
+ virtual void accept() override;
private:
Ui::SettingsDialog m_ui;