diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-09-06 22:38:45 +0200 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-09-17 23:05:23 +0200 |
commit | cb54c16584cf3be746a1a536c1e37cb3022a2f1b (patch) | |
tree | 712a4ee8d6383918233654e1deeefb3e91371941 /examples/widgets/widgets/scribble/mainwindow.cpp | |
parent | 7db335a77e9efcfc8e0d4c1bd0834100403ec3b1 (diff) |
Cleanup QtWidgets (widgets) examples
Cleanup QtWidgets widgets examples:
- use member-init (clang-tidy)
- fix includes/don't include QtWidgets globally
- include own header first
- use nullptr (clang-tidy)
- avoid c-style casts
- use QVector instead QList
Change-Id: Ib56bb507eb2ef885f1ddc664050d3c7af92adb70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/widgets/widgets/scribble/mainwindow.cpp')
-rw-r--r-- | examples/widgets/widgets/scribble/mainwindow.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/examples/widgets/widgets/scribble/mainwindow.cpp b/examples/widgets/widgets/scribble/mainwindow.cpp index 44afa64b94..db4f8d3637 100644 --- a/examples/widgets/widgets/scribble/mainwindow.cpp +++ b/examples/widgets/widgets/scribble/mainwindow.cpp @@ -48,11 +48,17 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "mainwindow.h" #include "scribblearea.h" +#include <QApplication> +#include <QColorDialog> +#include <QFileDialog> +#include <QImageWriter> +#include <QInputDialog> +#include <QMenuBar> +#include <QMessageBox> + //! [0] MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), scribbleArea(new ScribbleArea(this)) @@ -71,11 +77,10 @@ MainWindow::MainWindow(QWidget *parent) void MainWindow::closeEvent(QCloseEvent *event) //! [1] //! [2] { - if (maybeSave()) { + if (maybeSave()) event->accept(); - } else { + else event->ignore(); - } } //! [2] @@ -231,11 +236,10 @@ bool MainWindow::maybeSave() "Do you want to save your changes?"), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel); - if (ret == QMessageBox::Save) { + if (ret == QMessageBox::Save) return saveFile("png"); - } else if (ret == QMessageBox::Cancel) { + else if (ret == QMessageBox::Cancel) return false; - } } return true; } @@ -252,10 +256,8 @@ bool MainWindow::saveFile(const QByteArray &fileFormat) tr("%1 Files (*.%2);;All Files (*)") .arg(QString::fromLatin1(fileFormat.toUpper())) .arg(QString::fromLatin1(fileFormat))); - if (fileName.isEmpty()) { + if (fileName.isEmpty()) return false; - } else { - return scribbleArea->saveImage(fileName, fileFormat.constData()); - } + return scribbleArea->saveImage(fileName, fileFormat.constData()); } //! [20] |