Cleanup network examples

Cleanup network examples:
 - use nullptr
 - use member-init
 - adjust includes
 - use new-style connects

Change-Id: I80aa230168e5aec88a1bc93bbf49a471bfc30e7b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

5 files changed, 50 insertions, 54 deletions

diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 1a54f5ec8a..322224a902 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -80,34 +80,37 @@ BearerMonitor::BearerMonitor(QWidget *parent)
             break;
         }
     }
-    connect(&manager, SIGNAL(onlineStateChanged(bool)), this ,SLOT(onlineStateChanged(bool)));
-    connect(&manager, SIGNAL(configurationAdded(const QNetworkConfiguration&)),
-            this, SLOT(configurationAdded(const QNetworkConfiguration&)));
-    connect(&manager, SIGNAL(configurationRemoved(const QNetworkConfiguration&)),
-            this, SLOT(configurationRemoved(const QNetworkConfiguration&)));
-    connect(&manager, SIGNAL(configurationChanged(const QNetworkConfiguration&)),
-            this, SLOT(configurationChanged(const QNetworkConfiguration)));
-    connect(&manager, SIGNAL(updateCompleted()), this, SLOT(updateConfigurations()));
+    connect(&manager, &QNetworkConfigurationManager::onlineStateChanged,
+            this, &BearerMonitor::onlineStateChanged);
+    connect(&manager, &QNetworkConfigurationManager::configurationAdded,
+            this, [this](const QNetworkConfiguration &config) { configurationAdded(config); });
+    connect(&manager, &QNetworkConfigurationManager::configurationRemoved,
+            this, &BearerMonitor::configurationRemoved);
+    connect(&manager, &QNetworkConfigurationManager::configurationChanged,
+            this, &BearerMonitor::configurationChanged);
+    connect(&manager, &QNetworkConfigurationManager::updateCompleted,
+            this, &BearerMonitor::updateConfigurations);
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    connect(registerButton, SIGNAL(clicked()), this, SLOT(registerNetwork()));
-    connect(unregisterButton, SIGNAL(clicked()), this, SLOT(unregisterNetwork()));
+    connect(registerButton, &QPushButton::clicked,
+            this, &BearerMonitor::registerNetwork);
+    connect(unregisterButton, &QPushButton::clicked,
+            this, &BearerMonitor::unregisterNetwork);
 #else // Q_OS_WIN && !Q_OS_WINRT
     nlaGroup->hide();
 #endif
 
-    connect(treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)),
-            this, SLOT(createSessionFor(QTreeWidgetItem*)));
+    connect(treeWidget, &QTreeWidget::itemActivated,
+            this, &BearerMonitor::createSessionFor);
+    connect(treeWidget, &QTreeWidget::currentItemChanged,
+            this, &BearerMonitor::showConfigurationFor);
 
-    connect(treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-            this, SLOT(showConfigurationFor(QTreeWidgetItem*)));
-
-    connect(newSessionButton, SIGNAL(clicked()),
-            this, SLOT(createNewSession()));
-    connect(deleteSessionButton, SIGNAL(clicked()),
-            this, SLOT(deleteSession()));
-    connect(scanButton, SIGNAL(clicked()),
-            this, SLOT(performScan()));
+    connect(newSessionButton, &QPushButton::clicked,
+            this, &BearerMonitor::createNewSession);
+    connect(deleteSessionButton, &QPushButton::clicked,
+            this, &BearerMonitor::deleteSession);
+    connect(scanButton, &QPushButton::clicked,
+            this, &BearerMonitor::performScan);
 
     // Just in case update all configurations so that all
     // configurations are up to date.
@@ -124,7 +127,7 @@ static void updateItem(QTreeWidgetItem *item, const QNetworkConfiguration &confi
     item->setData(0, Qt::UserRole, config.identifier());
 
     QFont font = item->font(1);
-    font.setBold((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active);
+    font.setBold(config.state().testFlag(QNetworkConfiguration::Active));
     item->setFont(0, font);
 }
 
@@ -333,8 +336,6 @@ void BearerMonitor::showConfigurationFor(QTreeWidgetItem *item)
     case QNetworkConfiguration::Undefined:
         configurationState->setText(tr("Undefined"));
         break;
-    default:
-        configurationState->setText(QString());
     }
 
     switch (conf.type()) {
@@ -350,8 +351,6 @@ void BearerMonitor::showConfigurationFor(QTreeWidgetItem *item)
     case QNetworkConfiguration::Invalid:
         configurationType->setText(tr("Invalid"));
         break;
-    default:
-        configurationType->setText(QString());
     }
 
     switch (conf.purpose()) {
@@ -367,8 +366,6 @@ void BearerMonitor::showConfigurationFor(QTreeWidgetItem *item)
     case QNetworkConfiguration::ServiceSpecificPurpose:
         configurationPurpose->setText(tr("Service Specific"));
         break;
-    default:
-        configurationPurpose->setText(QString());
     }
 
     configurationIdentifier->setText(conf.identifier());
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index 7de186cd14..79b8d876ec 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -51,8 +51,7 @@
 #ifndef BEARERMONITOR_H
 #define BEARERMONITOR_H
 
-#include <qnetworkconfigmanager.h>
-#include <qnetworksession.h>
+#include <QNetworkConfigurationManager>
 #include "ui_bearermonitor_640_480.h"
 
 QT_USE_NAMESPACE
@@ -64,11 +63,11 @@ class BearerMonitor : public QWidget, public Ui_BearerMonitor
     Q_OBJECT
 
 public:
-    BearerMonitor(QWidget *parent = 0);
+    BearerMonitor(QWidget *parent = nullptr);
     ~BearerMonitor();
 
 private slots:
-    void configurationAdded(const QNetworkConfiguration &config, QTreeWidgetItem *parent = 0);
+    void configurationAdded(const QNetworkConfiguration &config, QTreeWidgetItem *parent = nullptr);
     void configurationRemoved(const QNetworkConfiguration &config);
     void configurationChanged(const QNetworkConfiguration &config);
     void updateSnapConfiguration(QTreeWidgetItem *parent, const QNetworkConfiguration &snap);
@@ -90,7 +89,7 @@ private slots:
 
 private:
     QNetworkConfigurationManager manager;
-    QList<SessionWidget *> sessionWidgets;
+    QVector<SessionWidget *> sessionWidgets;
 };
 
 #endif //BEARERMONITOR_H
diff --git a/examples/network/bearermonitor/main.cpp b/examples/network/bearermonitor/main.cpp
index 363889dee4..3c2525012d 100644
--- a/examples/network/bearermonitor/main.cpp
+++ b/examples/network/bearermonitor/main.cpp
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMainWindow>
+#include <QApplication>
+#include <QMainWindow>
 
 #include "bearermonitor.h"
 
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index 237ceee2bd..0fd5d4f67f 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -49,10 +49,10 @@
 ****************************************************************************/
 
 #include "sessionwidget.h"
-#include "qnetworkconfigmanager.h"
+#include <QNetworkConfigurationManager>
 
 SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *parent)
-:   QWidget(parent), statsTimer(-1)
+:   QWidget(parent)
 {
     setupUi(this);
 
@@ -65,10 +65,10 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren
 
     session = new QNetworkSession(config, this);
 
-    connect(session, SIGNAL(stateChanged(QNetworkSession::State)),
-            this, SLOT(updateSession()));
-    connect(session, SIGNAL(error(QNetworkSession::SessionError)),
-            this, SLOT(updateSessionError(QNetworkSession::SessionError)));
+    connect(session, &QNetworkSession::stateChanged,
+            this, &SessionWidget::updateSession);
+    connect(session, QOverload<QNetworkSession::SessionError>::of(&QNetworkSession::error),
+            this, &SessionWidget::updateSessionError);
 
     updateSession();
 
@@ -76,14 +76,14 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren
 
     configuration->setText(session->configuration().name());
 
-    connect(openSessionButton, SIGNAL(clicked()),
-            this, SLOT(openSession()));
-    connect(openSyncSessionButton, SIGNAL(clicked()),
-            this, SLOT(openSyncSession()));
-    connect(closeSessionButton, SIGNAL(clicked()),
-            this, SLOT(closeSession()));
-    connect(stopSessionButton, SIGNAL(clicked()),
-            this, SLOT(stopSession()));
+    connect(openSessionButton, &QPushButton::clicked,
+            this, &SessionWidget::openSession);
+    connect(openSyncSessionButton, &QPushButton::clicked,
+            this, &SessionWidget::openSyncSession);
+    connect(closeSessionButton, &QPushButton::clicked,
+            this, &SessionWidget::closeSession);
+    connect(stopSessionButton, &QPushButton::clicked,
+            this, &SessionWidget::stopSession);
 }
 
 SessionWidget::~SessionWidget()
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index ba352eefee..6b2da2c1c1 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -51,7 +51,7 @@
 #ifndef SESSIONWIDGET_H
 #define SESSIONWIDGET_H
 
-#include <qnetworksession.h>
+#include <QNetworkSession>
 
 #include "ui_sessionwidget.h"
 
@@ -62,10 +62,10 @@ class SessionWidget : public QWidget, public Ui_SessionWidget
     Q_OBJECT
 
 public:
-    explicit SessionWidget(const QNetworkConfiguration &config, QWidget *parent = 0);
+    explicit SessionWidget(const QNetworkConfiguration &config, QWidget *parent = nullptr);
     ~SessionWidget();
 
-    void timerEvent(QTimerEvent *) override;
+    void timerEvent(QTimerEvent *e) override;
 
 private:
     void updateSessionState(QNetworkSession::State state);
@@ -80,8 +80,8 @@ private Q_SLOTS:
     void updateSessionError(QNetworkSession::SessionError error);
 
 private:
-    QNetworkSession *session;
-    int statsTimer;
+    QNetworkSession *session = nullptr;
+    int statsTimer = -1;
 };
 
 #endif