From a14a943f9ac3d1e85514d7fb6688c84e624ac850 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Fri, 11 May 2018 16:31:51 +0200
Subject: Examples: Cleanup and modernize Plug&Paint

* Use C++11 member init
* Use auto where appropriate
* Replace foreach with range-for
* Replace last Qt4-style connects
* Sort includes to common style
* Fix some Clang warnings

Task-number: QTBUG-60635
Change-Id: I61c98b34b954e416dd175b56ca589125217083de
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
---
 .../widgets/tools/plugandpaint/app/mainwindow.h    | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'examples/widgets/tools/plugandpaint/app/mainwindow.h')

diff --git a/examples/widgets/tools/plugandpaint/app/mainwindow.h b/examples/widgets/tools/plugandpaint/app/mainwindow.h
index 7d2c085c23..2b54264893 100644
--- a/examples/widgets/tools/plugandpaint/app/mainwindow.h
+++ b/examples/widgets/tools/plugandpaint/app/mainwindow.h
@@ -89,27 +89,27 @@ private:
     void loadPlugins();
     void populateMenus(QObject *plugin);
     void addToMenu(QObject *plugin, const QStringList &texts, QMenu *menu,
-                   Member member, QActionGroup *actionGroup = 0);
+                   Member member, QActionGroup *actionGroup = nullptr);
 
-    PaintArea *paintArea;
-    QScrollArea *scrollArea;
+    PaintArea *paintArea = nullptr;
+    QScrollArea *scrollArea = nullptr;
     QDir pluginsDir;
     QStringList pluginFileNames;
 
-    QMenu *fileMenu;
-    QMenu *brushMenu;
-    QMenu *shapesMenu;
-    QMenu *filterMenu;
-    QMenu *helpMenu;
-    QActionGroup *brushActionGroup;
-    QAction *openAct;
-    QAction *saveAsAct;
-    QAction *exitAct;
-    QAction *brushWidthAct;
-    QAction *brushColorAct;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
-    QAction *aboutPluginsAct;
+    QMenu *fileMenu = nullptr;
+    QMenu *brushMenu = nullptr;
+    QMenu *shapesMenu = nullptr;
+    QMenu *filterMenu = nullptr;
+    QMenu *helpMenu = nullptr;
+    QActionGroup *brushActionGroup = nullptr;
+    QAction *openAct = nullptr;
+    QAction *saveAsAct = nullptr;
+    QAction *exitAct = nullptr;
+    QAction *brushWidthAct = nullptr;
+    QAction *brushColorAct = nullptr;
+    QAction *aboutAct = nullptr;
+    QAction *aboutQtAct = nullptr;
+    QAction *aboutPluginsAct = nullptr;
 };
 
 #endif
-- 
cgit v1.2.3