Skip to content

Commit ad5fbce

Browse files
mathstufkwrobot
mathstuf
authored and
kwrobot
committed
Merge topic 'override-usage'
bd8c472 clang-tidy: fix override issues Acked-by: Kitware Robot <[email protected]> Acked-by: Utkarsh Ayachit <[email protected]> Merge-request: !9
2 parents d6bb576 + bd8c472 commit ad5fbce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+82
-82
lines changed

‎Examples/TestingDemo.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ class XMLEventObserver : public pqEventObserver
2828
this->XMLStream = NULL;
2929
}
3030

31-
~XMLEventObserver()
31+
~XMLEventObserver() override
3232
{
3333
delete this->XMLStream;
3434
}
3535

3636
protected:
37-
virtual void setStream(QTextStream* stream)
37+
void setStream(QTextStream* stream) override
3838
{
3939
if (this->XMLStream)
4040
{
@@ -58,8 +58,8 @@ class XMLEventObserver : public pqEventObserver
5858
}
5959
}
6060

61-
virtual void onRecordEvent(const QString& widget, const QString& command,
62-
const QString& arguments, const int& eventType)
61+
void onRecordEvent(const QString& widget, const QString& command,
62+
const QString& arguments, const int& eventType) override
6363
{
6464
if(this->XMLStream)
6565
{
@@ -86,10 +86,10 @@ class XMLEventSource : public pqEventSource
8686

8787
public:
8888
XMLEventSource(QObject* p): Superclass(p) { this->XMLStream = NULL;}
89-
~XMLEventSource() { delete this->XMLStream; }
89+
~XMLEventSource() override { delete this->XMLStream; }
9090

9191
protected:
92-
virtual void setContent(const QString& xmlfilename)
92+
void setContent(const QString& xmlfilename) override
9393
{
9494
delete this->XMLStream;
9595
this->XMLStream = NULL;
@@ -125,7 +125,7 @@ class XMLEventSource : public pqEventSource
125125
}
126126

127127
int getNextEvent(QString& widget, QString& command, QString&
128-
arguments,int& eventType)
128+
arguments,int& eventType) override
129129
{
130130
if (this->XMLStream->atEnd())
131131
{

‎Examples/TestingDemo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class TestingDemo : public QMainWindow
99
Q_OBJECT
1010
public:
1111
TestingDemo();
12-
~TestingDemo();
12+
~TestingDemo() override;
1313
protected slots:
1414
void record();
1515
void play();

‎pq3DViewEventPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class QTTESTING_EXPORT pq3DViewEventPlayer :
5151
pq3DViewEventPlayer(const QByteArray& classname, QObject* p = 0);
5252

5353
using Superclass::playEvent;
54-
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
54+
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error) override;
5555

5656
protected:
5757
QByteArray mClassType;

‎pq3DViewEventTranslator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ class QTTESTING_EXPORT pq3DViewEventTranslator :
5050

5151
public:
5252
pq3DViewEventTranslator(const QByteArray& classname, QObject* p=0);
53-
~pq3DViewEventTranslator();
53+
~pq3DViewEventTranslator() override;
5454

5555
using Superclass::translateEvent;
56-
virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
56+
bool translateEvent(QObject* Object, QEvent* Event, bool& Error) override;
5757

5858
protected:
5959
QByteArray mClassType;

‎pqAbstractActivateEventPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class QTTESTING_EXPORT pqAbstractActivateEventPlayer :
5353
pqAbstractActivateEventPlayer(QObject* p = 0);
5454

5555
using Superclass::playEvent;
56-
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
56+
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error) override;
5757

5858
private:
5959

‎pqAbstractBooleanEventPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class QTTESTING_EXPORT pqAbstractBooleanEventPlayer :
5050
pqAbstractBooleanEventPlayer(QObject* p=0);
5151

5252
using Superclass::playEvent;
53-
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
53+
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error) override;
5454

5555
private:
5656
pqAbstractBooleanEventPlayer(const pqAbstractBooleanEventPlayer&);

‎pqAbstractButtonEventTranslator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class QTTESTING_EXPORT pqAbstractButtonEventTranslator :
5656
pqAbstractButtonEventTranslator(QObject* p=0);
5757

5858
using Superclass::translateEvent;
59-
virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
59+
bool translateEvent(QObject* Object, QEvent* Event, bool& Error) override;
6060

6161
protected:
6262
virtual void onActivate(QAbstractButton*);

‎pqAbstractDoubleEventPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class QTTESTING_EXPORT pqAbstractDoubleEventPlayer :
5151
pqAbstractDoubleEventPlayer(QObject* p=0);
5252

5353
using Superclass::playEvent;
54-
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
54+
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error) override;
5555

5656
private:
5757
pqAbstractDoubleEventPlayer(const pqAbstractDoubleEventPlayer&);

‎pqAbstractIntEventPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class QTTESTING_EXPORT pqAbstractIntEventPlayer :
5252
pqAbstractIntEventPlayer(QObject* p=0);
5353

5454
using Superclass::playEvent;
55-
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
55+
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error) override;
5656

5757
private:
5858
pqAbstractIntEventPlayer(const pqAbstractIntEventPlayer&);

‎pqAbstractItemViewEventPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class QTTESTING_EXPORT pqAbstractItemViewEventPlayer :
5151
pqAbstractItemViewEventPlayer(QObject* p=0);
5252

5353
using Superclass::playEvent;
54-
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
54+
bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error) override;
5555

5656
private:
5757
pqAbstractItemViewEventPlayer(const pqAbstractItemViewEventPlayer&);

0 commit comments

Comments
 (0)