summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/socketcan/socketcanbackend.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/canbus/socketcan/socketcanbackend.cpp')
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 4592840..134596d 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -171,16 +171,6 @@ SocketCanBackend::SocketCanBackend(const QString &name) :
}
resetConfigurations();
-
- std::function<void()> f = std::bind(&SocketCanBackend::resetController, this);
- setResetControllerFunction(f);
-
- if (hasBusStatus()) {
- // Only register busStatus when libsocketcan is available
- // QCanBusDevice::hasBusStatus() will return false otherwise
- std::function<CanBusStatus()> g = std::bind(&SocketCanBackend::busStatus, this);
- setCanBusStatusGetter(g);
- }
}
SocketCanBackend::~SocketCanBackend()
@@ -758,7 +748,7 @@ bool SocketCanBackend::hasBusStatus() const
return libSocketCan->hasBusStatus();
}
-QCanBusDevice::CanBusStatus SocketCanBackend::busStatus() const
+QCanBusDevice::CanBusStatus SocketCanBackend::busStatus()
{
return libSocketCan->busStatus(canSocketName);
}