From da09f8f01d13ff467f0a628b6348aa9300160875 Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Wed, 27 Sep 2017 19:25:01 +0300
Subject: Revamp the Console Asynchronous Writer 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.
* Use more member class initializations.
* Remove empy dtor.

Task-number: QTBUG-60652
Change-Id: Ia9b108ad9fd65d55dd88e2d6c1e3ee36830abb6e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 .../serialport/cwriterasync/serialportwriter.cpp   | 46 +++++++++++++---------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'examples/serialport/cwriterasync/serialportwriter.cpp')

diff --git a/examples/serialport/cwriterasync/serialportwriter.cpp b/examples/serialport/cwriterasync/serialportwriter.cpp
index e940f3d..c2916bb 100644
--- a/examples/serialport/cwriterasync/serialportwriter.cpp
+++ b/examples/serialport/cwriterasync/serialportwriter.cpp
@@ -52,45 +52,47 @@
 
 #include <QCoreApplication>
 
-QT_USE_NAMESPACE
-
-SerialPortWriter::SerialPortWriter(QSerialPort *serialPort, QObject *parent)
-    : QObject(parent)
-    , m_serialPort(serialPort)
-    , m_standardOutput(stdout)
-    , m_bytesWritten(0)
+SerialPortWriter::SerialPortWriter(QSerialPort *serialPort, QObject *parent) :
+    QObject(parent),
+    m_serialPort(serialPort),
+    m_standardOutput(stdout)
 {
     m_timer.setSingleShot(true);
-    connect(m_serialPort, &QSerialPort::bytesWritten, this, &SerialPortWriter::handleBytesWritten);
-    connect(m_serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error),
+    connect(m_serialPort, &QSerialPort::bytesWritten,
+            this, &SerialPortWriter::handleBytesWritten);
+    connect(m_serialPort, &QSerialPort::errorOccurred,
             this, &SerialPortWriter::handleError);
     connect(&m_timer, &QTimer::timeout, this, &SerialPortWriter::handleTimeout);
 }
 
-SerialPortWriter::~SerialPortWriter()
-{
-}
-
 void SerialPortWriter::handleBytesWritten(qint64 bytes)
 {
     m_bytesWritten += bytes;
     if (m_bytesWritten == m_writeData.size()) {
         m_bytesWritten = 0;
-        m_standardOutput << QObject::tr("Data successfully sent to port %1").arg(m_serialPort->portName()) << endl;
+        m_standardOutput << QObject::tr("Data successfully sent to port %1")
+                            .arg(m_serialPort->portName()) << endl;
         QCoreApplication::quit();
     }
 }
 
 void SerialPortWriter::handleTimeout()
 {
-    m_standardOutput << QObject::tr("Operation timed out for port %1, error: %2").arg(m_serialPort->portName()).arg(m_serialPort->errorString()) << endl;
+    m_standardOutput << QObject::tr("Operation timed out for port %1, error: %2")
+                        .arg(m_serialPort->portName())
+                        .arg(m_serialPort->errorString())
+                     << endl;
     QCoreApplication::exit(1);
 }
 
 void SerialPortWriter::handleError(QSerialPort::SerialPortError serialPortError)
 {
     if (serialPortError == QSerialPort::WriteError) {
-        m_standardOutput << QObject::tr("An I/O error occurred while writing the data to port %1, error: %2").arg(m_serialPort->portName()).arg(m_serialPort->errorString()) << endl;
+        m_standardOutput << QObject::tr("An I/O error occurred while writing"
+                                        " the data to port %1, error: %2")
+                            .arg(m_serialPort->portName())
+                            .arg(m_serialPort->errorString())
+                         << endl;
         QCoreApplication::exit(1);
     }
 }
@@ -99,13 +101,19 @@ void SerialPortWriter::write(const QByteArray &writeData)
 {
     m_writeData = writeData;
 
-    qint64 bytesWritten = m_serialPort->write(writeData);
+    const qint64 bytesWritten = m_serialPort->write(writeData);
 
     if (bytesWritten == -1) {
-        m_standardOutput << QObject::tr("Failed to write the data to port %1, error: %2").arg(m_serialPort->portName()).arg(m_serialPort->errorString()) << endl;
+        m_standardOutput << QObject::tr("Failed to write the data to port %1, error: %2")
+                            .arg(m_serialPort->portName())
+                            .arg(m_serialPort->errorString())
+                         << endl;
         QCoreApplication::exit(1);
     } else if (bytesWritten != m_writeData.size()) {
-        m_standardOutput << QObject::tr("Failed to write all the data to port %1, error: %2").arg(m_serialPort->portName()).arg(m_serialPort->errorString()) << endl;
+        m_standardOutput << QObject::tr("Failed to write all the data to port %1, error: %2")
+                            .arg(m_serialPort->portName())
+                            .arg(m_serialPort->errorString())
+                         << endl;
         QCoreApplication::exit(1);
     }
 
-- 
cgit v1.2.1