Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

1 files changed, 10 insertions, 11 deletions

diff --git a/examples/widgets/tools/completer/mainwindow.h b/examples/widgets/tools/completer/mainwindow.h
index 2bb351ec47..6e6238bf32 100644
--- a/examples/widgets/tools/completer/mainwindow.h
+++ b/examples/widgets/tools/completer/mainwindow.h
@@ -59,7 +59,6 @@ class QComboBox;
 class QCompleter;
 class QLabel;
 class QLineEdit;
-class QProgressBar;
 class QCheckBox;
 class QSpinBox;
 QT_END_NAMESPACE
@@ -70,7 +69,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    MainWindow(QWidget *parent = 0);
+    MainWindow(QWidget *parent = nullptr);
 
 private slots:
     void about();
@@ -83,16 +82,16 @@ private slots:
 //! [1]
 private:
     void createMenu();
-    QAbstractItemModel *modelFromFile(const QString& fileName);
+    QAbstractItemModel *modelFromFile(const QString &fileName);
 
-    QComboBox *caseCombo;
-    QComboBox *modeCombo;
-    QComboBox *modelCombo;
-    QSpinBox *maxVisibleSpinBox;
-    QCheckBox *wrapCheckBox;
-    QCompleter *completer;
-    QLabel *contentsLabel;
-    QLineEdit *lineEdit;
+    QComboBox *caseCombo = nullptr;
+    QComboBox *modeCombo = nullptr;
+    QComboBox *modelCombo = nullptr;
+    QSpinBox *maxVisibleSpinBox = nullptr;
+    QCheckBox *wrapCheckBox = nullptr;
+    QCompleter *completer = nullptr;
+    QLabel *contentsLabel = nullptr;
+    QLineEdit *lineEdit = nullptr;
 };
 //! [1]