diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 07:25:51 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 08:38:53 +0200 |
commit | 4d457e2fd34b0a715d92f00b03fdbde09e58eb93 (patch) | |
tree | e07d8f5d65eaabf43196b4c093c5677a1b5ca2cf /examples/serialport/cwritersync/main.cpp | |
parent | 055731b3a0d0f90741d7226ef4d885e56508aa56 (diff) | |
parent | f602b8163fb61d260f331ae7cabba591bde85fb4 (diff) |
Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"
Diffstat (limited to 'examples/serialport/cwritersync/main.cpp')
-rw-r--r-- | examples/serialport/cwritersync/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/serialport/cwritersync/main.cpp b/examples/serialport/cwritersync/main.cpp index 125c111c..9d4511a9 100644 --- a/examples/serialport/cwritersync/main.cpp +++ b/examples/serialport/cwritersync/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) if (argumentCount == 1) { standardOutput << QObject::tr("Usage: %1 <serialportname> [baudrate]") - .arg(argumentList.first()) << endl; + .arg(argumentList.first()) << Qt::endl; return 1; } @@ -79,14 +79,14 @@ int main(int argc, char *argv[]) if (!serialPort.open(QIODevice::WriteOnly)) { standardOutput << QObject::tr("Failed to open port %1, error: %2") .arg(serialPortName).arg(serialPort.errorString()) - << endl; + << Qt::endl; return 1; } QFile dataFile; if (!dataFile.open(stdin, QIODevice::ReadOnly)) { standardOutput << QObject::tr("Failed to open stdin for reading") - << endl; + << Qt::endl; return 1; } @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) 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; + .arg(serialPortName).arg(serialPort.errorString()) << Qt::endl; return 1; } @@ -105,21 +105,21 @@ int main(int argc, char *argv[]) if (bytesWritten == -1) { standardOutput << QObject::tr("Failed to write the data to port %1, error: %2") - .arg(serialPortName).arg(serialPort.errorString()) << endl; + .arg(serialPortName).arg(serialPort.errorString()) << Qt::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; + .arg(serialPortName).arg(serialPort.errorString()) << Qt::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; + .arg(serialPortName).arg(serialPort.errorString()) << Qt::endl; return 1; } standardOutput << QObject::tr("Data successfully sent to port %1") - .arg(serialPortName) << endl; + .arg(serialPortName) << Qt::endl; return 0; } |