QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Format code

Browse Source
This commit is contained in:
Alex Spataru 2022-01-02 12:18:05 -05:00
parent ed806c3563
commit 6bbff5a976
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IO/DataSources/Network.cpp
View File

@ -37,7 +37,7 @@ IO::DataSources::Network::Network()
setUdpLocalPort(defaultUdpLocalPort()); setUdpLocalPort(defaultUdpLocalPort());
setUdpRemotePort(defaultUdpRemotePort()); setUdpRemotePort(defaultUdpRemotePort());
setSocketType(QAbstractSocket::TcpSocket); setSocketType(QAbstractSocket::TcpSocket);
// clang-format off // clang-format off
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
connect(&m_tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), connect(&m_tcpSocket, SIGNAL(error(QAbstractSocket::SocketError)),

2
src/IO/DataSources/Serial.cpp
View File

@ -625,7 +625,7 @@ void IO::DataSources::Serial::readSettings()
for (int i = 0; i < list.count(); ++i) for (int i = 0; i < list.count(); ++i)
m_baudRateList.append(list.at(i)); m_baudRateList.append(list.at(i));
// Sort baud rate list // Sort baud rate list
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
for (auto i = 0; i < m_baudRateList.count() - 1; ++i) for (auto i = 0; i < m_baudRateList.count() - 1; ++i)
{ {

4
src/MQTT/Client.cpp
View File

@ -251,9 +251,7 @@ StringList MQTT::Client::mqttVersions() const
StringList MQTT::Client::sslProtocols() const StringList MQTT::Client::sslProtocols() const
{ {
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
return StringList { return StringList { tr("System default"), "TLS v1.0", "TLS v1.1", "TLS v1.2" };
tr("System default"), "TLS v1.0", "TLS v1.1", "TLS v1.2"
};
#else #else
return StringList { return StringList {
tr("System default"), "TLS v1.0", "TLS v1.1", "TLS v1.2", tr("System default"), "TLS v1.0", "TLS v1.1", "TLS v1.2",

2
src/Plugins/Server.cpp
View File

@ -182,7 +182,7 @@ void Plugins::Server::acceptConnection()
// Connect socket signals/slots // Connect socket signals/slots
connect(socket, &QTcpSocket::readyRead, this, &Plugins::Server::onDataReceived); connect(socket, &QTcpSocket::readyRead, this, &Plugins::Server::onDataReceived);
connect(socket, &QTcpSocket::disconnected, this, &Plugins::Server::removeConnection); connect(socket, &QTcpSocket::disconnected, this, &Plugins::Server::removeConnection);
// React to socket errors // React to socket errors
// clang-format off // clang-format off
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)

16
src/UI/Widgets/Terminal.cpp
View File

@ -604,7 +604,9 @@ QString Widgets::Terminal::vt100Processing(const QString &data)
//---------------------------------------------------------º----------------------------------------- //---------------------------------------------------------º-----------------------------------------
#define QTC_ASSERT(cond, action) \ #define QTC_ASSERT(cond, action) \
if (Q_LIKELY(cond)) { } \ if (Q_LIKELY(cond)) \
{ \
} \
else \ else \
{ \ { \
action; \ action; \
@ -864,13 +866,13 @@ Widgets::AnsiEscapeCodeHandler::parseText(const FormattedText &input)
{ {
(code == RgbTextColor) (code == RgbTextColor)
? charFormat.setForeground( ? charFormat.setForeground(
QColor(numbers.at(i + 1).toInt(), QColor(numbers.at(i + 1).toInt(),
numbers.at(i + 2).toInt(), numbers.at(i + 2).toInt(),
numbers.at(i + 3).toInt())) numbers.at(i + 3).toInt()))
: charFormat.setBackground( : charFormat.setBackground(
QColor(numbers.at(i + 1).toInt(), QColor(numbers.at(i + 1).toInt(),
numbers.at(i + 2).toInt(), numbers.at(i + 2).toInt(),
numbers.at(i + 3).toInt())); numbers.at(i + 3).toInt()));
setFormatScope(charFormat); setFormatScope(charFormat);
} }
i += 3; i += 3;