diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2021-01-05 19:19:53 +0100 |
|---|---|---|
| committer | Andre Hartmann <aha_1980@gmx.de> | 2021-07-22 12:39:13 +0200 |
| commit | 8199ed388753dda6239a597fb4bb7acba664f73e (patch) | |
| tree | c46bd7dc1e7ad213a13104ab00b9409a784c39e3 /src/plugins/canbus/tinycan | |
| parent | b0a6187e8676719403af42e0efa89d60e266c480 (diff) | |
CAN: Make functions that should be virtual such
They were not during Qt 5 times due to our
binary compatibility promise.
Pick-to: 6.2
Change-Id: Ia5ddb114db9dc552515df5ab4b22d0c962a0a341
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/tinycan')
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index bffcbf9..6ece35e 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -503,9 +503,6 @@ TinyCanBackend::TinyCanBackend(const QString &name, QObject *parent) d->setupChannel(name); d->setupDefaultConfigurations(); - - std::function<void()> f = std::bind(&TinyCanBackend::resetController, this); - setResetControllerFunction(f); } TinyCanBackend::~TinyCanBackend() diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h index a9c577b..ed28905 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.h +++ b/src/plugins/canbus/tinycan/tinycanbackend.h @@ -70,9 +70,9 @@ public: static bool canCreate(QString *errorReason); static QList<QCanBusDeviceInfo> interfaces(); -private: - void resetController(); + void resetController() override; +private: TinyCanBackendPrivate * const d_ptr; }; |