diff --git a/src/atcore.cpp b/src/atcore.cpp --- a/src/atcore.cpp +++ b/src/atcore.cpp @@ -617,7 +617,7 @@ } QStringList AtCore::portSpeeds() const { - return serial()->validBaudRates(); + return Serial::validBaudRates; } void AtCore::setIdleHold(uint delay) diff --git a/src/seriallayer.h b/src/seriallayer.h --- a/src/seriallayer.h +++ b/src/seriallayer.h @@ -115,10 +115,26 @@ */ bool commandAvailable() const; - /** - * @brief Return a QStringList of valids serial baud rates - * - * @return QStringList - */ - QStringList validBaudRates() const; }; +/** + * @brief Serial::validBaudRates + * Return a QStringList of valids serial baud rates + */ +namespace Serial +{ +static const QStringList validBaudRates = { + QStringList() << + QStringLiteral("9600") << + QStringLiteral("14400") << + QStringLiteral("19200") << + QStringLiteral("28800") << + QStringLiteral("38400") << + QStringLiteral("57600") << + QStringLiteral("76800") << + QStringLiteral("115200") << + QStringLiteral("230400") << + QStringLiteral("250000") << + QStringLiteral("500000") << + QStringLiteral("1000000") +}; +} diff --git a/src/seriallayer.cpp b/src/seriallayer.cpp --- a/src/seriallayer.cpp +++ b/src/seriallayer.cpp @@ -34,20 +34,6 @@ QByteArray _return = QByteArray("\r"); QByteArray _newLine = QByteArray("\n"); QByteArray _newLineReturn = QByteArray("\n\r"); -QStringList _validBaudRates = { - QStringLiteral("9600"), - QStringLiteral("14400"), - QStringLiteral("19200"), - QStringLiteral("28800"), - QStringLiteral("38400"), - QStringLiteral("57600"), - QStringLiteral("76800"), - QStringLiteral("115200"), - QStringLiteral("230400"), - QStringLiteral("250000"), - QStringLiteral("500000"), - QStringLiteral("1000000") -}; } /** @@ -145,7 +131,3 @@ return !d->_rByteCommands.isEmpty(); } -QStringList SerialLayer::validBaudRates() const -{ - return _validBaudRates; -}