Commit 4bb9e39f authored by Denis Shienkov's avatar Denis Shienkov
Browse files

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: default avatarAndré Hartmann <aha_1980@gmx.de>
Reviewed-by: default avatarAlex Blasche <alexander.blasche@qt.io>
Showing with 28 additions and 18 deletions
...@@ -48,43 +48,45 @@ ...@@ -48,43 +48,45 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtSerialPort/QSerialPort>
#include <QTextStream>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFile> #include <QFile>
#include <QSerialPort>
#include <QStringList> #include <QStringList>
#include <QTextStream>
QT_USE_NAMESPACE
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QCoreApplication coreApplication(argc, argv); QCoreApplication coreApplication(argc, argv);
int argumentCount = QCoreApplication::arguments().size(); const int argumentCount = QCoreApplication::arguments().size();
QStringList argumentList = QCoreApplication::arguments(); const QStringList argumentList = QCoreApplication::arguments();
QTextStream standardOutput(stdout); QTextStream standardOutput(stdout);
if (argumentCount == 1) { 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; return 1;
} }
QSerialPort serialPort; QSerialPort serialPort;
QString serialPortName = argumentList.at(1); const QString serialPortName = argumentList.at(1);
serialPort.setPortName(serialPortName); 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); serialPort.setBaudRate(serialPortBaudRate);
if (!serialPort.open(QIODevice::WriteOnly)) { 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; return 1;
} }
QFile dataFile; QFile dataFile;
if (!dataFile.open(stdin, QIODevice::ReadOnly)) { 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; return 1;
} }
...@@ -92,24 +94,32 @@ int main(int argc, char *argv[]) ...@@ -92,24 +94,32 @@ int main(int argc, char *argv[])
dataFile.close(); dataFile.close();
if (writeData.isEmpty()) { 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; return 1;
} }
qint64 bytesWritten = serialPort.write(writeData); const qint64 bytesWritten = serialPort.write(writeData);
if (bytesWritten == -1) { 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; return 1;
} else if (bytesWritten != writeData.size()) { } 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; return 1;
} else if (!serialPort.waitForBytesWritten(5000)) { } 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; 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; return 0;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment