diff options
Diffstat (limited to 'tests/auto/gui/util')
-rw-r--r-- | tests/auto/gui/util/qundogroup/tst_qundogroup.cpp | 16 | ||||
-rw-r--r-- | tests/auto/gui/util/qundostack/tst_qundostack.cpp | 28 |
2 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp index 617e0239e1..5f82bd8442 100644 --- a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp @@ -40,8 +40,8 @@ public: InsertCommand(QString *str, int idx, const QString &text, QUndoCommand *parent = 0); - virtual void undo(); - virtual void redo(); + virtual void undo() override; + virtual void redo() override; private: QString *m_str; @@ -54,8 +54,8 @@ class RemoveCommand : public QUndoCommand public: RemoveCommand(QString *str, int idx, int len, QUndoCommand *parent = 0); - virtual void undo(); - virtual void redo(); + virtual void undo() override; + virtual void redo() override; private: QString *m_str; @@ -68,10 +68,10 @@ class AppendCommand : public QUndoCommand public: AppendCommand(QString *str, const QString &text, QUndoCommand *parent = 0); - virtual void undo(); - virtual void redo(); - virtual int id() const; - virtual bool mergeWith(const QUndoCommand *other); + virtual void undo() override; + virtual void redo() override; + virtual int id() const override; + virtual bool mergeWith(const QUndoCommand *other) override; bool merged; diff --git a/tests/auto/gui/util/qundostack/tst_qundostack.cpp b/tests/auto/gui/util/qundostack/tst_qundostack.cpp index a24798cba7..9415f1325c 100644 --- a/tests/auto/gui/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/gui/util/qundostack/tst_qundostack.cpp @@ -41,8 +41,8 @@ public: InsertCommand(QString *str, int idx, const QString &text, QUndoCommand *parent = 0); - virtual void undo(); - virtual void redo(); + virtual void undo() override; + virtual void redo() override; private: QString *m_str; @@ -55,8 +55,8 @@ class RemoveCommand : public QUndoCommand public: RemoveCommand(QString *str, int idx, int len, QUndoCommand *parent = 0); - virtual void undo(); - virtual void redo(); + virtual void undo() override; + virtual void redo() override; private: QString *m_str; @@ -71,10 +71,10 @@ public: QUndoCommand *parent = 0); ~AppendCommand(); - virtual void undo(); - virtual void redo(); - virtual int id() const; - virtual bool mergeWith(const QUndoCommand *other); + virtual void undo() override; + virtual void redo() override; + virtual int id() const override; + virtual bool mergeWith(const QUndoCommand *other) override; bool merged; bool fail_merge; @@ -91,8 +91,8 @@ public: IdleCommand(QUndoCommand *parent = 0); ~IdleCommand(); - virtual void undo(); - virtual void redo(); + virtual void undo() override; + virtual void redo() override; }; class MoveMouseCommand : public QUndoCommand @@ -101,10 +101,10 @@ public: MoveMouseCommand(QPoint *mouse, QPoint oldPoint, QPoint newPoint, QUndoCommand *parent = 0); ~MoveMouseCommand(); - virtual void undo(); - virtual void redo(); - virtual int id() const; - virtual bool mergeWith(const QUndoCommand *other); + virtual void undo() override; + virtual void redo() override; + virtual int id() const override; + virtual bool mergeWith(const QUndoCommand *other) override; private: QPoint *m_mouse; |