diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2019-09-04 21:01:43 +0200 |
|---|---|---|
| committer | Andre Hartmann <aha_1980@gmx.de> | 2019-09-05 08:22:00 +0200 |
| commit | d25ad10a039514516460f8e446ea734baf69fed1 (patch) | |
| tree | 54bf79bb2e343f5ab621abaaa4ef279af637772c | |
| parent | 535615a4dc6430ac4b0512b6705721c75e160b10 (diff) | |
QCanBusDevice: Improve callback register functions
Change-Id: I9c2b985768be34308580940c4013448d027fc75b
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | src/serialbus/qcanbusdevice.cpp | 8 | ||||
| -rw-r--r-- | src/serialbus/qcanbusdevice.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp index 9256bc8..8eb45c1 100644 --- a/src/serialbus/qcanbusdevice.cpp +++ b/src/serialbus/qcanbusdevice.cpp @@ -347,11 +347,11 @@ bool QCanBusDevice::hasOutgoingFrames() const * Called from the derived plugin to register a function that performs the * CAN controller hardware reset when \a resetController() is called. */ -void QCanBusDevice::setResetControllerFunction(std::function<void()> &resetter) +void QCanBusDevice::setResetControllerFunction(std::function<void()> resetter) { Q_D(QCanBusDevice); - d->m_resetControllerFunction = resetter; + d->m_resetControllerFunction = std::move(resetter); } /*! @@ -359,11 +359,11 @@ void QCanBusDevice::setResetControllerFunction(std::function<void()> &resetter) * Called from the derived plugin to register a function that returns the * CAN controller bus status when \a busStatus() is called. */ -void QCanBusDevice::setCanBusStatusGetter(std::function<CanBusStatus()> &busStatusGetter) +void QCanBusDevice::setCanBusStatusGetter(std::function<CanBusStatus()> busStatusGetter) { Q_D(QCanBusDevice); - d->m_busStatusGetter = busStatusGetter; + d->m_busStatusGetter = std::move(busStatusGetter); } /*! diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h index 1844f4b..476e77e 100644 --- a/src/serialbus/qcanbusdevice.h +++ b/src/serialbus/qcanbusdevice.h @@ -182,8 +182,8 @@ protected: virtual bool open() = 0; virtual void close() = 0; - void setResetControllerFunction(std::function<void()> &resetter); - void setCanBusStatusGetter(std::function<CanBusStatus()> &busStatusGetter); + void setResetControllerFunction(std::function<void()> resetter); + void setCanBusStatusGetter(std::function<CanBusStatus()> busStatusGetter); static QCanBusDeviceInfo createDeviceInfo(const QString &name, bool isVirtual = false, |