Mercurial > hg > svapp

changeset 633:4612d44ae753 fix-static-analysis

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes from clang modernize-use-override
author Chris Cannam
date Thu, 22 Nov 2018 14:55:43 +0000
parents 29bef008588e
children 163573a73ebe
files framework/Document.cpp framework/SVFileReader.cpp
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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<Layer *> layers) {
@@ -276,7 +276,7 @@
     }
 
     void
-    moreModelsAvailable(vector<Model *> models) {
+    moreModelsAvailable(vector<Model *> 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<Layer *>());
         delete this;
--- 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();