Network chat: default-initialize or direct-initialize members

Where possible

Task-number: QTBUG-108873
Change-Id: I8125ffd63cd0ad1970575fb1a6b85021c03c38d5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>

5 files changed, 10 insertions, 19 deletions

diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp
index 8107d5cca2..126319c908 100644
--- a/examples/network/network-chat/client.cpp
+++ b/examples/network/network-chat/client.cpp
@@ -8,8 +8,8 @@
 #include <QHostInfo>
 
 Client::Client()
+    : peerManager(new PeerManager(this))
 {
-    peerManager = new PeerManager(this);
     peerManager->setServerPort(server.serverPort());
     peerManager->startBroadcasting();
 
diff --git a/examples/network/network-chat/connection.cpp b/examples/network/network-chat/connection.cpp
index e993338fef..414faa80a9 100644
--- a/examples/network/network-chat/connection.cpp
+++ b/examples/network/network-chat/connection.cpp
@@ -27,12 +27,6 @@ static const int PingInterval = 5 * 1000;
 Connection::Connection(QObject *parent)
     : QTcpSocket(parent), writer(this)
 {
-    greetingMessage = tr("undefined");
-    username = tr("unknown");
-    state = WaitingForGreeting;
-    currentDataType = Undefined;
-    transferTimerId = -1;
-    isGreetingMessageSent = false;
     pingTimer.setInterval(PingInterval);
 
     connect(this, &QTcpSocket::readyRead, this,
diff --git a/examples/network/network-chat/connection.h b/examples/network/network-chat/connection.h
index a3082247cb..ee9b00c102 100644
--- a/examples/network/network-chat/connection.h
+++ b/examples/network/network-chat/connection.h
@@ -59,15 +59,15 @@ private:
 
     QCborStreamReader reader;
     QCborStreamWriter writer;
-    QString greetingMessage;
-    QString username;
+    QString greetingMessage = tr("undefined");
+    QString username = tr("unknown");
     QTimer pingTimer;
     QElapsedTimer pongTime;
     QString buffer;
-    ConnectionState state;
-    DataType currentDataType;
-    int transferTimerId;
-    bool isGreetingMessageSent;
+    ConnectionState state = WaitingForGreeting;
+    DataType currentDataType = Undefined;
+    int transferTimerId = -1;
+    bool isGreetingMessageSent = false;
 };
 
 #endif
diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp
index 0bf619f93f..ce227b843c 100644
--- a/examples/network/network-chat/peermanager.cpp
+++ b/examples/network/network-chat/peermanager.cpp
@@ -12,10 +12,8 @@ static const qint32 BroadcastInterval = 2000;
 static const unsigned broadcastPort = 45000;
 
 PeerManager::PeerManager(Client *client)
-    : QObject(client)
+    : QObject(client), client(client)
 {
-    this->client = client;
-
     static const char *envVariables[] = {
         "USERNAME", "USER", "USERDOMAIN", "HOSTNAME", "DOMAINNAME"
     };
@@ -30,7 +28,6 @@ PeerManager::PeerManager(Client *client)
         username = "unknown";
 
     updateAddresses();
-    serverPort = 0;
 
     broadcastSocket.bind(QHostAddress::Any, broadcastPort, QUdpSocket::ShareAddress
                          | QUdpSocket::ReuseAddressHint);
diff --git a/examples/network/network-chat/peermanager.h b/examples/network/network-chat/peermanager.h
index b9ea8053b2..d077e2c0e1 100644
--- a/examples/network/network-chat/peermanager.h
+++ b/examples/network/network-chat/peermanager.h
@@ -35,13 +35,13 @@ private slots:
 private:
     void updateAddresses();
 
-    Client *client;
+    Client *client = nullptr;
     QList<QHostAddress> broadcastAddresses;
     QList<QHostAddress> ipAddresses;
     QUdpSocket broadcastSocket;
     QTimer broadcastTimer;
     QString username;
-    int serverPort;
+    int serverPort = 0;
 };
 
 #endif