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>
---
 .../tools/plugandpaint/app/plugindialog.cpp        | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'examples/widgets/tools/plugandpaint/app/plugindialog.cpp')

diff --git a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp
index 43eb34f423..af5828f67e 100644
--- a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp
+++ b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp
@@ -52,16 +52,15 @@
 #include "interfaces.h"
 #include "plugindialog.h"
 
-#include <QPluginLoader>
-#include <QStringList>
 #include <QDir>
-
-#include <QLabel>
 #include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QPluginLoader>
 #include <QPushButton>
+#include <QStringList>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
-#include <QHeaderView>
 
 PluginDialog::PluginDialog(const QString &path, const QStringList &fileNames,
                            QWidget *parent) :
@@ -107,11 +106,12 @@ void PluginDialog::findPlugins(const QString &path,
 
     const QDir dir(path);
 
-    foreach (QObject *plugin, QPluginLoader::staticInstances())
+    const auto staticInstances = QPluginLoader::staticInstances();
+    for (QObject *plugin : staticInstances)
         populateTreeWidget(plugin, tr("%1 (Static Plugin)")
                                    .arg(plugin->metaObject()->className()));
 
-    foreach (QString fileName, fileNames) {
+    for (const QString &fileName : fileNames) {
         QPluginLoader loader(dir.absoluteFilePath(fileName));
         QObject *plugin = loader.instance();
         if (plugin)
@@ -123,7 +123,7 @@ void PluginDialog::findPlugins(const QString &path,
 //! [1]
 void PluginDialog::populateTreeWidget(QObject *plugin, const QString &text)
 {
-    QTreeWidgetItem *pluginItem = new QTreeWidgetItem(treeWidget);
+    auto pluginItem = new QTreeWidgetItem(treeWidget);
     pluginItem->setText(0, text);
     treeWidget->setItemExpanded(pluginItem, true);
 
@@ -132,16 +132,15 @@ void PluginDialog::populateTreeWidget(QObject *plugin, const QString &text)
     pluginItem->setFont(0, boldFont);
 
     if (plugin) {
-        BrushInterface *iBrush = qobject_cast<BrushInterface *>(plugin);
+        auto iBrush = qobject_cast<BrushInterface *>(plugin);
         if (iBrush)
             addItems(pluginItem, "BrushInterface", iBrush->brushes());
 
-        ShapeInterface *iShape = qobject_cast<ShapeInterface *>(plugin);
+        auto iShape = qobject_cast<ShapeInterface *>(plugin);
         if (iShape)
             addItems(pluginItem, "ShapeInterface", iShape->shapes());
 
-        FilterInterface *iFilter =
-                qobject_cast<FilterInterface *>(plugin);
+        auto iFilter = qobject_cast<FilterInterface *>(plugin);
         if (iFilter)
             addItems(pluginItem, "FilterInterface", iFilter->filters());
     }
@@ -152,14 +151,14 @@ void PluginDialog::addItems(QTreeWidgetItem *pluginItem,
                             const char *interfaceName,
                             const QStringList &features)
 {
-    QTreeWidgetItem *interfaceItem = new QTreeWidgetItem(pluginItem);
+    auto interfaceItem = new QTreeWidgetItem(pluginItem);
     interfaceItem->setText(0, interfaceName);
     interfaceItem->setIcon(0, interfaceIcon);
 
-    foreach (QString feature, features) {
+    for (QString feature : features) {
         if (feature.endsWith("..."))
             feature.chop(3);
-        QTreeWidgetItem *featureItem = new QTreeWidgetItem(interfaceItem);
+        auto featureItem = new QTreeWidgetItem(interfaceItem);
         featureItem->setText(0, feature);
         featureItem->setIcon(0, featureIcon);
     }
-- 
cgit v1.2.3