# HG changeset patch # User Chris Cannam # Date 1542898543 0 # Node ID 4612d44ae753dc3f23e5d8ea2187f4ecd4947d5c # Parent 29bef008588ef6dbb61e4b12a06ee2cf806e9f96 Fixes from clang modernize-use-override diff -r 29bef008588e -r 4612d44ae753 framework/Document.cpp --- a/framework/Document.cpp Fri Nov 09 15:38:49 2018 +0000 +++ b/framework/Document.cpp Thu Nov 22 14:55:43 2018 +0000 @@ -268,7 +268,7 @@ m_handler(handler) { } - virtual ~AdditionalModelConverter() { } + ~AdditionalModelConverter() override { } void setPrimaryLayers(vector layers) { @@ -276,7 +276,7 @@ } void - moreModelsAvailable(vector models) { + moreModelsAvailable(vector models) override { std::cerr << "AdditionalModelConverter::moreModelsAvailable: " << models.size() << " model(s)" << std::endl; // We can't automatically regenerate the additional models on // reload -- we should delete them instead @@ -292,7 +292,7 @@ } void - noMoreModelsAvailable() { + noMoreModelsAvailable() override { std::cerr << "AdditionalModelConverter::noMoreModelsAvailable" << std::endl; m_handler->layersCreated(this, m_primary, vector()); delete this; diff -r 29bef008588e -r 4612d44ae753 framework/SVFileReader.cpp --- a/framework/SVFileReader.cpp Fri Nov 09 15:38:49 2018 +0000 +++ b/framework/SVFileReader.cpp Thu Nov 22 14:55:43 2018 +0000 @@ -1554,7 +1554,7 @@ m_inData(false), m_type(SVFileReader::UnknownFileType) { } - virtual ~SVFileIdentifier() { } + ~SVFileIdentifier() override { } void parse(QXmlInputSource &source) { QXmlSimpleReader reader; @@ -1565,10 +1565,10 @@ SVFileReader::FileType getType() const { return m_type; } - virtual bool startElement(const QString &, + bool startElement(const QString &, const QString &, const QString &qName, - const QXmlAttributes& atts) + const QXmlAttributes& atts) override { QString name = qName.toLower(); @@ -1601,9 +1601,9 @@ return true; } - virtual bool endElement(const QString &, + bool endElement(const QString &, const QString &, - const QString &qName) + const QString &qName) override { QString name = qName.toLower();