summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-06-20 18:14:40 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-06-23 05:30:51 +0000
commit5939163c59f4df8a479913195ae5458614c0d1bc (patch)
tree87708f328da47b3f43830ec5d28074f0d31c257c
parent118cc17c8637bd0b63b8ebda74624126c2cf5cd2 (diff)
downloadqtserialport-5939163c59f4df8a479913195ae5458614c0d1bc.tar.gz
Add remaining 'Q_DECL_OVERRIDE' to the examples
Change-Id: Ib9590b862413e66189b9f2fde9297af374981b4d Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--examples/serialport/blockingmaster/masterthread.h2
-rw-r--r--examples/serialport/blockingslave/slavethread.h2
-rw-r--r--examples/serialport/terminal/console.h8
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/serialport/blockingmaster/masterthread.h b/examples/serialport/blockingmaster/masterthread.h
index acfd4d9..a00ad6a 100644
--- a/examples/serialport/blockingmaster/masterthread.h
+++ b/examples/serialport/blockingmaster/masterthread.h
@@ -65,7 +65,7 @@ public:
~MasterThread();
void transaction(const QString &portName, int waitTimeout, const QString &request);
- void run();
+ void run() Q_DECL_OVERRIDE;
signals:
void response(const QString &s);
diff --git a/examples/serialport/blockingslave/slavethread.h b/examples/serialport/blockingslave/slavethread.h
index 64ab13e..0d1ff2f 100644
--- a/examples/serialport/blockingslave/slavethread.h
+++ b/examples/serialport/blockingslave/slavethread.h
@@ -65,7 +65,7 @@ public:
~SlaveThread();
void startSlave(const QString &portName, int waitTimeout, const QString &response);
- void run();
+ void run() Q_DECL_OVERRIDE;
signals:
void request(const QString &s);
diff --git a/examples/serialport/terminal/console.h b/examples/serialport/terminal/console.h
index 03b0fb1..5805d8c 100644
--- a/examples/serialport/terminal/console.h
+++ b/examples/serialport/terminal/console.h
@@ -69,10 +69,10 @@ public:
void setLocalEchoEnabled(bool set);
protected:
- virtual void keyPressEvent(QKeyEvent *e);
- virtual void mousePressEvent(QMouseEvent *e);
- virtual void mouseDoubleClickEvent(QMouseEvent *e);
- virtual void contextMenuEvent(QContextMenuEvent *e);
+ void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
+ void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE;
private:
bool localEchoEnabled;