From 7f51ee09e7986ccf689b611166a3b083ec52a718 Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Wed, 27 Sep 2017 19:08:43 +0300
Subject: Revamp the Console Synchronous Reader Example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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: I427f778f8005ea5766c0e6035c3996f6a01246ba
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 examples/serialport/creadersync/main.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/examples/serialport/creadersync/main.cpp b/examples/serialport/creadersync/main.cpp
index c1bc08b..845a5fb 100644
--- a/examples/serialport/creadersync/main.cpp
+++ b/examples/serialport/creadersync/main.cpp
@@ -48,36 +48,36 @@
 **
 ****************************************************************************/
 
-#include <QtSerialPort/QSerialPort>
-
-#include <QTextStream>
 #include <QCoreApplication>
+#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::ReadOnly)) {
-        standardOutput << QObject::tr("Failed to open port %1, error: %2").arg(serialPortName).arg(serialPort.error()) << endl;
+        standardOutput << QObject::tr("Failed to open port %1, error: %2")
+                          .arg(serialPortName).arg(serialPort.error()) << endl;
         return 1;
     }
 
@@ -86,14 +86,18 @@ int main(int argc, char *argv[])
         readData.append(serialPort.readAll());
 
     if (serialPort.error() == QSerialPort::ReadError) {
-        standardOutput << QObject::tr("Failed to read from port %1, error: %2").arg(serialPortName).arg(serialPort.errorString()) << endl;
+        standardOutput << QObject::tr("Failed to read from port %1, error: %2")
+                          .arg(serialPortName).arg(serialPort.errorString()) << endl;
         return 1;
     } else if (serialPort.error() == QSerialPort::TimeoutError && readData.isEmpty()) {
-        standardOutput << QObject::tr("No data was currently available for reading from port %1").arg(serialPortName) << endl;
+        standardOutput << QObject::tr("No data was currently available"
+                                      " for reading from port %1")
+                          .arg(serialPortName) << endl;
         return 0;
     }
 
-    standardOutput << QObject::tr("Data successfully received from port %1").arg(serialPortName) << endl;
+    standardOutput << QObject::tr("Data successfully received from port %1")
+                      .arg(serialPortName) << endl;
     standardOutput << readData << endl;
 
     return 0;
-- 
cgit v1.2.1