Add more `override` specifiers. Replace `throw()` to `noexcept`.
This commit is contained in:
Yuriy Skalko 2020-10-04 17:56:53 +03:00 committed by Jean-Marc Lasgouttes
parent 8f5bd45460
commit d82adc625b
35 changed files with 168 additions and 168 deletions

View File

@ -33,8 +33,8 @@ class Formats;
class ConversionException : public std::exception { class ConversionException : public std::exception {
public: public:
ConversionException() {} ConversionException() {}
virtual ~ConversionException() throw() {} virtual ~ConversionException() noexcept {}
virtual const char * what() const throw() const char * what() const noexcept override
{ return "Exception caught in conversion routine!"; } { return "Exception caught in conversion routine!"; }
}; };

View File

@ -29,7 +29,7 @@ class EncodingException : public std::exception {
public: public:
EncodingException(char_type c); EncodingException(char_type c);
virtual ~EncodingException() noexcept {} virtual ~EncodingException() noexcept {}
virtual const char * what() const noexcept; virtual const char * what() const noexcept override;
char_type failed_char; char_type failed_char;
int par_id; int par_id;

View File

@ -57,10 +57,10 @@ public:
QString const & unavail = QString()); QString const & unavail = QString());
/// ///
void showPopup(); void showPopup() override;
/// ///
bool eventFilter(QObject * o, QEvent * e); bool eventFilter(QObject * o, QEvent * e) override;
/// ///
QString const & filter() const; QString const & filter() const;

View File

@ -35,7 +35,7 @@ public:
void setKeySequence(lyx::KeySequence const & s); void setKeySequence(lyx::KeySequence const & s);
void removeFromSequence(); void removeFromSequence();
protected Q_SLOTS: protected Q_SLOTS:
bool event(QEvent* e); bool event(QEvent* e) override;
void keyPressEvent(QKeyEvent * e) override; void keyPressEvent(QKeyEvent * e) override;
private: private:
void appendToSequence(QKeyEvent * e); void appendToSequence(QKeyEvent * e);

View File

@ -29,7 +29,7 @@ class EmptyTable : public QTableWidget {
public: public:
EmptyTable(QWidget * parent = 0, int rows = 5, int columns = 5); EmptyTable(QWidget * parent = 0, int rows = 5, int columns = 5);
virtual QSize sizeHint() const; QSize sizeHint() const override;
public Q_SLOTS: public Q_SLOTS:
/// set the number of columns in the table and emit colsChanged() signal /// set the number of columns in the table and emit colsChanged() signal
void setNumberColumns(int nr_cols); void setNumberColumns(int nr_cols);
@ -43,7 +43,7 @@ Q_SIGNALS:
protected: protected:
/// fill in a cell /// fill in a cell
virtual void paintCell(class QPainter *, int, int); virtual void paintCell(class QPainter *, int, int);
virtual void mouseMoveEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *) override;
/// Reset all the cell size to default /// Reset all the cell size to default
virtual void resetCellSize(); virtual void resetCellSize();

View File

@ -30,7 +30,7 @@ class IconButton: public QAbstractButton
Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap) Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
public: public:
explicit IconButton(QWidget *parent = 0); explicit IconButton(QWidget *parent = 0);
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; update(); } void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; update(); }
QPixmap pixmap() const { return m_pixmap; } QPixmap pixmap() const { return m_pixmap; }
float iconOpacity() { return m_iconOpacity; } float iconOpacity() { return m_iconOpacity; }
@ -96,8 +96,8 @@ private Q_SLOTS:
void iconClicked(); void iconClicked();
protected: protected:
virtual void resizeEvent(QResizeEvent *e); void resizeEvent(QResizeEvent *e) override;
virtual void keyPressEvent(QKeyEvent *e) override; void keyPressEvent(QKeyEvent *e) override;
private: private:
void updateMargins(); void updateMargins();

View File

@ -57,10 +57,10 @@ private:
bool expandmacros, bool ignoreformat, bool replace, bool expandmacros, bool ignoreformat, bool replace,
bool keep_case, bool replace_all = false); bool keep_case, bool replace_all = false);
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event) override;
void virtual showEvent(QShowEvent *ev); void virtual showEvent(QShowEvent *ev) override;
void virtual hideEvent(QHideEvent *ev); void virtual hideEvent(QHideEvent *ev) override;
void hideDialog(); void hideDialog();

View File

@ -49,7 +49,7 @@ public:
void apply(BufferParams & params) const; void apply(BufferParams & params) const;
void setUnknownBranches(QStringList const & b) { unknown_branches_ = b; } void setUnknownBranches(QStringList const & b) { unknown_branches_ = b; }
bool eventFilter(QObject * obj, QEvent * event); bool eventFilter(QObject * obj, QEvent * event) override;
Q_SIGNALS: Q_SIGNALS:
void changed(); void changed();

View File

@ -45,7 +45,7 @@ public:
/// reads the clipboard and updates the cached_formats_ /// reads the clipboard and updates the cached_formats_
void update(); void update();
/// returns the cached list of formats supported by the object /// returns the cached list of formats supported by the object
virtual QStringList formats() const { return cached_formats_; } QStringList formats() const override { return cached_formats_; }
/// reads the clipboard and returns the data /// reads the clipboard and returns the data
QByteArray data(QString const & mimeType) const; QByteArray data(QString const & mimeType) const;
@ -67,16 +67,16 @@ public:
/** Clipboard overloaded methods /** Clipboard overloaded methods
*/ */
//@{ //@{
std::string const getAsLyX() const; std::string const getAsLyX() const override;
support::FileName getAsGraphics(Cursor const & cur, GraphicsType type) const; support::FileName getAsGraphics(Cursor const & cur, GraphicsType type) const override;
docstring const getAsText(TextType type) const; docstring const getAsText(TextType type) const override;
void put(std::string const & text) const; void put(std::string const & text) const override;
void put(std::string const & lyx, docstring const & html, docstring const & text); void put(std::string const & lyx, docstring const & html, docstring const & text) override;
bool hasGraphicsContents(GraphicsType type = AnyGraphicsType) const; bool hasGraphicsContents(GraphicsType type = AnyGraphicsType) const override;
bool hasTextContents(TextType typetype = AnyTextType) const; bool hasTextContents(TextType typetype = AnyTextType) const override;
bool isInternal() const; bool isInternal() const override;
bool hasInternal() const; bool hasInternal() const override;
bool empty() const; bool empty() const override;
//@} //@}
support::FileName getPastedGraphicsFileName(Cursor const & cur, support::FileName getPastedGraphicsFileName(Cursor const & cur,

View File

@ -38,7 +38,7 @@ Q_SIGNALS:
protected: protected:
/// ///
virtual bool event(QEvent * e); virtual bool event(QEvent * e) override;
/// ///
virtual void keyPressEvent(QKeyEvent * e) override; virtual void keyPressEvent(QKeyEvent * e) override;
}; };

View File

@ -110,7 +110,7 @@ private:
/// ///
void updateModel(Cursor const & cur, bool popupUpdate, bool inlineUpdate); void updateModel(Cursor const & cur, bool popupUpdate, bool inlineUpdate);
/// ///
bool eventFilter(QObject * watched, QEvent * event); bool eventFilter(QObject * watched, QEvent * event) override;
/// ///
GuiWorkArea * gui_; GuiWorkArea * gui_;

View File

@ -161,8 +161,8 @@ class PrefOutput : public PrefModule, public Ui::PrefOutputUi
public: public:
PrefOutput(GuiPreferences * form); PrefOutput(GuiPreferences * form);
virtual void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
virtual void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
}; };
@ -172,8 +172,8 @@ class PrefInput : public PrefModule, public Ui::PrefInputUi
public: public:
PrefInput(GuiPreferences * form); PrefInput(GuiPreferences * form);
virtual void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
virtual void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void on_firstKeymapPB_clicked(bool); void on_firstKeymapPB_clicked(bool);
@ -192,8 +192,8 @@ class PrefCompletion : public PrefModule, public Ui::PrefCompletionUi
public: public:
PrefCompletion(GuiPreferences * form); PrefCompletion(GuiPreferences * form);
virtual void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
virtual void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
virtual void enableCB(); virtual void enableCB();
private Q_SLOTS: private Q_SLOTS:
void on_popupTextCB_clicked(); void on_popupTextCB_clicked();
@ -207,8 +207,8 @@ class PrefLatex : public PrefModule, public Ui::PrefLatexUi
public: public:
PrefLatex(GuiPreferences * form); PrefLatex(GuiPreferences * form);
virtual void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
virtual void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void on_latexBibtexCO_activated(int n); void on_latexBibtexCO_activated(int n);
@ -231,8 +231,8 @@ class PrefScreenFonts : public PrefModule, public Ui::PrefScreenFontsUi
public: public:
PrefScreenFonts(GuiPreferences * form); PrefScreenFonts(GuiPreferences * form);
virtual void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
virtual void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void selectRoman(const QString&); void selectRoman(const QString&);
@ -250,8 +250,8 @@ class PrefColors : public PrefModule, public Ui::PrefColorsUi
public: public:
PrefColors(GuiPreferences * form); PrefColors(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void changeColor(); void changeColor();
@ -282,8 +282,8 @@ class PrefDisplay : public PrefModule, public Ui::PrefDisplayUi
public: public:
PrefDisplay(GuiPreferences * form); PrefDisplay(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void on_instantPreviewCO_currentIndexChanged(int); void on_instantPreviewCO_currentIndexChanged(int);
@ -296,8 +296,8 @@ class PrefPaths : public PrefModule, public Ui::PrefPathsUi
public: public:
PrefPaths(GuiPreferences * form); PrefPaths(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void selectExampledir(); void selectExampledir();
@ -318,8 +318,8 @@ class PrefSpellchecker : public PrefModule, public Ui::PrefSpellcheckerUi
public: public:
PrefSpellchecker(GuiPreferences * form); PrefSpellchecker(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void on_spellcheckerCB_currentIndexChanged(int); void on_spellcheckerCB_currentIndexChanged(int);
@ -332,8 +332,8 @@ class PrefConverters : public PrefModule, public Ui::PrefConvertersUi
public: public:
PrefConverters(GuiPreferences * form); PrefConverters(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
public Q_SLOTS: public Q_SLOTS:
void updateGui(); void updateGui();
@ -358,8 +358,8 @@ class PrefFileformats : public PrefModule, public Ui::PrefFileformatsUi
public: public:
PrefFileformats(GuiPreferences * form); PrefFileformats(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
void updateView(); void updateView();
Q_SIGNALS: Q_SIGNALS:
@ -402,8 +402,8 @@ class PrefLanguage : public PrefModule, public Ui::PrefLanguageUi
public: public:
PrefLanguage(GuiPreferences * form); PrefLanguage(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
private Q_SLOTS: private Q_SLOTS:
void on_uiLanguageCO_currentIndexChanged(int); void on_uiLanguageCO_currentIndexChanged(int);
@ -421,8 +421,8 @@ class PrefUserInterface : public PrefModule, public Ui::PrefUi
public: public:
PrefUserInterface(GuiPreferences * form); PrefUserInterface(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
public Q_SLOTS: public Q_SLOTS:
void selectUi(); void selectUi();
@ -435,8 +435,8 @@ class PrefDocHandling : public PrefModule, public Ui::PrefDocHandlingUi
public: public:
PrefDocHandling(GuiPreferences * form); PrefDocHandling(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
public Q_SLOTS: public Q_SLOTS:
void on_clearSessionPB_clicked(); void on_clearSessionPB_clicked();
@ -450,8 +450,8 @@ class PrefEdit : public PrefModule, public Ui::PrefEditUi
public: public:
PrefEdit(GuiPreferences * form); PrefEdit(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
public Q_SLOTS: public Q_SLOTS:
void on_fullscreenLimitCB_toggled(bool); void on_fullscreenLimitCB_toggled(bool);
@ -473,8 +473,8 @@ class PrefShortcuts : public PrefModule, public Ui::PrefShortcuts
public: public:
PrefShortcuts(GuiPreferences * form); PrefShortcuts(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
void updateShortcutsTW(); void updateShortcutsTW();
public Q_SLOTS: public Q_SLOTS:
@ -551,8 +551,8 @@ class PrefIdentity : public PrefModule, public Ui::PrefIdentityUi
public: public:
PrefIdentity(GuiPreferences * form); PrefIdentity(GuiPreferences * form);
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const override;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc) override;
}; };

View File

@ -34,24 +34,24 @@ public:
GuiProgress(); GuiProgress();
~GuiProgress(); ~GuiProgress();
void lyxerrConnect(); void lyxerrConnect() override;
void lyxerrDisconnect(); void lyxerrDisconnect() override;
void lyxerrFlush(); void lyxerrFlush() override;
int prompt(docstring const & title, docstring const & question, int prompt(docstring const & title, docstring const & question,
int default_button, int cancel_button, int default_button, int cancel_button,
docstring const & b1, docstring const & b2); docstring const & b1, docstring const & b2) override;
static QString currentTime(); static QString currentTime();
Q_SIGNALS: Q_SIGNALS:
// ProgressInterface // ProgressInterface
void processStarted(QString const &); void processStarted(QString const &) override;
void processFinished(QString const &); void processFinished(QString const &) override;
void appendMessage(QString const &); void appendMessage(QString const &) override;
void appendError(QString const &); void appendError(QString const &) override;
void clearMessages(); void clearMessages() override;
void appendLyXErrMessage(QString const & text); void appendLyXErrMessage(QString const & text);
@ -60,10 +60,10 @@ Q_SIGNALS:
void triggerFlush(); void triggerFlush();
// Alert interface // Alert interface
void warning(QString const & title, QString const & message); void warning(QString const & title, QString const & message) override;
void toggleWarning(QString const & title, QString const & msg, QString const & formatted); void toggleWarning(QString const & title, QString const & msg, QString const & formatted) override;
void error(QString const & title, QString const & message, QString const & details = QString()); void error(QString const & title, QString const & message, QString const & details = QString()) override;
void information(QString const & title, QString const & message); void information(QString const & title, QString const & message) override;
private Q_SLOTS: private Q_SLOTS:
void doProcessStarted(QString const &); void doProcessStarted(QString const &);

View File

@ -34,10 +34,10 @@ public:
/** Selection overloaded methods /** Selection overloaded methods
*/ */
//@{ //@{
void haveSelection(bool own); void haveSelection(bool own) override;
docstring const get() const; docstring const get() const override;
void put(docstring const & str); void put(docstring const & str) override;
bool empty() const; bool empty() const override;
//@} //@}
private Q_SLOTS: private Q_SLOTS:

View File

@ -133,7 +133,7 @@ protected Q_SLOTS:
/// ///
void availableLV_doubleClicked(const QModelIndex &); void availableLV_doubleClicked(const QModelIndex &);
/// ///
bool eventFilter(QObject *, QEvent *); bool eventFilter(QObject *, QEvent *) override;
/// ///
void updateButtons(); void updateButtons();

View File

@ -97,8 +97,8 @@ public Q_SLOTS:
void setAll(BorderState); void setAll(BorderState);
protected: protected:
void mousePressEvent(QMouseEvent * e); void mousePressEvent(QMouseEvent * e) override;
void paintEvent(QPaintEvent * e); void paintEvent(QPaintEvent * e) override;
private: private:
void init(); void init();

View File

@ -51,7 +51,7 @@ private Q_SLOTS:
private: private:
/// ///
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event) override;
struct Private; struct Private;
Private * const d; Private * const d;
}; };

View File

@ -73,11 +73,11 @@ public:
protected: protected:
/// ///
void initialize(); void initialize() override;
protected Q_SLOTS: protected Q_SLOTS:
/// ///
void updateTriggered(); void updateTriggered() override;
}; };
@ -103,7 +103,7 @@ public:
static bool isMenuType(std::string const & s); static bool isMenuType(std::string const & s);
protected: protected:
/// ///
void initialize(); void initialize() override;
/// ///
void loadFlexInsets(); void loadFlexInsets();
/// pimpl so we don't have to include big files /// pimpl so we don't have to include big files
@ -111,7 +111,7 @@ protected:
Private * d; Private * d;
protected Q_SLOTS: protected Q_SLOTS:
/// ///
void updateTriggered(); void updateTriggered() override;
}; };
@ -124,7 +124,7 @@ public:
/// Reimplemented from QToolbar to detect whether the /// Reimplemented from QToolbar to detect whether the
/// toolbar is restored with MainWindow::restoreState(). /// toolbar is restored with MainWindow::restoreState().
void setVisible(bool visible); void setVisible(bool visible) override;
/// ///
void setVisibility(int visibility); void setVisibility(int visibility);

View File

@ -110,7 +110,7 @@ public:
/// display a message in the view /// display a message in the view
/// could be called from any thread /// could be called from any thread
void message(docstring const &); void message(docstring const &) override;
bool getStatus(FuncRequest const & cmd, FuncStatus & flag); bool getStatus(FuncRequest const & cmd, FuncStatus & flag);
/// dispatch command. /// dispatch command.
@ -130,7 +130,7 @@ public:
bool hasFocus() const; bool hasFocus() const;
/// ///
void focusInEvent(QFocusEvent * e); void focusInEvent(QFocusEvent * e) override;
/// Add a Buffer to the View /// Add a Buffer to the View
/// \param b Buffer to set. /// \param b Buffer to set.
/// \param switch_to Whether to set it to the current workarea. /// \param switch_to Whether to set it to the current workarea.
@ -166,12 +166,12 @@ public:
/// \name GuiBufferDelegate. /// \name GuiBufferDelegate.
//@{ //@{
void resetAutosaveTimers(); void resetAutosaveTimers() override;
// shows an error list // shows an error list
// if from_master is true, show master's error list // if from_master is true, show master's error list
void errors(std::string const &, bool from_master = false); void errors(std::string const &, bool from_master = false) override;
void structureChanged(); void structureChanged() override;
void updateTocItem(std::string const &, DocIterator const &); void updateTocItem(std::string const &, DocIterator const &) override;
//@} //@}
/// ///
@ -282,17 +282,17 @@ private:
/// disconnect from signals in the given buffer /// disconnect from signals in the given buffer
void disconnectBuffer(); void disconnectBuffer();
/// ///
void dragEnterEvent(QDragEnterEvent * ev); void dragEnterEvent(QDragEnterEvent * ev) override;
/// ///
void dropEvent(QDropEvent * ev); void dropEvent(QDropEvent * ev) override;
/// make sure we quit cleanly /// make sure we quit cleanly
void closeEvent(QCloseEvent * e) override; void closeEvent(QCloseEvent * e) override;
/// ///
void showEvent(QShowEvent *) override; void showEvent(QShowEvent *) override;
/// in order to catch Tab key press. /// in order to catch Tab key press.
bool event(QEvent * e); bool event(QEvent * e) override;
bool focusNextPrevChild(bool); bool focusNextPrevChild(bool) override;
/// ///
bool goToFileRow(std::string const & argument); bool goToFileRow(std::string const & argument);
@ -338,13 +338,13 @@ public:
the current cursor position or modify an existing, 'open' inset? the current cursor position or modify an existing, 'open' inset?
*/ */
void showDialog(std::string const & name, void showDialog(std::string const & name,
std::string const & data, Inset * inset = 0); std::string const & data, Inset * inset = 0) override;
/** \param name == "citation", "bibtex" etc; an identifier used /** \param name == "citation", "bibtex" etc; an identifier used
to reset the contents of a particular dialog with \param data. to reset the contents of a particular dialog with \param data.
See the comments to 'show', above. See the comments to 'show', above.
*/ */
void updateDialog(std::string const & name, std::string const & data); void updateDialog(std::string const & name, std::string const & data) override;
/** All Dialogs of the given \param name will be closed if they are /** All Dialogs of the given \param name will be closed if they are
connected to the given \param inset. connected to the given \param inset.

View File

@ -79,7 +79,7 @@ private:
void getContent(BufferView const & view, Buffer::OutputWhat output, void getContent(BufferView const & view, Buffer::OutputWhat output,
docstring & str, std::string const & format, bool master); docstring & str, std::string const & format, bool master);
/// Grab double clicks on the viewport /// Grab double clicks on the viewport
bool eventFilter(QObject * obj, QEvent * event); bool eventFilter(QObject * obj, QEvent * event) override;
/// ///
QTextDocument * document_; QTextDocument * document_;
/// LaTeX syntax highlighter /// LaTeX syntax highlighter

View File

@ -64,7 +64,7 @@ public:
/// ///
BufferView const & bufferView() const; BufferView const & bufferView() const;
/// ///
void scheduleRedraw(bool update_metrics); void scheduleRedraw(bool update_metrics) override;
/// return true if the key is part of a shortcut /// return true if the key is part of a shortcut
bool queryKeySym(KeySymbol const & key, KeyModifier mod) const; bool queryKeySym(KeySymbol const & key, KeyModifier mod) const;
@ -114,42 +114,42 @@ private Q_SLOTS:
void toggleCaret(); void toggleCaret();
/// close this work area. /// close this work area.
/// Slot for Buffer::closing signal. /// Slot for Buffer::closing signal.
void close(); void close() override;
/// Slot to restore proper scrollbar behaviour. /// Slot to restore proper scrollbar behaviour.
void fixVerticalScrollBar(); void fixVerticalScrollBar();
private: private:
/// Update window titles of all users. /// Update window titles of all users.
void updateWindowTitle(); void updateWindowTitle() override;
/// ///
bool event(QEvent *); bool event(QEvent *) override;
/// ///
void contextMenuEvent(QContextMenuEvent *); void contextMenuEvent(QContextMenuEvent *) override;
/// ///
void focusInEvent(QFocusEvent *); void focusInEvent(QFocusEvent *) override;
/// ///
void focusOutEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *) override;
/// repaint part of the widget /// repaint part of the widget
void paintEvent(QPaintEvent * ev); void paintEvent(QPaintEvent * ev) override;
/// widget has been resized /// widget has been resized
void resizeEvent(QResizeEvent * ev); void resizeEvent(QResizeEvent * ev) override;
/// mouse button press /// mouse button press
void mousePressEvent(QMouseEvent * ev); void mousePressEvent(QMouseEvent * ev) override;
/// mouse button release /// mouse button release
void mouseReleaseEvent(QMouseEvent * ev); void mouseReleaseEvent(QMouseEvent * ev) override;
/// mouse double click of button /// mouse double click of button
void mouseDoubleClickEvent(QMouseEvent * ev); void mouseDoubleClickEvent(QMouseEvent * ev) override;
/// mouse motion /// mouse motion
void mouseMoveEvent(QMouseEvent * ev); void mouseMoveEvent(QMouseEvent * ev) override;
/// wheel event /// wheel event
void wheelEvent(QWheelEvent * ev); void wheelEvent(QWheelEvent * ev) override;
/// key press event. It also knows how to handle ShortcutOverride events to /// key press event. It also knows how to handle ShortcutOverride events to
/// avoid code duplication. /// avoid code duplication.
void keyPressEvent(QKeyEvent * ev) override; void keyPressEvent(QKeyEvent * ev) override;
/// IM events /// IM events
void inputMethodEvent(QInputMethodEvent * ev); void inputMethodEvent(QInputMethodEvent * ev) override;
/// IM query /// IM query
QVariant inputMethodQuery(Qt::InputMethodQuery query) const; QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
/// The slot connected to SyntheticMouseEvent::timeout. /// The slot connected to SyntheticMouseEvent::timeout.
void generateSyntheticMouseEvent(); void generateSyntheticMouseEvent();
@ -189,7 +189,7 @@ public:
void setWidgetResizable(bool) {} void setWidgetResizable(bool) {}
void setWidget(QWidget *) {} void setWidget(QWidget *) {}
QSize sizeHint () const; QSize sizeHint () const override;
/// ///
void disable(); void disable();
@ -228,7 +228,7 @@ public:
GuiWorkArea * currentWorkArea() const; GuiWorkArea * currentWorkArea() const;
GuiWorkArea * workArea(Buffer & buffer) const; GuiWorkArea * workArea(Buffer & buffer) const;
GuiWorkArea * workArea(int index) const; GuiWorkArea * workArea(int index) const;
void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
Q_SIGNALS: Q_SIGNALS:
/// ///
@ -254,10 +254,10 @@ private Q_SLOTS:
/// ///
void showContextMenu(const QPoint & pos); void showContextMenu(const QPoint & pos);
/// enable closing tab on middle-click /// enable closing tab on middle-click
void mousePressEvent(QMouseEvent * me); void mousePressEvent(QMouseEvent * me) override;
void mouseReleaseEvent(QMouseEvent * me); void mouseReleaseEvent(QMouseEvent * me) override;
/// ///
void mouseDoubleClickEvent(QMouseEvent * event); void mouseDoubleClickEvent(QMouseEvent * event) override;
/// ///
int indexOfWorkArea(GuiWorkArea * w) const; int indexOfWorkArea(GuiWorkArea * w) const;

View File

@ -27,13 +27,13 @@ class TearOff : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
TearOff(QWidget * parent); TearOff(QWidget * parent);
void enterEvent(QEvent *); void enterEvent(QEvent *) override;
void leaveEvent(QEvent *); void leaveEvent(QEvent *) override;
void mouseReleaseEvent (QMouseEvent *); void mouseReleaseEvent (QMouseEvent *) override;
Q_SIGNALS: Q_SIGNALS:
void tearOff(); void tearOff();
protected: protected:
void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
private: private:
bool highlighted_; bool highlighted_;
}; };
@ -55,7 +55,7 @@ Q_SIGNALS:
protected: protected:
void showEvent(QShowEvent * event) override; void showEvent(QShowEvent * event) override;
void hideEvent(QHideEvent * event) override; void hideEvent(QHideEvent * event) override;
void paintEvent(QPaintEvent * event); void paintEvent(QPaintEvent * event) override;
private Q_SLOTS: private Q_SLOTS:
void tearOff(); void tearOff();

View File

@ -37,10 +37,10 @@ public Q_SLOTS:
void updateParent(); void updateParent();
protected Q_SLOTS: protected Q_SLOTS:
void mouseMoveEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *) override;
void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
void mousePressEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *) override;
void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
private: private:
//! update the geometry //! update the geometry

View File

@ -49,7 +49,7 @@ public:
void showPopup(); void showPopup();
/// ///
bool eventFilter(QObject * o, QEvent * e); bool eventFilter(QObject * o, QEvent * e) override;
/// ///
QString const & filter() const; QString const & filter() const;

View File

@ -50,7 +50,7 @@ public:
/// ///
bool isCurrentPanel(QString const & name) const; bool isCurrentPanel(QString const & name) const;
/// ///
QSize sizeHint() const; QSize sizeHint() const override;
public Q_SLOTS: public Q_SLOTS:
/// the option filter changed /// the option filter changed

View File

@ -27,7 +27,7 @@ class ToolTipFormatter : public QObject {
public: public:
ToolTipFormatter(QObject * parent); ToolTipFormatter(QObject * parent);
protected: protected:
bool eventFilter(QObject * o, QEvent * e); bool eventFilter(QObject * o, QEvent * e) override;
}; };

View File

@ -54,7 +54,7 @@ public:
/** @returns QValidator::Acceptable if @c data is a GlueLength. /** @returns QValidator::Acceptable if @c data is a GlueLength.
* If not, returns QValidator::Intermediate. * If not, returns QValidator::Intermediate.
*/ */
QValidator::State validate(QString & data, int &) const; QValidator::State validate(QString & data, int &) const override;
/** @name Bottom /** @name Bottom
* Set and retrieve the minimum allowed Length value. * Set and retrieve the minimum allowed Length value.
@ -98,7 +98,7 @@ public:
/** @returns QValidator::Acceptable if @c data is a GlueLength /** @returns QValidator::Acceptable if @c data is a GlueLength
* or is "auto". If not, returns QValidator::Intermediate. * or is "auto". If not, returns QValidator::Intermediate.
*/ */
QValidator::State validate(QString & data, int &) const; QValidator::State validate(QString & data, int &) const override;
private: private:
QString autotext_; QString autotext_;
@ -120,7 +120,7 @@ public:
DoubleAutoValidator(QWidget * parent, QString const & autotext); DoubleAutoValidator(QWidget * parent, QString const & autotext);
DoubleAutoValidator(double bottom, double top, int decimals, DoubleAutoValidator(double bottom, double top, int decimals,
QObject * parent); QObject * parent);
QValidator::State validate(QString & input, int & pos) const; QValidator::State validate(QString & input, int & pos) const override;
private: private:
QString autotext_; QString autotext_;
@ -135,7 +135,7 @@ public:
// Define a validator. // Define a validator.
NoNewLineValidator(QWidget *); NoNewLineValidator(QWidget *);
// Remove newline characters from input. // Remove newline characters from input.
QValidator::State validate(QString &, int &) const; QValidator::State validate(QString &, int &) const override;
}; };
@ -157,7 +157,7 @@ public:
/** @returns QValidator::Acceptable if @c data is a valid path. /** @returns QValidator::Acceptable if @c data is a valid path.
* If not, returns QValidator::Intermediate. * If not, returns QValidator::Intermediate.
*/ */
QValidator::State validate(QString &, int &) const; QValidator::State validate(QString &, int &) const override;
/** Define what checks that @c validate() will perform. /** Define what checks that @c validate() will perform.
* @param doc_type checks are activated only for @c LATEX docs. * @param doc_type checks are activated only for @c LATEX docs.

View File

@ -1032,9 +1032,9 @@ public:
// this should return true if we have a "normal" cell, otherwise false. // this should return true if we have a "normal" cell, otherwise false.
// "normal" means without width set! // "normal" means without width set!
/// should all paragraphs be output with "Standard" layout? /// should all paragraphs be output with "Standard" layout?
virtual bool allowParagraphCustomization(idx_type cell = 0) const override; bool allowParagraphCustomization(idx_type cell = 0) const override;
/// ///
virtual bool forcePlainLayout(idx_type cell = 0) const override; bool forcePlainLayout(idx_type cell = 0) const override;
/// ///
void addPreview(DocIterator const & inset_pos, void addPreview(DocIterator const & inset_pos,
graphics::PreviewLoader &) const override; graphics::PreviewLoader &) const override;

View File

@ -27,7 +27,7 @@ public:
/// ///
bool idxUpDown(Cursor & cur, bool up) const override; bool idxUpDown(Cursor & cur, bool up) const override;
/// ///
bool idxForward(Cursor & cur) const; bool idxForward(Cursor & cur) const override;
/// ///
bool idxBackward(Cursor & cur) const override; bool idxBackward(Cursor & cur) const override;
/// ///

View File

@ -29,13 +29,13 @@ public:
virtual ~MathCompletionList(); virtual ~MathCompletionList();
/// ///
virtual bool sorted() const { return false; } bool sorted() const override { return false; }
/// ///
virtual size_t size() const; size_t size() const override;
/// ///
virtual docstring const & data(size_t idx) const; docstring const & data(size_t idx) const override;
/// ///
virtual std::string icon(size_t idx) const; std::string icon(size_t idx) const override;
/// ///
static void addToFavorites(docstring const & completion); static void addToFavorites(docstring const & completion);

View File

@ -50,8 +50,8 @@ public:
: type_(type), title_(title), details_(details), : type_(type), title_(title), details_(details),
message_(to_utf8(title_ + docstring::value_type('\n') + details_)) {} message_(to_utf8(title_ + docstring::value_type('\n') + details_)) {}
virtual const char * what() const throw() { return message_.c_str(); } const char * what() const noexcept override { return message_.c_str(); }
virtual ~ExceptionMessage() throw() {} virtual ~ExceptionMessage() noexcept {}
ExceptionType type_; ExceptionType type_;
docstring title_; docstring title_;

View File

@ -35,9 +35,9 @@ public:
// //
~RevertibleRef() { revert(); } ~RevertibleRef() { revert(); }
// //
void revert() { if (enabled) { enabled = false; ref = old; } } void revert() override { if (enabled) { enabled = false; ref = old; } }
// //
void keep() { enabled = false; } void keep() override { enabled = false; }
// //
X & ref; X & ref;
X const old; X const old;

View File

@ -236,11 +236,11 @@ protected:
} }
return retval; return retval;
} }
int do_encoding() const throw() override int do_encoding() const noexcept override
{ {
return 0; return 0;
} }
bool do_always_noconv() const throw() override bool do_always_noconv() const noexcept override
{ {
return false; return false;
} }
@ -266,7 +266,7 @@ protected:
return min(length, max); return min(length, max);
#endif #endif
} }
int do_max_length() const throw() override int do_max_length() const noexcept override
{ {
return lyx::max_encoded_bytes(encoding_); return lyx::max_encoded_bytes(encoding_);
} }
@ -322,7 +322,7 @@ void setEncoding(Ios & ios, string const & encoding, ios_base::openmode mode)
} }
const char * iconv_codecvt_facet_exception::what() const throw() const char * iconv_codecvt_facet_exception::what() const noexcept
{ {
return "iconv problem in iconv_codecvt_facet initialization"; return "iconv problem in iconv_codecvt_facet initialization";
} }
@ -483,14 +483,14 @@ codecvt<lyx::char_type, char, mbstate_t>::do_in(
template<> template<>
int codecvt<lyx::char_type, char, mbstate_t>::do_encoding() const throw() int codecvt<lyx::char_type, char, mbstate_t>::do_encoding() const noexcept
{ {
return 0; return 0;
} }
template<> template<>
bool codecvt<lyx::char_type, char, mbstate_t>::do_always_noconv() const throw() bool codecvt<lyx::char_type, char, mbstate_t>::do_always_noconv() const noexcept
{ {
return true; return true;
} }
@ -503,7 +503,7 @@ int codecvt<lyx::char_type, char, mbstate_t>::do_length(
} }
template<> template<>
int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const throw() int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const noexcept
{ {
return 4; return 4;
} }

View File

@ -21,8 +21,8 @@ namespace lyx {
class iconv_codecvt_facet_exception : public std::exception { class iconv_codecvt_facet_exception : public std::exception {
public: public:
virtual ~iconv_codecvt_facet_exception() throw() {} virtual ~iconv_codecvt_facet_exception() noexcept {}
virtual const char * what() const throw(); const char * what() const noexcept override;
}; };
/// Base class for UCS4 input streams /// Base class for UCS4 input streams

View File

@ -113,9 +113,9 @@ docstring const from_local8bit(string const & s)
/// Exception thrown by to_local8bit if the string could not be converted /// Exception thrown by to_local8bit if the string could not be converted
class to_local8bit_failure : public bad_cast { class to_local8bit_failure : public bad_cast {
public: public:
to_local8bit_failure() throw() : bad_cast() {} to_local8bit_failure() noexcept : bad_cast() {}
virtual ~to_local8bit_failure() throw() {} virtual ~to_local8bit_failure() noexcept {}
const char* what() const throw() override const char* what() const noexcept override
{ {
return "A string could not be converted from unicode to the local 8 bit encoding."; return "A string could not be converted from unicode to the local 8 bit encoding.";
} }
@ -280,9 +280,9 @@ namespace lyx {
class ctype_failure : public bad_cast { class ctype_failure : public bad_cast {
public: public:
ctype_failure() throw() : bad_cast() {} ctype_failure() noexcept : bad_cast() {}
virtual ~ctype_failure() throw() {} virtual ~ctype_failure() noexcept {}
const char* what() const throw() override const char* what() const noexcept override
{ {
return "The ctype<lyx::char_type> locale facet does only support ASCII characters on this platform."; return "The ctype<lyx::char_type> locale facet does only support ASCII characters on this platform.";
} }
@ -291,9 +291,9 @@ public:
class num_put_failure : public bad_cast { class num_put_failure : public bad_cast {
public: public:
num_put_failure() throw() : bad_cast() {} num_put_failure() noexcept : bad_cast() {}
virtual ~num_put_failure() throw() {} virtual ~num_put_failure() noexcept {}
const char* what() const throw() override const char* what() const noexcept override
{ {
return "The num_put locale facet does only support ASCII characters on this platform."; return "The num_put locale facet does only support ASCII characters on this platform.";
} }