From aeee3be166aff737990fe2cade05bff7b39dfebc Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Fri, 29 Sep 2017 13:57:43 +0200
Subject: QtNetwork (examples) - update googlesuggest example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mainly cosmetic - nullptr, explicit, QVector<QString> etc.
Plus: do not leak SearchBox.

Task-number: QTBUG-60628
Change-Id: I4c538ced64a469fbe4627f44d2d883e6dcd2362e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 examples/network/googlesuggest/googlesuggest.h | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'examples/network/googlesuggest/googlesuggest.h')

diff --git a/examples/network/googlesuggest/googlesuggest.h b/examples/network/googlesuggest/googlesuggest.h
index 1d42f31571..a0b0ac069c 100644
--- a/examples/network/googlesuggest/googlesuggest.h
+++ b/examples/network/googlesuggest/googlesuggest.h
@@ -53,14 +53,7 @@
 
 #include <QtWidgets>
 #include <QtNetwork>
-#include <QObject>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QNetworkReply;
-class QTimer;
-class QTreeWidget;
-QT_END_NAMESPACE
+#include <QtCore>
 
 //! [1]
 class GSuggestCompletion : public QObject
@@ -68,10 +61,10 @@ class GSuggestCompletion : public QObject
     Q_OBJECT
 
 public:
-    GSuggestCompletion(QLineEdit *parent = 0);
+    explicit GSuggestCompletion(QLineEdit *parent = nullptr);
     ~GSuggestCompletion();
     bool eventFilter(QObject *obj, QEvent *ev) override;
-    void showCompletion(const QStringList &choices);
+    void showCompletion(const QVector<QString> &choices);
 
 public slots:
 
@@ -81,9 +74,9 @@ public slots:
     void handleNetworkData(QNetworkReply *networkReply);
 
 private:
-    QLineEdit *editor;
-    QTreeWidget *popup;
-    QTimer *timer;
+    QLineEdit *editor = nullptr;
+    QTreeWidget *popup = nullptr;
+    QTimer timer;
     QNetworkAccessManager networkManager;
 };
 //! [1]
-- 
cgit v1.2.3