Allow compiling with Qt6

[features.git] / src / frontends / qt / GuiLog.h

diff --git a/src/frontends/qt/GuiLog.h b/src/frontends/qt/GuiLog.h
index ba4a479f5e59ae42e81df42d792b6f687890b786..cd62390fc24514f721448e3805b718b271f67246 100644 (file)
--- a/src/frontends/qt/GuiLog.h
+++ b/src/frontends/qt/GuiLog.h
@@ -32,7 +32,7 @@ public:
        GuiLog(GuiView & lv);
 
 private Q_SLOTS:
-       void updateContents();
+       void updateContents() override;
        /// find content
        void find();
        /// jump to next error message
@@ -46,7 +46,7 @@ private Q_SLOTS:
 
 private:
        /// Apply changes
-       void applyView() {}
+       void applyView() override {}
 
        /// log syntax highlighter
        LogHighlighter * highlighter;
@@ -54,22 +54,29 @@ private:
        /** \param data should contain "<logtype> <logfile>"
         *  where <logtype> is one of "latex", "literate", "lyx2lyx", "vc".
         */
-       bool initialiseParams(std::string const & data);
+       bool initialiseParams(std::string const & data) override;
        ///
-       void clearParams();
+       void clearParams() override;
        ///
-       void dispatchParams() {}
+       void dispatchParams() override {}
        ///
-       bool isBufferDependent() const { return true; }
+       bool isBufferDependent() const override { return true; }
 
        /// The title displayed by the dialog reflects the \c LogType
        docstring title() const;
        /// put the log file into the ostream
        void getContents(std::ostream & ss) const;
+#if QT_VERSION < 0x060000
        /// go to the next occurrence of the RegExp
        void goTo(QRegExp const & exp) const;
        /// does the document after cursor position contain the RegExp?
        bool contains(QRegExp const & exp) const;
+#else
+       /// go to the next occurrence of the RegExp
+       void goTo(QRegularExpression const & exp) const;
+       /// does the document after cursor position contain the RegExp?
+       bool contains(QRegularExpression const & exp) const;
+#endif
 
 private:
        /// Recognized log file-types