summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/peakcan
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2021-01-05 19:19:53 +0100
committerAndre Hartmann <aha_1980@gmx.de>2021-07-22 12:39:13 +0200
commit8199ed388753dda6239a597fb4bb7acba664f73e (patch)
treec46bd7dc1e7ad213a13104ab00b9409a784c39e3 /src/plugins/canbus/peakcan
parentb0a6187e8676719403af42e0efa89d60e266c480 (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/peakcan')
-rw-r--r--src/plugins/canbus/peakcan/peakcanbackend.cpp13
-rw-r--r--src/plugins/canbus/peakcan/peakcanbackend.h7
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 22bcf36..aabfead 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -782,12 +782,6 @@ PeakCanBackend::PeakCanBackend(const QString &name, QObject *parent)
d->setupChannel(name.toLatin1());
d->setupDefaultConfigurations();
-
- std::function<void()> f = std::bind(&PeakCanBackend::resetController, this);
- setResetControllerFunction(f);
-
- std::function<CanBusStatus()> g = std::bind(&PeakCanBackend::busStatus, this);
- setCanBusStatusGetter(g);
}
PeakCanBackend::~PeakCanBackend()
@@ -885,7 +879,12 @@ void PeakCanBackend::resetController()
open();
}
-QCanBusDevice::CanBusStatus PeakCanBackend::busStatus() const
+bool PeakCanBackend::hasBusStatus() const
+{
+ return true;
+}
+
+QCanBusDevice::CanBusStatus PeakCanBackend::busStatus()
{
const TPCANStatus status = ::CAN_GetStatus(d_ptr->channelIndex);
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.h b/src/plugins/canbus/peakcan/peakcanbackend.h
index 5bedd29..5a4fc82 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.h
+++ b/src/plugins/canbus/peakcan/peakcanbackend.h
@@ -72,10 +72,11 @@ public:
static QList<QCanBusDeviceInfo> interfacesByAttachedChannels(bool *ok);
static QList<QCanBusDeviceInfo> interfaces();
-private:
- void resetController();
- CanBusStatus busStatus() const;
+ void resetController() override;
+ bool hasBusStatus() const override;
+ CanBusStatus busStatus() override;
+private:
PeakCanBackendPrivate * const d_ptr;
};