diff options
Diffstat (limited to 'examples/widgets/tools/plugandpaint')
6 files changed, 27 insertions, 20 deletions
diff --git a/examples/widgets/tools/plugandpaint/app/mainwindow.cpp b/examples/widgets/tools/plugandpaint/app/mainwindow.cpp index ebe1150eea..ff3b3614af 100644 --- a/examples/widgets/tools/plugandpaint/app/mainwindow.cpp +++ b/examples/widgets/tools/plugandpaint/app/mainwindow.cpp @@ -49,8 +49,8 @@ ****************************************************************************/ -#include "interfaces.h" #include "mainwindow.h" +#include "interfaces.h" #include "paintarea.h" #include "plugindialog.h" @@ -67,9 +67,8 @@ #include <QScrollArea> #include <QTimer> -MainWindow::MainWindow() : - paintArea(new PaintArea), - scrollArea(new QScrollArea) +MainWindow::MainWindow() : paintArea(new PaintArea) + , scrollArea(new QScrollArea) { scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(paintArea); @@ -136,7 +135,11 @@ void MainWindow::brushWidth() void MainWindow::changeBrush() { auto action = qobject_cast<QAction *>(sender()); + if (!action) + return; auto iBrush = qobject_cast<BrushInterface *>(action->parent()); + if (!iBrush) + return; const QString brush = action->text(); paintArea->setBrush(iBrush, brush); @@ -147,7 +150,11 @@ void MainWindow::changeBrush() void MainWindow::insertShape() { auto action = qobject_cast<QAction *>(sender()); + if (!action) + return; auto iShape = qobject_cast<ShapeInterface *>(action->parent()); + if (!iShape) + return; const QPainterPath path = iShape->generateShape(action->text(), this); if (!path.isEmpty()) @@ -159,7 +166,11 @@ void MainWindow::insertShape() void MainWindow::applyFilter() { auto action = qobject_cast<QAction *>(sender()); + if (!action) + return; auto iFilter = qobject_cast<FilterInterface *>(action->parent()); + if (!iFilter) + return; const QImage image = iFilter->filterImage(action->text(), paintArea->image(), this); @@ -247,7 +258,7 @@ void MainWindow::loadPlugins() populateMenus(plugin); //! [4] //! [5] - pluginsDir = QDir(qApp->applicationDirPath()); + pluginsDir = QDir(QCoreApplication::applicationDirPath()); #if defined(Q_OS_WIN) if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release") diff --git a/examples/widgets/tools/plugandpaint/app/paintarea.cpp b/examples/widgets/tools/plugandpaint/app/paintarea.cpp index e225d78398..92b8ea4777 100644 --- a/examples/widgets/tools/plugandpaint/app/paintarea.cpp +++ b/examples/widgets/tools/plugandpaint/app/paintarea.cpp @@ -49,14 +49,13 @@ ****************************************************************************/ -#include "interfaces.h" #include "paintarea.h" +#include "interfaces.h" #include <QMouseEvent> #include <QPainter> -PaintArea::PaintArea(QWidget *parent) : - QWidget(parent) +PaintArea::PaintArea(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_StaticContents); setAttribute(Qt::WA_OpaquePaintEvent); diff --git a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp index 84bd364b41..204d6ffec4 100644 --- a/examples/widgets/tools/plugandpaint/app/plugindialog.cpp +++ b/examples/widgets/tools/plugandpaint/app/plugindialog.cpp @@ -49,8 +49,8 @@ ****************************************************************************/ -#include "interfaces.h" #include "plugindialog.h" +#include "interfaces.h" #include <QDir> #include <QGridLayout> 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 { |