diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-07-26 15:09:43 +0300 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-07-29 10:04:05 +0000 |
commit | 42453d67b94815d568fc08b3ef465c19bf3e3879 (patch) | |
tree | 86f57f865b8556ba22ffd6e5879fbfa9b4bed254 /src/plugins/canbus/socketcan | |
parent | f7af883e7cb5f3bd1b9e4056717d0b9e023b6b42 (diff) |
Rename QCBD::availableFrames() to QCBD::framesAvailable()
... to be consistent with the QIODevice::bytesAvailable() name.
Change-Id: I4f332a3d5d9e67ed0a353688c83fc5d38f6a1c74
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/canbus/socketcan')
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 2 | ||||
-rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.h | 2 |
2 files changed, 2 insertions, 2 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; |