diff options
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.h | 2 | ||||
-rw-r--r-- | src/serialbus/qcanbusdevice.cpp | 6 | ||||
-rw-r--r-- | src/serialbus/qcanbusdevice.h | 2 | ||||
-rw-r--r-- | tests/auto/plugins/genericcanbus/dummybackend.cpp | 2 | ||||
-rw-r--r-- | tests/auto/plugins/genericcanbus/dummybackend.h | 2 | ||||
-rw-r--r-- | tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 7fb51e8..ab81b0f 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -234,7 +234,7 @@ bool SocketCanBackend::connectSocket() return true; } -qint64 SocketCanBackend::availableFrames() const +qint64 SocketCanBackend::framesAvailable() const { return frameBuffer.size(); } diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h index 9295978..229b796 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.h +++ b/src/plugins/canbus/socketcan/socketcanbackend.h @@ -65,7 +65,7 @@ public: QVariant configurationParameter(const QString &key) const Q_DECL_OVERRIDE; QVector<QString> configurationKeys() const Q_DECL_OVERRIDE; - qint64 availableFrames() const Q_DECL_OVERRIDE; + qint64 framesAvailable() const Q_DECL_OVERRIDE; QCanBusFrame readFrame() Q_DECL_OVERRIDE; bool writeFrame(const QCanBusFrame &newData) Q_DECL_OVERRIDE; diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp index 192647a..8a8e5fb 100644 --- a/src/serialbus/qcanbusdevice.cpp +++ b/src/serialbus/qcanbusdevice.cpp @@ -198,7 +198,7 @@ QString QCanBusDevice::errorString() const } /*! - \fn qint64 QCanBusDevice::availableFrames() const + \fn qint64 QCanBusDevice::framesAvailable() const Returns the number of available frames. If no frames are available, this function returns 0. @@ -234,7 +234,7 @@ QString QCanBusDevice::errorString() const \fn void QCanBusDevice::frameReceived() This signal is emitted when one or more frames have been received. - The frames should be read using \l readFrame() and \l availableFrames(). + The frames should be read using \l readFrame() and \l framesAvailable(). */ /*! @@ -245,7 +245,7 @@ QString QCanBusDevice::errorString() const The queue operates according to the FIFO principle. - \sa availableFrames() + \sa framesAvailable() */ /*! diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h index 9ebc477..1899bd2 100644 --- a/src/serialbus/qcanbusdevice.h +++ b/src/serialbus/qcanbusdevice.h @@ -80,7 +80,7 @@ public: virtual bool writeFrame(const QCanBusFrame &frame) = 0; virtual QCanBusFrame readFrame() = 0; - virtual qint64 availableFrames() const = 0; + virtual qint64 framesAvailable() const = 0; //TODO currently assumes unbuffered write. Add support for buffered writes // qint64 framesToWrite() const diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp index 9e51cf2..8a2e60f 100644 --- a/tests/auto/plugins/genericcanbus/dummybackend.cpp +++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp @@ -73,7 +73,7 @@ void DummyBackend::sendMessage() #define MAX_PACKAGE_SIZE 16 -qint64 DummyBackend::availableFrames() const +qint64 DummyBackend::framesAvailable() const { // assume every frame can take max payload of 16 byte uint frameCount = byteArray.size() / MAX_PACKAGE_SIZE; diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/genericcanbus/dummybackend.h index 23ff662..b56f2fe 100644 --- a/tests/auto/plugins/genericcanbus/dummybackend.h +++ b/tests/auto/plugins/genericcanbus/dummybackend.h @@ -59,7 +59,7 @@ public: QVariant configurationParameter(const QString &key) const Q_DECL_OVERRIDE; QVector<QString> configurationKeys() const Q_DECL_OVERRIDE; - qint64 availableFrames() const Q_DECL_OVERRIDE; + qint64 framesAvailable() const Q_DECL_OVERRIDE; QCanBusFrame readFrame() Q_DECL_OVERRIDE; bool writeFrame(const QCanBusFrame &data) Q_DECL_OVERRIDE; diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp index 292870e..0e98c55 100644 --- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp +++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp @@ -75,7 +75,7 @@ public: QVariant configurationParameter(const QString&) const { return value; } QVector<QString> configurationKeys() const { return keys; } - qint64 availableFrames() const { return 0; } + qint64 framesAvailable() const { return 0; } QCanBusFrame readFrame() { if (state() != QCanBusDevice::ConnectedState) |