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>

1 files changed, 7 insertions, 9 deletions

diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp
index 92620ddd8c..3b465565ba 100644
--- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp
+++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.cpp
@@ -48,18 +48,17 @@
 **
 ****************************************************************************/
 
+#include "basictoolsplugin.h"
+
+#include <QtMath>
 #include <QtWidgets>
 
-#include <qmath.h>
 #include <stdlib.h>
 
-#include "basictoolsplugin.h"
-
 //! [0]
 QStringList BasicToolsPlugin::brushes() const
 {
-    return QStringList() << tr("Pencil") << tr("Air Brush")
-                         << tr("Random Letters");
+    return {tr("Pencil"), tr("Air Brush"), tr("Random Letters")};
 }
 //! [0]
 
@@ -132,7 +131,7 @@ QRect BasicToolsPlugin::mouseRelease(const QString & /* brush */,
 //! [5]
 QStringList BasicToolsPlugin::shapes() const
 {
-    return QStringList() << tr("Circle") << tr("Star") << tr("Text...");
+    return {tr("Circle"), tr("Star"), tr("Text...")};
 }
 //! [5]
 
@@ -169,8 +168,7 @@ QPainterPath BasicToolsPlugin::generateShape(const QString &shape,
 //! [7]
 QStringList BasicToolsPlugin::filters() const
 {
-    return QStringList() << tr("Invert Pixels") << tr("Swap RGB")
-                         << tr("Grayscale");
+    return {tr("Invert Pixels"), tr("Swap RGB"), tr("Grayscale")};
 }
 //! [7]
 
@@ -187,7 +185,7 @@ QImage BasicToolsPlugin::filterImage(const QString &filter, const QImage &image,
     } else if (filter == tr("Grayscale")) {
         for (int y = 0; y < result.height(); ++y) {
             for (int x = 0; x < result.width(); ++x) {
-                int pixel = result.pixel(x, y);
+                QRgb pixel = result.pixel(x, y);
                 int gray = qGray(pixel);
                 int alpha = qAlpha(pixel);
                 result.setPixel(x, y, qRgba(gray, gray, gray, alpha));