aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/archive
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/archive
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/archive')
-rw-r--r--src/plugins/Input/archive/archiveinputdevice.cpp2
-rw-r--r--src/plugins/Input/archive/archiveinputdevice.h8
-rw-r--r--src/plugins/Input/archive/archivetagreader.cpp24
-rw-r--r--src/plugins/Input/archive/decoder_archive.cpp2
-rw-r--r--src/plugins/Input/archive/decoder_archive.h12
-rw-r--r--src/plugins/Input/archive/decoderarchivefactory.cpp2
-rw-r--r--src/plugins/Input/archive/decoderarchivefactory.h18
7 files changed, 34 insertions, 34 deletions
diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp
index 8d10647ab..ef67a34a1 100644
--- a/src/plugins/Input/archive/archiveinputdevice.cpp
+++ b/src/plugins/Input/archive/archiveinputdevice.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016-2018 by Ilya Kotov *
+ * Copyright (C) 2016-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/archive/archiveinputdevice.h b/src/plugins/Input/archive/archiveinputdevice.h
index e6c31fdda..18d8024d6 100644
--- a/src/plugins/Input/archive/archiveinputdevice.h
+++ b/src/plugins/Input/archive/archiveinputdevice.h
@@ -34,12 +34,12 @@ public:
ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr);
virtual ~ArchiveInputDevice();
- bool seek(qint64 pos);
- qint64 size() const;
+ bool seek(qint64 pos) override;
+ qint64 size() const override;
protected:
- virtual qint64 readData(char *data, qint64 maxSize);
- virtual qint64 writeData(const char *, qint64);
+ virtual qint64 readData(char *data, qint64 maxSize) override;
+ virtual qint64 writeData(const char *, qint64) override;
private:
struct archive *m_archive;
diff --git a/src/plugins/Input/archive/archivetagreader.cpp b/src/plugins/Input/archive/archivetagreader.cpp
index 14a7dc504..70820579e 100644
--- a/src/plugins/Input/archive/archivetagreader.cpp
+++ b/src/plugins/Input/archive/archivetagreader.cpp
@@ -36,7 +36,7 @@ public:
virtual ~IODeviceStream() {}
- virtual TagLib::FileName name() const
+ virtual TagLib::FileName name() const override
{
#ifdef Q_OS_WIN
return QStringToFileName(m_fileName);
@@ -44,26 +44,26 @@ public:
return m_fileName.constData();
#endif
}
- virtual TagLib::ByteVector readBlock(unsigned long length)
+ virtual TagLib::ByteVector readBlock(unsigned long length) override
{
QByteArray data = m_input->read(length);
return TagLib::ByteVector(data.constData(), data.size());
}
- virtual void writeBlock(const TagLib::ByteVector &)
+ virtual void writeBlock(const TagLib::ByteVector &) override
{}
- virtual void insert(const TagLib::ByteVector &, unsigned long, unsigned long)
+ virtual void insert(const TagLib::ByteVector &, unsigned long, unsigned long) override
{}
- virtual void removeBlock(unsigned long, unsigned long)
+ virtual void removeBlock(unsigned long, unsigned long) override
{}
- virtual bool readOnly() const
+ virtual bool readOnly() const override
{
return true;
}
- virtual bool isOpen() const
+ virtual bool isOpen() const override
{
return m_input->isOpen();
}
- virtual void seek(long offset, Position p = Beginning)
+ virtual void seek(long offset, Position p = Beginning) override
{
switch (p)
{
@@ -78,20 +78,20 @@ public:
break;
}
}
- virtual void clear()
+ virtual void clear() override
{
m_input->seek(0);
TagLib::IOStream::clear();
}
- virtual long tell() const
+ virtual long tell() const override
{
return m_input->pos();
}
- virtual long length()
+ virtual long length() override
{
return m_input->size();
}
- virtual void truncate(long)
+ virtual void truncate(long) override
{}
private:
diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp
index fa5bcf292..4ebdea9c6 100644
--- a/src/plugins/Input/archive/decoder_archive.cpp
+++ b/src/plugins/Input/archive/decoder_archive.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016-2018 by Ilya Kotov *
+ * Copyright (C) 2016-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/archive/decoder_archive.h b/src/plugins/Input/archive/decoder_archive.h
index 9356037b7..db79578b7 100644
--- a/src/plugins/Input/archive/decoder_archive.h
+++ b/src/plugins/Input/archive/decoder_archive.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016-2018 by Ilya Kotov *
+ * Copyright (C) 2016-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -34,11 +34,11 @@ public:
virtual ~DecoderArchive();
- bool initialize();
- qint64 totalTime() const;
- void seek(qint64 time);
- qint64 read(unsigned char *data, qint64 maxSize);
- int bitrate() const;
+ bool initialize() override;
+ qint64 totalTime() const override;
+ void seek(qint64 time) override;
+ qint64 read(unsigned char *data, qint64 maxSize) override;
+ int bitrate() const override;
private:
QString m_url;
diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp
index 2b0f6ce25..3b83616c2 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.cpp
+++ b/src/plugins/Input/archive/decoderarchivefactory.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016-2018 by Ilya Kotov *
+ * Copyright (C) 2016-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/archive/decoderarchivefactory.h b/src/plugins/Input/archive/decoderarchivefactory.h
index c9e708aff..0f29ee23d 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.h
+++ b/src/plugins/Input/archive/decoderarchivefactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016-2018 by Ilya Kotov *
+ * Copyright (C) 2016-2019 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -30,14 +30,14 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.DecoderFactoryInterface.1.0")
Q_INTERFACES(DecoderFactory)
public:
- bool canDecode(QIODevice *) const;
- DecoderProperties properties() const;
- Decoder *create(const QString &url, 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 *) const override;
+ DecoderProperties properties() const override;
+ Decoder *create(const QString &url, 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