summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2017-09-27 16:05:51 (GMT)
committerDenis Shienkov <denis.shienkov@gmail.com>2017-10-05 06:44:24 (GMT)
commit4bb9e39f6469ba1f268cf4dbaba7232c0a17fbcc (patch)
tree1361beb5d1279e8dee868eeb42ca594632ad4b5e
parent2098f98997b82358ede6994f2e1d0a27ade30b1e (diff)
downloadqtserialport-4bb9e39f6469ba1f268cf4dbaba7232c0a17fbcc.tar.gz
Revamp the Console Synchronous Writer Example
* Use the 'const' keywords more. * Split very long lines. * Remove QT_USE_NAMESPACE macro. * Update includes to common style. Task-number: QTBUG-60652 Change-Id: I920ff6f7de9cede2e761cb629ab89945e70254d9 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--examples/serialport/cwritersync/main.cpp46
1 files changed, 28 insertions, 18 deletions
diff --git a/examples/serialport/cwritersync/main.cpp b/examples/serialport/cwritersync/main.cpp
index a134ed9..125c111 100644
--- a/examples/serialport/cwritersync/main.cpp
+++ b/examples/serialport/cwritersync/main.cpp
@@ -48,43 +48,45 @@
**
****************************************************************************/
-#include <QtSerialPort/QSerialPort>
-
-#include <QTextStream>
#include <QCoreApplication>
#include <QFile>
+#include <QSerialPort>
#include <QStringList>
-
-QT_USE_NAMESPACE
+#include <QTextStream>
int main(int argc, char *argv[])
{
QCoreApplication coreApplication(argc, argv);
- int argumentCount = QCoreApplication::arguments().size();
- QStringList argumentList = QCoreApplication::arguments();
+ const int argumentCount = QCoreApplication::arguments().size();
+ const QStringList argumentList = QCoreApplication::arguments();
QTextStream standardOutput(stdout);
if (argumentCount == 1) {
- standardOutput << QObject::tr("Usage: %1 <serialportname> [baudrate]").arg(argumentList.first()) << endl;
+ standardOutput << QObject::tr("Usage: %1 <serialportname> [baudrate]")
+ .arg(argumentList.first()) << endl;
return 1;
}
QSerialPort serialPort;
- QString serialPortName = argumentList.at(1);
+ const QString serialPortName = argumentList.at(1);
serialPort.setPortName(serialPortName);
- int serialPortBaudRate = (argumentCount > 2) ? argumentList.at(2).toInt() : QSerialPort::Baud9600;
+ const int serialPortBaudRate = (argumentCount > 2)
+ ? argumentList.at(2).toInt() : QSerialPort::Baud9600;
serialPort.setBaudRate(serialPortBaudRate);
if (!serialPort.open(QIODevice::WriteOnly)) {
- standardOutput << QObject::tr("Failed to open port %1, error: %2").arg(serialPortName).arg(serialPort.errorString()) << endl;
+ standardOutput << QObject::tr("Failed to open port %1, error: %2")
+ .arg(serialPortName).arg(serialPort.errorString())
+ << endl;
return 1;
}
QFile dataFile;
if (!dataFile.open(stdin, QIODevice::ReadOnly)) {
- standardOutput << QObject::tr("Failed to open stdin for reading") << endl;
+ standardOutput << QObject::tr("Failed to open stdin for reading")
+ << endl;
return 1;
}
@@ -92,24 +94,32 @@ int main(int argc, char *argv[])
dataFile.close();
if (writeData.isEmpty()) {
- standardOutput << QObject::tr("Either no data was currently available on the standard input for reading, or an error occurred for port %1, error: %2").arg(serialPortName).arg(serialPort.errorString()) << endl;
+ standardOutput << QObject::tr("Either no data was currently available on "
+ "the standard input for reading, or an error "
+ "occurred for port %1, error: %2")
+ .arg(serialPortName).arg(serialPort.errorString()) << endl;
return 1;
}
- qint64 bytesWritten = serialPort.write(writeData);
+ const qint64 bytesWritten = serialPort.write(writeData);
if (bytesWritten == -1) {
- standardOutput << QObject::tr("Failed to write the data to port %1, error: %2").arg(serialPortName).arg(serialPort.errorString()) << endl;
+ standardOutput << QObject::tr("Failed to write the data to port %1, error: %2")
+ .arg(serialPortName).arg(serialPort.errorString()) << endl;
return 1;
} else if (bytesWritten != writeData.size()) {
- standardOutput << QObject::tr("Failed to write all the data to port %1, error: %2").arg(serialPortName).arg(serialPort.errorString()) << endl;
+ standardOutput << QObject::tr("Failed to write all the data to port %1, error: %2")
+ .arg(serialPortName).arg(serialPort.errorString()) << endl;
return 1;
} else if (!serialPort.waitForBytesWritten(5000)) {
- standardOutput << QObject::tr("Operation timed out or an error occurred for port %1, error: %2").arg(serialPortName).arg(serialPort.errorString()) << endl;
+ standardOutput << QObject::tr("Operation timed out or an error "
+ "occurred for port %1, error: %2")
+ .arg(serialPortName).arg(serialPort.errorString()) << endl;
return 1;
}
- standardOutput << QObject::tr("Data successfully sent to port %1").arg(serialPortName) << endl;
+ standardOutput << QObject::tr("Data successfully sent to port %1")
+ .arg(serialPortName) << endl;
return 0;
}