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>

2 files changed, 19 insertions, 21 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));
diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp
index 8f59afa759..48717e34f6 100644
--- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp
+++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.cpp
@@ -48,17 +48,17 @@
 **
 ****************************************************************************/
 
+#include "extrafiltersplugin.h"
+
 #include <QtWidgets>
 
 #include <math.h>
 #include <stdlib.h>
 
-#include "extrafiltersplugin.h"
-
 QStringList ExtraFiltersPlugin::filters() const
 {
-    return QStringList() << tr("Flip Horizontally") << tr("Flip Vertically")
-                         << tr("Smudge...") << tr("Threshold...");
+    return {tr("Flip Horizontally"), tr("Flip Vertically"),
+            tr("Smudge..."), tr("Threshold...")};
 }
 
 QImage ExtraFiltersPlugin::filterImage(const QString &filter,
@@ -70,14 +70,14 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
     if (filter == tr("Flip Horizontally")) {
         for (int y = 0; y < original.height(); ++y) {
             for (int x = 0; x < original.width(); ++x) {
-                int pixel = original.pixel(original.width() - x - 1, y);
+                QRgb pixel = original.pixel(original.width() - x - 1, y);
                 result.setPixel(x, y, pixel);
             }
         }
     } else if (filter == tr("Flip Vertically")) {
         for (int y = 0; y < original.height(); ++y) {
             for (int x = 0; x < original.width(); ++x) {
-                int pixel = original.pixel(x, original.height() - y - 1);
+                QRgb pixel = original.pixel(x, original.height() - y - 1);
                 result.setPixel(x, y, pixel);
             }
         }
@@ -90,11 +90,11 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
             for (int i = 0; i < numIters; ++i) {
                 for (int y = 1; y < original.height() - 1; ++y) {
                     for (int x = 1; x < original.width() - 1; ++x) {
-                        int p1 = original.pixel(x, y);
-                        int p2 = original.pixel(x, y + 1);
-                        int p3 = original.pixel(x, y - 1);
-                        int p4 = original.pixel(x + 1, y);
-                        int p5 = original.pixel(x - 1, y);
+                        QRgb p1 = original.pixel(x, y);
+                        QRgb p2 = original.pixel(x, y + 1);
+                        QRgb p3 = original.pixel(x, y - 1);
+                        QRgb p4 = original.pixel(x + 1, y);
+                        QRgb p5 = original.pixel(x - 1, y);
 
                         int red = (qRed(p1) + qRed(p2) + qRed(p3) + qRed(p4)
                                    + qRed(p5)) / 5;
@@ -119,7 +119,7 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
             int factor = 256 / threshold;
             for (int y = 0; y < original.height(); ++y) {
                 for (int x = 0; x < original.width(); ++x) {
-                    int pixel = original.pixel(x, y);
+                    QRgb pixel = original.pixel(x, y);
                     result.setPixel(x, y, qRgba(qRed(pixel) / factor * factor,
                                                 qGreen(pixel) / factor * factor,
                                                 qBlue(pixel) / factor * factor,