Rename QtCanBus::DataFormat::Ascii -> QtCanBus::DataFormat::AsciiString

As suggested during Qt 6.5 API review.

As drive-by - add trailing commas to last values in new enums.

Change-Id: If13737dbf27f50e48dc6b514f3690eee69be8dd9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 958e81df38b7c434c9197945b9485326e9637cf9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/src/serialbus/qcancommondefinitions.cpp b/src/serialbus/qcancommondefinitions.cpp
index cb33e82..058e8f1 100644
--- a/src/serialbus/qcancommondefinitions.cpp
+++ b/src/serialbus/qcancommondefinitions.cpp
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
     \value UnsignedInteger The signal value is an unsigned integer.
     \value Float The signal value is float.
     \value Double The signal value is double.
-    \value Ascii The signal value is an ASCII string.
+    \value AsciiString The signal value is an ASCII string.
 */
 
 /*!
@@ -93,7 +93,7 @@ QDebug operator<<(QDebug dbg, QtCanBus::DataFormat format)
     case QtCanBus::DataFormat::Double:
         dbg << "Double";
         break;
-    case QtCanBus::DataFormat::Ascii:
+    case QtCanBus::DataFormat::AsciiString:
         dbg << "ASCII";
         break;
     }
diff --git a/src/serialbus/qcancommondefinitions.h b/src/serialbus/qcancommondefinitions.h
index f3e4b1a..ffcefc0 100644
--- a/src/serialbus/qcancommondefinitions.h
+++ b/src/serialbus/qcancommondefinitions.h
@@ -16,7 +16,7 @@ namespace QtCanBus {
 
 enum class DataSource : quint8 {
     Payload = 0,
-    FrameId
+    FrameId,
 };
 
 enum class DataFormat : quint8 {
@@ -24,14 +24,14 @@ enum class DataFormat : quint8 {
     UnsignedInteger,
     Float,
     Double,
-    Ascii
+    AsciiString,
 };
 
 enum class MultiplexState : quint8 {
     None = 0x00,
     MultiplexorSwitch = 0x01,
     MultiplexedSignal = 0x02,
-    SwitchAndSignal = MultiplexorSwitch | MultiplexedSignal
+    SwitchAndSignal = MultiplexorSwitch | MultiplexedSignal,
 };
 
 using UniqueId = quint32;
diff --git a/src/serialbus/qcanframeprocessor.cpp b/src/serialbus/qcanframeprocessor.cpp
index 7939d9a..d2c0626 100644
--- a/src/serialbus/qcanframeprocessor.cpp
+++ b/src/serialbus/qcanframeprocessor.cpp
@@ -944,7 +944,7 @@ QVariant QCanFrameProcessorPrivate::parseData(const unsigned char *data,
         return extractValue<float>(data, signalDesc);
     case QtCanBus::DataFormat::Double:
         return extractValue<double>(data, signalDesc);
-    case QtCanBus::DataFormat::Ascii:
+    case QtCanBus::DataFormat::AsciiString:
         return parseAscii(data, signalDesc);
     }
     Q_UNREACHABLE();
@@ -1168,7 +1168,7 @@ void QCanFrameProcessorPrivate::encodeSignal(unsigned char *data, const QVariant
     case QtCanBus::DataFormat::Double:
         encodeValue<double>(data, value, signalDesc);
         break;
-    case QtCanBus::DataFormat::Ascii:
+    case QtCanBus::DataFormat::AsciiString:
         encodeAscii(data, value, signalDesc);
         break;
     }
diff --git a/src/serialbus/qcansignaldescription.cpp b/src/serialbus/qcansignaldescription.cpp
index 5dca66c..83c3ca0 100644
--- a/src/serialbus/qcansignaldescription.cpp
+++ b/src/serialbus/qcansignaldescription.cpp
@@ -243,7 +243,7 @@ QCanSignalDescription &QCanSignalDescription::operator=(const QCanSignalDescript
         \li have \l bitLength() \c {== 64} if the \l dataFormat() is
             \l {QtCanBus::DataFormat::}{Double}
         \li the \l bitLength() \e must be a multiple of \c 8 if the
-            \l dataFormat() is \l {QtCanBus::DataFormat::}{Ascii}
+            \l dataFormat() is \l {QtCanBus::DataFormat::}{AsciiString}
         \li the \l bitLength() \e must be greater than \c 0 and less than or
             equal to \c {64}.
     \endlist
@@ -257,7 +257,7 @@ bool QCanSignalDescription::isValid() const
             return d->dataLength == 32;
         if (d->format == QtCanBus::DataFormat::Double)
             return d->dataLength == 64;
-        if (d->format == QtCanBus::DataFormat::Ascii)
+        if (d->format == QtCanBus::DataFormat::AsciiString)
             return d->dataLength % 8 == 0;
         return d->dataLength > 0 && d->dataLength <= 64;
     }();
@@ -395,7 +395,7 @@ void QCanSignalDescription::setDataSource(QtCanBus::DataSource source)
     By default, \l {QSysInfo::}{BigEndian} is used.
 
     \note The data endian is ignored if the \l dataFormat() is set to
-    \l {QtCanBus::DataFormat::}{Ascii}.
+    \l {QtCanBus::DataFormat::}{AsciiString}.
 
     \sa setDataEndian(), QSysInfo::Endian
 */
@@ -850,7 +850,7 @@ bool QCanSignalDescriptionPrivate::muxValueInRange(
         return checkValue<float>(value, ranges);
     case QtCanBus::DataFormat::Double:
         return checkValue<double>(value, ranges);
-    case QtCanBus::DataFormat::Ascii:
+    case QtCanBus::DataFormat::AsciiString:
         return checkValue<QByteArray>(value, ranges);
     }