3 files changed, 23 insertions, 23 deletions
diff --git a/examples/widgets/widgets/scribble/mainwindow.cpp b/examples/widgets/widgets/scribble/mainwindow.cpp
index 44afa64b94..c9a34796ac 100644
--- a/examples/widgets/widgets/scribble/mainwindow.cpp
+++ b/examples/widgets/widgets/scribble/mainwindow.cpp
@@ -48,11 +48,18 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "mainwindow.h"
 #include "scribblearea.h"
 
+#include <QApplication>
+#include <QColorDialog>
+#include <QFileDialog>
+#include <QImageWriter>
+#include <QInputDialog>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QCloseEvent>
+
 //! [0]
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent), scribbleArea(new ScribbleArea(this))
@@ -71,11 +78,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 +237,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 +257,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]
diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp
index 13e46f6e1d..75371b523f 100644
--- a/examples/widgets/widgets/scribble/scribblearea.cpp
+++ b/examples/widgets/widgets/scribble/scribblearea.cpp
@@ -50,7 +50,9 @@
 
 #include "scribblearea.h"
 
-#include <QtWidgets>
+#include <QMouseEvent>
+#include <QPainter>
+
 #if defined(QT_PRINTSUPPORT_LIB)
 #include <QtPrintSupport/qtprintsupportglobal.h>
 #if QT_CONFIG(printdialog)
@@ -64,10 +66,6 @@ ScribbleArea::ScribbleArea(QWidget *parent)
     : QWidget(parent)
 {
     setAttribute(Qt::WA_StaticContents);
-    modified = false;
-    scribbling = false;
-    myPenWidth = 1;
-    myPenColor = Qt::blue;
 }
 //! [0]
 
@@ -98,9 +96,8 @@ bool ScribbleArea::saveImage(const QString &fileName, const char *fileFormat)
     if (visibleImage.save(fileName, fileFormat)) {
         modified = false;
         return true;
-    } else {
-        return false;
     }
+    return false;
 }
 //! [4]
 
diff --git a/examples/widgets/widgets/scribble/scribblearea.h b/examples/widgets/widgets/scribble/scribblearea.h
index 100c45e133..ed3c8a2a15 100644
--- a/examples/widgets/widgets/scribble/scribblearea.h
+++ b/examples/widgets/widgets/scribble/scribblearea.h
@@ -88,10 +88,10 @@ private:
     void drawLineTo(const QPoint &endPoint);
     void resizeImage(QImage *image, const QSize &newSize);
 
-    bool modified;
-    bool scribbling;
-    int myPenWidth;
-    QColor myPenColor;
+    bool modified = false;
+    bool scribbling = false;
+    int myPenWidth = 1;
+    QColor myPenColor = Qt::blue;
     QImage image;
     QPoint lastPoint;
 };