diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/tools/plugandpaint/app/mainwindow.cpp | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/tools/plugandpaint/app/mainwindow.cpp')
-rw-r--r-- | examples/widgets/tools/plugandpaint/app/mainwindow.cpp | 21 |
1 files changed, 16 insertions, 5 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") |