Add override statements to please clang

Eventually, all overridden virtual methods should be marked properly.
Currently, clang only warns about those in classes that already use
override in at least one place (which was the case dor GuiApplication).

(cherry picked from commit c8f4b68423520378d02fe9f953d94759b862dc55)

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index fafdd46eea25478b49b6fd8f598e9e3c7db0f601..970ae807b85a0db33ee8d2d5164a00f22e9b5224 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -63,21 +63,21 @@ public:
 
        /// \name Methods inherited from Application class
        //@{
-       DispatchResult const & dispatch(FuncRequest const &);
-       void dispatch(FuncRequest const &, DispatchResult & dr);
-       FuncStatus getStatus(FuncRequest const & cmd) const;
-       void restoreGuiSession();
-       Buffer const * updateInset(Inset const * inset) const;
-       int exec();
-       void exit(int status);
-       bool event(QEvent * e);
-       bool getRgbColor(ColorCode col, RGBColor & rgbcol);
-       std::string const hexName(ColorCode col);
-       void registerSocketCallback(int fd, SocketCallback func);
-       void unregisterSocketCallback(int fd);
-       bool searchMenu(FuncRequest const & func, docstring_list & names) const;
-       void handleKeyFunc(FuncCode action);
-       bool unhide(Buffer * buf); //override
+       DispatchResult const & dispatch(FuncRequest const &) override;
+       void dispatch(FuncRequest const &, DispatchResult & dr) override;
+       FuncStatus getStatus(FuncRequest const & cmd) const override;
+       void restoreGuiSession() override;
+       Buffer const * updateInset(Inset const * inset) const override;
+       int exec() override;
+       void exit(int status) override;
+       bool event(QEvent * e) override;
+       bool getRgbColor(ColorCode col, RGBColor & rgbcol) override;
+       std::string const hexName(ColorCode col) override;
+       void registerSocketCallback(int fd, SocketCallback func) override;
+       void unregisterSocketCallback(int fd) override;
+       bool searchMenu(FuncRequest const & func, docstring_list & names) const override;
+       void handleKeyFunc(FuncCode action) override;
+       bool unhide(Buffer * buf) override;
        //@}
 
        ///
@@ -105,13 +105,13 @@ public:
 
        /// \name Methods inherited from QApplication class
        //@{
-       bool notify(QObject * receiver, QEvent * event);
+       bool notify(QObject * receiver, QEvent * event) override;
        void commitData(QSessionManager & sm);
 #ifdef Q_WS_X11
-       bool x11EventFilter(XEvent * ev);
+       bool x11EventFilter(XEvent * ev) override;
 #elif defined(QPA_XCB)
        virtual bool nativeEventFilter(const QByteArray & eventType, void * message,
-                                      long * result) Q_DECL_OVERRIDE;
+                                      long * result) override;
 #endif
        //@}
 
@@ -196,13 +196,13 @@ public:
        void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
        /// Start a long operation with some cancel possibility (button or ESC)
-       void startLongOperation();
+       void startLongOperation() override;
        /// This needs to be periodically called to avoid freezing the GUI
-       bool longOperationCancelled();
+       bool longOperationCancelled() override;
        /// Stop the long operation mode (i.e., release the GUI)
-       void stopLongOperation();
+       void stopLongOperation() override;
        /// A started long operation is still in progress ?
-       bool longOperationStarted();
+       bool longOperationStarted() override;
 private Q_SLOTS:
        ///
        void execBatchCommands();

diff --git a/status.23x b/status.23x
index 81dc9487f5c1b796fc83b7452c3e1e8ffd02bbcc..e2f47e31b20595b00a09654a43197f0e5ff002b9 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -141,3 +141,5 @@ What's new
 
 - Update bundled boost distribution to 1.68.
 
+- Fix warnings with clang 7.
+