Remove virtual destructor from OptionManagerWatcher

We should never destruct anything through an OptionManagerWatcher
pointer, so having all those destructor virtual makes no sense.

6 files changed, 6 insertions, 8 deletions

diff --git a/src/buffer.hh b/src/buffer.hh
index 60eb9cdd..cb71f8a1 100644
--- a/src/buffer.hh
+++ b/src/buffer.hh
@@ -121,7 +121,7 @@ public:
            timespec fs_timestamp = InvalidTime);
     Buffer(const Buffer&) = delete;
     Buffer& operator= (const Buffer&) = delete;
-    ~Buffer() override;
+    ~Buffer();
 
     Flags flags() const { return m_flags; }
     Flags& flags() { return m_flags; }
diff --git a/src/client.hh b/src/client.hh
index d5abc929..5b16a978 100644
--- a/src/client.hh
+++ b/src/client.hh
@@ -30,7 +30,7 @@ public:
            SelectionList selections,
            EnvVarMap env_vars,
            String name);
-    ~Client() override;
+    ~Client();
 
     Client(Client&&) = delete;
 
diff --git a/src/insert_completer.hh b/src/insert_completer.hh
index b0bd13ef..22ba643a 100644
--- a/src/insert_completer.hh
+++ b/src/insert_completer.hh
@@ -87,7 +87,7 @@ public:
     InsertCompleter(Context& context);
     InsertCompleter(const InsertCompleter&) = delete;
     InsertCompleter& operator=(const InsertCompleter&) = delete;
-    ~InsertCompleter() override;
+    ~InsertCompleter();
 
     void select(int offset, Vector<Key>& keystrokes);
     void update();
diff --git a/src/option_manager.hh b/src/option_manager.hh
index f68f6662..2970d4e2 100644
--- a/src/option_manager.hh
+++ b/src/option_manager.hh
@@ -70,8 +70,6 @@ protected:
 class OptionManagerWatcher
 {
 public:
-    virtual ~OptionManagerWatcher() = default;
-
     virtual void on_option_changed(const Option& option) = 0;
 };
 
@@ -79,7 +77,7 @@ class OptionManager : private OptionManagerWatcher
 {
 public:
     OptionManager(OptionManager& parent);
-    ~OptionManager() override;
+    ~OptionManager();
 
     Option& operator[] (StringView name);
     const Option& operator[] (StringView name) const;
diff --git a/src/window.hh b/src/window.hh
index b2db63fc..2bd78356 100644
--- a/src/window.hh
+++ b/src/window.hh
@@ -16,7 +16,7 @@ class Window : public SafeCountable, public OptionManagerWatcher, public Scope
 {
 public:
     Window(Buffer& buffer);
-    ~Window() override;
+    ~Window();
 
     const DisplayCoord& position() const { return m_position; }
     void set_position(DisplayCoord position);
diff --git a/src/word_db.hh b/src/word_db.hh
index a585aaa8..789d989e 100644
--- a/src/word_db.hh
+++ b/src/word_db.hh
@@ -17,7 +17,7 @@ class WordDB : public OptionManagerWatcher
 {
 public:
     WordDB(const Buffer& buffer);
-    ~WordDB() override;
+    ~WordDB();
     WordDB(const WordDB&) = delete;
     WordDB(WordDB&&) noexcept;