dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use override

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-15 21:55:05 +02:00
parent 72ede666d4
commit 651020388d
271 changed files with 1199 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
3rdparty/taglib/asf/asffile.cpp vendored
View File

@@ -108,65 +108,65 @@ class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::Bas
public:
explicit UnknownObject(const ByteVector &guid);
ByteVector guid() const;
ByteVector guid() const override;
};
class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
};
class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
};
class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector render(ASF::File *file);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
ByteVector render(ASF::File *file) override;
};
class ASF::File::FilePrivate::ExtendedContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVectorList attributeData;
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector render(ASF::File *file);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
ByteVector render(ASF::File *file) override;
};
class ASF::File::FilePrivate::MetadataObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVectorList attributeData;
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector render(ASF::File *file);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
ByteVector render(ASF::File *file) override;
};
class ASF::File::FilePrivate::MetadataLibraryObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVectorList attributeData;
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector render(ASF::File *file);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
ByteVector render(ASF::File *file) override;
};
class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject {
public:
List<ASF::File::FilePrivate::BaseObject *> objects;
HeaderExtensionObject();
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector render(ASF::File *file);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
ByteVector render(ASF::File *file) override;
};
class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject {
public:
ByteVector guid() const;
void parse(ASF::File *file, unsigned int size);
ByteVector guid() const override;
void parse(ASF::File *file, unsigned int size) override;
private:
enum CodecType {

2
3rdparty/taglib/fileref.cpp vendored
View File

@@ -276,7 +276,7 @@ class FileRef::FileRefPrivate : public RefCounter {
public:
FileRefPrivate() : file(nullptr), stream(nullptr) {}
~FileRefPrivate() {
~FileRefPrivate() override {
delete file;
delete stream;
}

6
3rdparty/taglib/mpeg/mpegfile.cpp vendored
View File

@@ -85,9 +85,9 @@ class AdapterFile : public Strawberry_TagLib::TagLib::File {
public:
explicit AdapterFile(IOStream *stream) : File(stream) {}
Tag *tag() const { return nullptr; }
AudioProperties *audioProperties() const { return nullptr; }
bool save() { return false; }
Tag *tag() const override { return nullptr; }
AudioProperties *audioProperties() const override { return nullptr; }
bool save() override { return false; }
};
} // namespace

2
3rdparty/taglib/toolkit/tdebuglistener.cpp vendored
View File

@@ -37,7 +37,7 @@ using namespace Strawberry_TagLib::TagLib;
namespace {
class DefaultListener : public DebugListener {
public:
virtual void printMessage(const String &msg) {
void printMessage(const String &msg) override {
#ifdef _WIN32
const wstring wstr = msg.toWString();

24
3rdparty/taglib/xm/xmfile.cpp vendored
View File

@@ -84,13 +84,13 @@ class SkipReader : public Reader {
public:
explicit SkipReader(unsigned int size) : m_size(size) {}
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) {
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override {
unsigned int count = std::min(m_size, limit);
file.seek(count, Strawberry_TagLib::TagLib::File::Current);
return count;
}
unsigned int size() const {
unsigned int size() const override {
return m_size;
}
@@ -111,7 +111,7 @@ class StringReader : public ValueReader<String> {
public:
StringReader(String &string, unsigned int size) : ValueReader<String>(string), m_size(size) {}
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) {
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override {
ByteVector data = file.readBlock(std::min(m_size, limit));
unsigned int count = data.size();
@@ -125,7 +125,7 @@ class StringReader : public ValueReader<String> {
}
unsigned int size() const {
unsigned int size() const override {
return m_size;
}
@@ -137,7 +137,7 @@ class ByteReader : public ValueReader<unsigned char> {
public:
explicit ByteReader(unsigned char &_byte) : ValueReader<unsigned char>(_byte) {}
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) {
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override {
ByteVector data = file.readBlock(std::min(1U, limit));
if (data.size() > 0) {
value = data[0];
@@ -145,7 +145,7 @@ class ByteReader : public ValueReader<unsigned char> {
return data.size();
}
unsigned int size() const {
unsigned int size() const override {
return 1;
}
};
@@ -165,13 +165,13 @@ class U16Reader : public NumberReader<unsigned short> {
U16Reader(unsigned short &_value, bool _bigEndian)
: NumberReader<unsigned short>(_value, _bigEndian) {}
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) {
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override {
ByteVector data = file.readBlock(std::min(2U, limit));
value = data.toUShort(bigEndian);
return data.size();
}
unsigned int size() const {
unsigned int size() const override {
return 2;
}
};
@@ -181,13 +181,13 @@ class U32Reader : public NumberReader<unsigned long> {
U32Reader(unsigned long &_value, bool _bigEndian = true) : NumberReader<unsigned long>(_value, _bigEndian) {
}
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) {
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override {
ByteVector data = file.readBlock(std::min(4U, limit));
value = data.toUInt(bigEndian);
return data.size();
}
unsigned int size() const {
unsigned int size() const override {
return 4;
}
};
@@ -276,7 +276,7 @@ class StructReader : public Reader {
return u32(number, true);
}
unsigned int size() const {
unsigned int size() const override {
unsigned int size = 0;
for (List<Reader *>::ConstIterator i = m_readers.begin();
i != m_readers.end();
@@ -286,7 +286,7 @@ class StructReader : public Reader {
return size;
}
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) {
unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override {
unsigned int sumcount = 0;
for (List<Reader *>::ConstIterator i = m_readers.begin();
limit > 0 && i != m_readers.end();