summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/tinycan
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-04-25 14:46:28 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-04-26 15:19:32 +0000
commit95058b1d51846da3004ad29673c3a413f184b1b0 (patch)
tree5d8d7c6068c92301320bb2edf387e3f77d98c23a /src/plugins/canbus/tinycan
parentedf55f657a46fe16bf80d63f523848bb9b71d9f3 (diff)
Replace 'Q_DECL_OVERRIDE' with 'override'
Change-Id: Iebbd61359296499600fe164429e710273a94b86d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/canbus/tinycan')
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.cpp2
-rw-r--r--src/plugins/canbus/tinycan/tinycanbackend.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 2f5b62b..35c50b4 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -82,7 +82,7 @@ public:
}
protected:
- void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE
+ void timerEvent(QTimerEvent *e) override
{
if (e->timerId() == timerId()) {
dptr->canWriteNotification();
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h
index 693dd83..5b71f19 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.h
+++ b/src/plugins/canbus/tinycan/tinycanbackend.h
@@ -59,14 +59,14 @@ public:
explicit TinyCanBackend(const QString &name, QObject *parent = nullptr);
~TinyCanBackend();
- bool open() Q_DECL_OVERRIDE;
- void close() Q_DECL_OVERRIDE;
+ bool open() override;
+ void close() override;
- void setConfigurationParameter(int key, const QVariant &value) Q_DECL_OVERRIDE;
+ void setConfigurationParameter(int key, const QVariant &value) override;
- bool writeFrame(const QCanBusFrame &newData) Q_DECL_OVERRIDE;
+ bool writeFrame(const QCanBusFrame &newData) override;
- QString interpretErrorFrame(const QCanBusFrame &errorFrame) Q_DECL_OVERRIDE;
+ QString interpretErrorFrame(const QCanBusFrame &errorFrame) override;
static bool canCreate(QString *errorReason);