diff options
author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /examples/widgets/tools/plugandpaint/app/plugindialog.cpp | |
parent | 88eda007a3b5046999dd0b287634765efcd8934d (diff) | |
parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
Diffstat (limited to 'examples/widgets/tools/plugandpaint/app/plugindialog.cpp')
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/plugindialog.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp index 00c2498bd5..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) : @@ -77,7 +76,7 @@ PluginDialog::PluginDialog(const QString &path, const QStringList &fileNames, okButton->setDefault(true); - connect(okButton, SIGNAL(clicked()), this, SLOT(close())); + connect(okButton, &QAbstractButton::clicked, this, &QWidget::close); QGridLayout *mainLayout = new QGridLayout; mainLayout->setColumnStretch(0, 1); @@ -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); } |