CAN: Correct spelling for "CAN" and "CAN FD"

... in comments, user and debug output, and documentation.

Change-Id: I76ddf418bc1612a7310f80ee2ce596e8d6ab0721
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

5 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 7875105..98c8117 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -545,9 +545,9 @@ bool PeakCanBackend::writeFrame(const QCanBusFrame &newData)
         return false;
     }
 
-    // canFD frame format not implemented at this stage
+    // CAN FD frame format not implemented at this stage
     if (newData.payload().size() > 8) {
-        setError(tr("CanFD frame format not supported."), QCanBusDevice::WriteError);
+        setError(tr("CAN FD frame format not supported."), QCanBusDevice::WriteError);
         return false;
     }
 
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index b672bf0..2579881 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -50,7 +50,7 @@
 #include <sys/time.h>
 
 #ifndef CANFD_MTU
-// CANFD support was added by Linux kernel 3.6
+// CAN FD support was added by Linux kernel 3.6
 // For prior kernels we redefine the missing defines here
 // they are taken from linux/can/raw.h & linux/can.h
 
@@ -336,7 +336,7 @@ void SocketCanBackend::setConfigurationParameter(int key, const QVariant &value)
 
     QCanBusDevice::setConfigurationParameter(key, value);
 
-    // we need to check canfd option a lot -> cache it and avoid QVector lookup
+    // we need to check CAN FD option a lot -> cache it and avoid QVector lookup
     if (key == QCanBusDevice::CanFdKey)
         canFdOptionEnabled = value.toBool();
 }
@@ -370,7 +370,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData)
                               "maximal %2 bytes. Frame is discarded.").
                         arg(payloadSize).arg(canFdOptionEnabled ? CANFD_MAX_DLEN : CAN_MAX_DLEN);
         if (!canFdOptionEnabled && payloadSize <= CANFD_MAX_DLEN)
-            setError(tr("Sending CanFd frame although CanFd option not enabled."),
+            setError(tr("Sending CAN FD frame although CAN FD option not enabled."),
                      QCanBusDevice::WriteError);
         else
             setError(tr("Frame payload exceeds maximum CAN frame payload length."),
@@ -582,11 +582,11 @@ void SocketCanBackend::readSocket()
         if (bytesReceived <= 0) {
             break;
         } else if (bytesReceived != CANFD_MTU && bytesReceived != CAN_MTU) {
-            setError(tr("ERROR SocketCanBackend: incomplete can frame"),
+            setError(tr("ERROR SocketCanBackend: incomplete CAN frame"),
                      QCanBusDevice::CanBusError::ReadError);
             continue;
         } else if (frame.len > bytesReceived - offsetof(canfd_frame, data)) {
-            setError(tr("ERROR SocketCanBackend: invalid can frame length"),
+            setError(tr("ERROR SocketCanBackend: invalid CAN frame length"),
                      QCanBusDevice::CanBusError::ReadError);
             continue;
         }
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 35c50b4..727721f 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -554,9 +554,9 @@ bool TinyCanBackend::writeFrame(const QCanBusFrame &newData)
         return false;
     }
 
-    // canFd frame format not supported at this stage
+    // CAN FD frame format not supported at this stage
     if (newData.payload().size() > 8) {
-        setError(tr("CanFD frame format not supported."), QCanBusDevice::WriteError);
+        setError(tr("CAN FD frame format not supported."), QCanBusDevice::WriteError);
         return false;
     }
 
diff --git a/src/serialbus/qcanbusdevice.cpp b/src/serialbus/qcanbusdevice.cpp
index 7693fc2..a08a339 100644
--- a/src/serialbus/qcanbusdevice.cpp
+++ b/src/serialbus/qcanbusdevice.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
     \value ReceiveOwnKey    This key defines whether this CAN device can send messages.
                             The expected value for this key is \c bool.
     \value BitRateKey       This key defines the bitrate in bits per second.
-    \value CanFdKey         This key defines whether sending and receiving of CANFD frames
+    \value CanFdKey         This key defines whether sending and receiving of CAN FD frames
                             should be enabled. The expected value for this key is \c bool.
     \value UserKey          This key defines the range where custom keys start. It's most
                             common purpose is to permit platform-specific configuration
diff --git a/src/serialbus/qcanbusframe.h b/src/serialbus/qcanbusframe.h
index 13f4da8..360971d 100644
--- a/src/serialbus/qcanbusframe.h
+++ b/src/serialbus/qcanbusframe.h
@@ -116,7 +116,7 @@ public:
         if (!isExtendedFrame && (canId & 0x1FFFF800U))
             return false;
 
-        // maximum permitted payload size in CANFD
+        // maximum permitted payload size in CAN FD
         if (load.length() > 64)
             return false;