From 3fede6cb547b783377e833c9b269d4cecfe47e61 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 6 Sep 2019 20:27:33 +0200
Subject: Cleanup QtWidgets (tools) examples

Cleanup QtWidgets tools examples:
 - use member-init (clang-tidy)
 - fix includes/don't include QtWidgets globally
 - include own header first
 - use nullptr (clang-tidy)
 - avoid c-style casts
 - use QVector instead QList
 - use QItemDelegate instead QStyledItemDelegate

Change-Id: Ibe9440cdf711e5cc2138c054864edebe1fc95731
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 .../tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp    | 6 +++---
 .../tools/plugandpaint/plugins/basictools/basictoolsplugin.h      | 8 ++++----
 .../plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp      | 5 +----
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'examples/widgets/tools/plugandpaint/plugins')

diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp
index 3b465565ba..64f9f7a0d9 100644
--- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp
+++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp
@@ -50,10 +50,10 @@
 
 #include "basictoolsplugin.h"
 
+#include <QInputDialog>
+#include <QPainter>
+#include <QRandomGenerator>
 #include <QtMath>
-#include <QtWidgets>
-
-#include <stdlib.h>
 
 //! [0]
 QStringList BasicToolsPlugin::brushes() const
diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h
index fd9bb9e5f3..1d9d170daa 100644
--- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h
+++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h
@@ -54,12 +54,12 @@
 //! [0]
 #include <interfaces.h>
 
-#include <QRect>
+#include <QImage>
 #include <QObject>
-#include <QtPlugin>
-#include <QStringList>
 #include <QPainterPath>
-#include <QImage>
+#include <QRect>
+#include <QStringList>
+#include <QtPlugin>
 
 //! [1]
 class BasicToolsPlugin : public QObject,
diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp
index 48717e34f6..30c616a830 100644
--- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp
+++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp
@@ -50,10 +50,7 @@
 
 #include "extrafiltersplugin.h"
 
-#include <QtWidgets>
-
-#include <math.h>
-#include <stdlib.h>
+#include <QInputDialog>
 
 QStringList ExtraFiltersPlugin::filters() const
 {
-- 
cgit v1.2.3