Run clang-tidy’s modernize-use-override pass.

This adds the override specifier on all methods which override a virtual
method, whether they were already virtual or missing this specifier.

13 files changed, 113 insertions, 113 deletions

diff --git a/src/xml/comment-node.h b/src/xml/comment-node.h
index 7c37a0d24..cddd2e74b 100644
--- a/src/xml/comment-node.h
+++ b/src/xml/comment-node.h
@@ -35,10 +35,10 @@ struct CommentNode : public SimpleNode {
     CommentNode(CommentNode const &other, Document *doc)
     : SimpleNode(other, doc) {}
 
-    Inkscape::XML::NodeType type() const { return Inkscape::XML::COMMENT_NODE; }
+    Inkscape::XML::NodeType type() const override { return Inkscape::XML::COMMENT_NODE; }
 
 protected:
-    SimpleNode *_duplicate(Document* doc) const { return new CommentNode(*this, doc); }
+    SimpleNode *_duplicate(Document* doc) const override { return new CommentNode(*this, doc); }
 };
 
 }
diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index 581a4c226..cff880aad 100644
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -115,31 +115,31 @@ public:
     NodeEventVector const &vector;
     void * const data;
 
-    void notifyChildAdded(Node &node, Node &child, Node *prev) {
+    void notifyChildAdded(Node &node, Node &child, Node *prev) override {
         if (vector.child_added) {
             vector.child_added(&node, &child, prev, data);
         }
     }
 
-    void notifyChildRemoved(Node &node, Node &child, Node *prev) {
+    void notifyChildRemoved(Node &node, Node &child, Node *prev) override {
         if (vector.child_removed) {
             vector.child_removed(&node, &child, prev, data);
         }
     }
 
-    void notifyChildOrderChanged(Node &node, Node &child, Node *old_prev, Node *new_prev) {
+    void notifyChildOrderChanged(Node &node, Node &child, Node *old_prev, Node *new_prev) override {
         if (vector.order_changed) {
             vector.order_changed(&node, &child, old_prev, new_prev, data);
         }
     }
 
-    void notifyContentChanged(Node &node, Util::ptr_shared old_content, Util::ptr_shared new_content) {
+    void notifyContentChanged(Node &node, Util::ptr_shared old_content, Util::ptr_shared new_content) override {
         if (vector.content_changed) {
             vector.content_changed(&node, old_content, new_content, data);
         }
     }
 
-    void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared old_value, Util::ptr_shared new_value) {
+    void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared old_value, Util::ptr_shared new_value) override {
         if (vector.attr_changed) {
             vector.attr_changed(&node, g_quark_to_string(name), old_value, new_value, false, data);
         }
diff --git a/src/xml/composite-node-observer.h b/src/xml/composite-node-observer.h
index 1004617bf..c941acee8 100644
--- a/src/xml/composite-node-observer.h
+++ b/src/xml/composite-node-observer.h
@@ -67,20 +67,20 @@ public:
      */
     void removeListenerByData(void *data);
     
-    void notifyChildAdded(Node &node, Node &child, Node *prev);
+    void notifyChildAdded(Node &node, Node &child, Node *prev) override;
 
-    void notifyChildRemoved(Node &node, Node &child, Node *prev);
+    void notifyChildRemoved(Node &node, Node &child, Node *prev) override;
 
     void notifyChildOrderChanged(Node &node, Node &child,
-                                 Node *old_prev, Node *new_prev);
+                                 Node *old_prev, Node *new_prev) override;
 
     void notifyContentChanged(Node &node,
                               Util::ptr_shared old_content,
-                              Util::ptr_shared new_content);
+                              Util::ptr_shared new_content) override;
 
     void notifyAttributeChanged(Node &node, GQuark name,
                                 Util::ptr_shared old_value,
-                                Util::ptr_shared new_value);
+                                Util::ptr_shared new_value) override;
 
 private:
     unsigned _iterating;
diff --git a/src/xml/element-node.h b/src/xml/element-node.h
index 12df8dc97..99598241a 100644
--- a/src/xml/element-node.h
+++ b/src/xml/element-node.h
@@ -31,10 +31,10 @@ public:
     ElementNode(ElementNode const &other, Document *doc)
     : SimpleNode(other, doc) {}
 
-    Inkscape::XML::NodeType type() const { return Inkscape::XML::ELEMENT_NODE; }
+    Inkscape::XML::NodeType type() const override { return Inkscape::XML::ELEMENT_NODE; }
 
 protected:
-    SimpleNode *_duplicate(Document* doc) const { return new ElementNode(*this, doc); }
+    SimpleNode *_duplicate(Document* doc) const override { return new ElementNode(*this, doc); }
 };
 
 }
diff --git a/src/xml/event.cpp b/src/xml/event.cpp
index 54f55d5c3..d0ba10e08 100644
--- a/src/xml/event.cpp
+++ b/src/xml/event.cpp
@@ -92,30 +92,30 @@ public:
         return singleton;
     }
 
-    void notifyChildAdded(Node &parent, Node &child, Node *ref) {
+    void notifyChildAdded(Node &parent, Node &child, Node *ref) override {
         parent.addChild(&child, ref);
     }
 
-    void notifyChildRemoved(Node &parent, Node &child, Node */*old_ref*/) {
+    void notifyChildRemoved(Node &parent, Node &child, Node */*old_ref*/) override {
         parent.removeChild(&child);
     }
 
     void notifyChildOrderChanged(Node &parent, Node &child,
-                         Node */*old_ref*/, Node *new_ref)
+                         Node */*old_ref*/, Node *new_ref) override
     {
         parent.changeOrder(&child, new_ref);
     }
 
     void notifyAttributeChanged(Node &node, GQuark name,
                         Inkscape::Util::ptr_shared /*old_value*/,
-                    Inkscape::Util::ptr_shared new_value)
+                    Inkscape::Util::ptr_shared new_value) override
     {
         node.setAttribute(g_quark_to_string(name), new_value);
     }
 
     void notifyContentChanged(Node &node,
                       Inkscape::Util::ptr_shared /*old_value*/,
-                  Inkscape::Util::ptr_shared new_value)
+                  Inkscape::Util::ptr_shared new_value) override
     {
         node.setContent(new_value);
     }
@@ -446,23 +446,23 @@ public:
         }
     }
 
-    void notifyChildAdded(Node &parent, Node &child, Node *ref) {
+    void notifyChildAdded(Node &parent, Node &child, Node *ref) override {
         g_warning("Event: Added %s to %s after %s", node_to_string(parent).c_str(), node_to_string(child).c_str(), ref_to_string(ref).c_str());
     }
 
-    void notifyChildRemoved(Node &parent, Node &child, Node */*ref*/) {
+    void notifyChildRemoved(Node &parent, Node &child, Node */*ref*/) override {
         g_warning("Event: Removed %s from %s", node_to_string(parent).c_str(), node_to_string(child).c_str());
     }
 
     void notifyChildOrderChanged(Node &parent, Node &child,
-                                 Node */*old_ref*/, Node *new_ref)
+                                 Node */*old_ref*/, Node *new_ref) override
     {
         g_warning("Event: Moved %s after %s in %s", node_to_string(child).c_str(), ref_to_string(new_ref).c_str(), node_to_string(parent).c_str());
     }
 
     void notifyAttributeChanged(Node &node, GQuark name,
                                 Inkscape::Util::ptr_shared /*old_value*/,
-                    Inkscape::Util::ptr_shared new_value)
+                    Inkscape::Util::ptr_shared new_value) override
     {
         if (new_value) {
             g_warning("Event: Set attribute %s to \"%s\" on %s", g_quark_to_string(name), new_value.pointer(), node_to_string(node).c_str());
@@ -473,7 +473,7 @@ public:
 
     void notifyContentChanged(Node &node,
                       Inkscape::Util::ptr_shared /*old_value*/,
-                  Inkscape::Util::ptr_shared new_value)
+                  Inkscape::Util::ptr_shared new_value) override
     {
         if (new_value) {
             g_warning("Event: Set content of %s to \"%s\"", node_to_string(node).c_str(), new_value.pointer());
diff --git a/src/xml/event.h b/src/xml/event.h
index 5210b232d..b11cbe9cb 100644
--- a/src/xml/event.h
+++ b/src/xml/event.h
@@ -137,9 +137,9 @@ public:
     Node *ref;
 
 private:
-    Event *_optimizeOne();
-    void _undoOne(NodeObserver &observer) const;
-    void _replayOne(NodeObserver &observer) const;
+    Event *_optimizeOne() override;
+    void _undoOne(NodeObserver &observer) const override;
+    void _replayOne(NodeObserver &observer) const override;
 };
 
 /**
@@ -156,9 +156,9 @@ public:
     Node *ref;
 
 private:
-    Event *_optimizeOne();
-    void _undoOne(NodeObserver &observer) const;
-    void _replayOne(NodeObserver &observer) const;
+    Event *_optimizeOne() override;
+    void _undoOne(NodeObserver &observer) const override;
+    void _replayOne(NodeObserver &observer) const override;
 };
 
 /**
@@ -181,9 +181,9 @@ public:
     Inkscape::Util::ptr_shared newval;
 
 private:
-    Event *_optimizeOne();
-    void _undoOne(NodeObserver &observer) const;
-    void _replayOne(NodeObserver &observer) const;
+    Event *_optimizeOne() override;
+    void _undoOne(NodeObserver &observer) const override;
+    void _replayOne(NodeObserver &observer) const override;
 };
 
 /**
@@ -203,9 +203,9 @@ public:
     Inkscape::Util::ptr_shared newval;
 
 private:
-    Event *_optimizeOne();
-    void _undoOne(NodeObserver &observer) const;
-    void _replayOne(NodeObserver &observer) const;
+    Event *_optimizeOne() override;
+    void _undoOne(NodeObserver &observer) const override;
+    void _replayOne(NodeObserver &observer) const override;
 };
 
 /**
@@ -225,9 +225,9 @@ public:
     Node *newref;
 
 private:
-    Event *_optimizeOne();
-    void _undoOne(NodeObserver &observer) const;
-    void _replayOne(NodeObserver &observer) const;
+    Event *_optimizeOne() override;
+    void _undoOne(NodeObserver &observer) const override;
+    void _replayOne(NodeObserver &observer) const override;
 };
 
 }
diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h
index 4b728d295..53f4c80e6 100644
--- a/src/xml/helper-observer.h
+++ b/src/xml/helper-observer.h
@@ -18,15 +18,15 @@ class Node;
 class SignalObserver : public NodeObserver {
 public:
     SignalObserver();
-    ~SignalObserver();
+    ~SignalObserver() override;
 
     // Add this observer to the SPObject and remove it from any previous object
     void set(SPObject* o);
-    void notifyChildAdded(Node&, Node&, Node*);
-    void notifyChildRemoved(Node&, Node&, Node*);
-    void notifyChildOrderChanged(Node&, Node&, Node*, Node*);
-    void notifyContentChanged(Node&, Util::ptr_shared, Util::ptr_shared);
-    void notifyAttributeChanged(Node&, GQuark, Util::ptr_shared, Util::ptr_shared);
+    void notifyChildAdded(Node&, Node&, Node*) override;
+    void notifyChildRemoved(Node&, Node&, Node*) override;
+    void notifyChildOrderChanged(Node&, Node&, Node*, Node*) override;
+    void notifyContentChanged(Node&, Util::ptr_shared, Util::ptr_shared) override;
+    void notifyAttributeChanged(Node&, GQuark, Util::ptr_shared, Util::ptr_shared) override;
     sigc::signal<void>& signal_changed();
 private:
     sigc::signal<void> _signal_changed;
diff --git a/src/xml/node.h b/src/xml/node.h
index 8d9fc19e4..85d9f6f12 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -78,7 +78,7 @@ enum NodeType {
 class Node : public Inkscape::GC::Anchored {
 public:
     Node() {}
-    virtual ~Node() {}
+    ~Node() override {}
 
     /**
      * @name Retrieve information about the node
diff --git a/src/xml/pi-node.h b/src/xml/pi-node.h
index eeed1632d..65b2f3482 100644
--- a/src/xml/pi-node.h
+++ b/src/xml/pi-node.h
@@ -32,10 +32,10 @@ struct PINode : public SimpleNode {
     PINode(PINode const &other, Document *doc)
     : SimpleNode(other, doc) {}
 
-    Inkscape::XML::NodeType type() const { return Inkscape::XML::PI_NODE; }
+    Inkscape::XML::NodeType type() const override { return Inkscape::XML::PI_NODE; }
 
 protected:
-    SimpleNode *_duplicate(Document* doc) const { return new PINode(*this, doc); }
+    SimpleNode *_duplicate(Document* doc) const override { return new PINode(*this, doc); }
 };
 
 }
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 63ad05e04..f0b7e0d8d 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -46,10 +46,10 @@ public:
     SPCSSAttrImpl(SPCSSAttrImpl const &other, Document *doc)
     : SimpleNode(other, doc) {}
 
-    NodeType type() const { return Inkscape::XML::ELEMENT_NODE; }
+    NodeType type() const override { return Inkscape::XML::ELEMENT_NODE; }
 
 protected:
-    SimpleNode *_duplicate(Document* doc) const { return new SPCSSAttrImpl(*this, doc); }
+    SimpleNode *_duplicate(Document* doc) const override { return new SPCSSAttrImpl(*this, doc); }
 };
 
 static void sp_repr_css_add_components(SPCSSAttr *css, Node *repr, gchar const *attr);
diff --git a/src/xml/simple-document.h b/src/xml/simple-document.h
index 01933076f..078fa16a7 100644
--- a/src/xml/simple-document.h
+++ b/src/xml/simple-document.h
@@ -33,35 +33,35 @@ public:
     : SimpleNode(g_quark_from_static_string("xml"), this),
       _in_transaction(false), _is_CData(false) {}
 
-    NodeType type() const { return Inkscape::XML::DOCUMENT_NODE; }
+    NodeType type() const override { return Inkscape::XML::DOCUMENT_NODE; }
 
-    bool inTransaction() { return _in_transaction; }
+    bool inTransaction() override { return _in_transaction; }
 
-    void beginTransaction();
-    void rollback();
-    void commit();
-    Inkscape::XML::Event *commitUndoable();
+    void beginTransaction() override;
+    void rollback() override;
+    void commit() override;
+    Inkscape::XML::Event *commitUndoable() override;
 
-    Node *createElement(char const *name);
-    Node *createTextNode(char const *content);
-    Node *createTextNode(char const *content, bool const is_CData);
-    Node *createComment(char const *content);
-    Node *createPI(char const *target, char const *content);
+    Node *createElement(char const *name) override;
+    Node *createTextNode(char const *content) override;
+    Node *createTextNode(char const *content, bool const is_CData) override;
+    Node *createComment(char const *content) override;
+    Node *createPI(char const *target, char const *content) override;
 
-    void notifyChildAdded(Node &parent, Node &child, Node *prev);
+    void notifyChildAdded(Node &parent, Node &child, Node *prev) override;
 
-    void notifyChildRemoved(Node &parent, Node &child, Node *prev);
+    void notifyChildRemoved(Node &parent, Node &child, Node *prev) override;
 
     void notifyChildOrderChanged(Node &parent, Node &child,
-                                 Node *old_prev, Node *new_prev);
+                                 Node *old_prev, Node *new_prev) override;
 
     void notifyContentChanged(Node &node,
                               Util::ptr_shared old_content,
-                              Util::ptr_shared new_content);
+                              Util::ptr_shared new_content) override;
 
     void notifyAttributeChanged(Node &node, GQuark name,
                                 Util::ptr_shared old_value,
-                                Util::ptr_shared new_value);
+                                Util::ptr_shared new_value) override;
 
 protected:
     SimpleDocument(SimpleDocument const &doc)
@@ -69,11 +69,11 @@ protected:
       _in_transaction(false),
       _is_CData(false){}
 
-    SimpleNode *_duplicate(Document* /*doc*/) const
+    SimpleNode *_duplicate(Document* /*doc*/) const override
     {
         return new SimpleDocument(*this);
     }
-    NodeObserver *logger() { return this; }
+    NodeObserver *logger() override { return this; }
 
 private:
     bool _in_transaction;
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index fd41e53a8..d7ea1f16d 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -39,91 +39,91 @@ class SimpleNode
 : virtual public Node, public Inkscape::GC::Managed<>
 {
 public:
-    char const *name() const;
-    int code() const { return _name; }
-    void setCodeUnsafe(int code) {
+    char const *name() const override;
+    int code() const override { return _name; }
+    void setCodeUnsafe(int code) override {
         _name = code;
     }
 
-    Document *document() { return _document; }
-    Document const *document() const {
+    Document *document() override { return _document; }
+    Document const *document() const override {
         return const_cast<SimpleNode *>(this)->document();
     }
 
-    Node *duplicate(Document* doc) const { return _duplicate(doc); }
+    Node *duplicate(Document* doc) const override { return _duplicate(doc); }
 
-    Node *root();
-    Node const *root() const {
+    Node *root() override;
+    Node const *root() const override {
         return const_cast<SimpleNode *>(this)->root();
     }
 
-    Node *parent() { return _parent; }
-    Node const *parent() const { return _parent; }
+    Node *parent() override { return _parent; }
+    Node const *parent() const override { return _parent; }
 
-    Node *next() { return _next; }
-    Node const *next() const { return _next; }
+    Node *next() override { return _next; }
+    Node const *next() const override { return _next; }
 
-    Node *firstChild() { return _first_child; }
-    Node const *firstChild() const { return _first_child; }
-    Node *lastChild() { return _last_child; }
-    Node const *lastChild() const { return _last_child; }
+    Node *firstChild() override { return _first_child; }
+    Node const *firstChild() const override { return _first_child; }
+    Node *lastChild() override { return _last_child; }
+    Node const *lastChild() const override { return _last_child; }
 
-    unsigned childCount() const { return _child_count; }
-    Node *nthChild(unsigned index);
-    Node const *nthChild(unsigned index) const {
+    unsigned childCount() const override { return _child_count; }
+    Node *nthChild(unsigned index) override;
+    Node const *nthChild(unsigned index) const override {
         return const_cast<SimpleNode *>(this)->nthChild(index);
     }
 
-    void addChild(Node *child, Node *ref);
-    void appendChild(Node *child) {
+    void addChild(Node *child, Node *ref) override;
+    void appendChild(Node *child) override {
         SimpleNode::addChild(child, _last_child);
     }
-    void removeChild(Node *child);
-    void changeOrder(Node *child, Node *ref);
+    void removeChild(Node *child) override;
+    void changeOrder(Node *child, Node *ref) override;
 
-    unsigned position() const;
-    void setPosition(int pos);
+    unsigned position() const override;
+    void setPosition(int pos) override;
 
-    char const *attribute(char const *key) const;
-    void setAttribute(char const *key, char const *value, bool is_interactive=false);
-    bool matchAttributeName(char const *partial_name) const;
+    char const *attribute(char const *key) const override;
+    void setAttribute(char const *key, char const *value, bool is_interactive=false) override;
+    bool matchAttributeName(char const *partial_name) const override;
 
-    char const *content() const;
-    void setContent(char const *value);
+    char const *content() const override;
+    void setContent(char const *value) override;
 
-    void cleanOriginal(Node *src, gchar const *key);
-    bool equal(Node const *other, bool recursive);
-    void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false);
+    void cleanOriginal(Node *src, gchar const *key) override;
+    bool equal(Node const *other, bool recursive) override;
+    void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false) override;
 
-    Inkscape::Util::List<AttributeRecord const> attributeList() const {
+    Inkscape::Util::List<AttributeRecord const> attributeList() const override {
         return _attributes;
     }
 
-    void synthesizeEvents(NodeEventVector const *vector, void *data);
-    void synthesizeEvents(NodeObserver &observer);
+    void synthesizeEvents(NodeEventVector const *vector, void *data) override;
+    void synthesizeEvents(NodeObserver &observer) override;
 
-    void addListener(NodeEventVector const *vector, void *data) {
+    void addListener(NodeEventVector const *vector, void *data) override {
         assert(vector != NULL);
         _observers.addListener(*vector, data);
     }
-    void addObserver(NodeObserver &observer) {
+    void addObserver(NodeObserver &observer) override {
         _observers.add(observer);
     }
-    void removeListenerByData(void *data) {
+    void removeListenerByData(void *data) override {
         _observers.removeListenerByData(data);
     }
-    void removeObserver(NodeObserver &observer) {
+    void removeObserver(NodeObserver &observer) override {
         _observers.remove(observer);
     }
 
-    void addSubtreeObserver(NodeObserver &observer) {
+    void addSubtreeObserver(NodeObserver &observer) override {
         _subtree_observers.add(observer);
     }
-    void removeSubtreeObserver(NodeObserver &observer) {
+    void removeSubtreeObserver(NodeObserver &observer) override {
         _subtree_observers.remove(observer);
     }
 
-    void recursivePrintTree(unsigned level = 0);
+    void recursivePrintTree(unsigned level = 0) override;
 
 protected:
     SimpleNode(int code, Document *document);
diff --git a/src/xml/text-node.h b/src/xml/text-node.h
index 4d71203a5..ca7880acb 100644
--- a/src/xml/text-node.h
+++ b/src/xml/text-node.h
@@ -43,11 +43,11 @@ struct TextNode : public SimpleNode {
       _is_CData = other._is_CData;
     }
 
-    Inkscape::XML::NodeType type() const { return Inkscape::XML::TEXT_NODE; }
+    Inkscape::XML::NodeType type() const override { return Inkscape::XML::TEXT_NODE; }
     bool is_CData() const { return _is_CData; }
 
 protected:
-    SimpleNode *_duplicate(Document* doc) const { return new TextNode(*this, doc); }
+    SimpleNode *_duplicate(Document* doc) const override { return new TextNode(*this, doc); }
     bool _is_CData;
 };