2 files changed, 6 insertions, 29 deletions
diff --git a/examples/widgets/tutorials/notepad/main.cpp b/examples/widgets/tutorials/notepad/main.cpp
index 20bcdaa7df9..af5b09eedc5 100644
--- a/examples/widgets/tutorials/notepad/main.cpp
+++ b/examples/widgets/tutorials/notepad/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -49,13 +49,13 @@
 ****************************************************************************/
 
 #include "notepad.h"
+
 #include <QApplication>
 
 int main(int argc, char *argv[])
 {
-    QApplication EditorApp(argc, argv);
-    Notepad Editor;
-    Editor.show();
-
-    return EditorApp.exec();
+    QApplication a(argc, argv);
+    Notepad w;
+    w.show();
+    return a.exec();
 }
diff --git a/examples/widgets/tutorials/notepad/notepad.h b/examples/widgets/tutorials/notepad/notepad.h
index d4209daf6d9..03daa82a917 100644
--- a/examples/widgets/tutorials/notepad/notepad.h
+++ b/examples/widgets/tutorials/notepad/notepad.h
@@ -51,60 +51,37 @@
 #ifndef NOTEPAD_H
 #define NOTEPAD_H
 
-//! [all]
-//! [1]
 #include <QMainWindow>
-//! [1]
 
-//! [2]
 QT_BEGIN_NAMESPACE
 namespace Ui {
 class Notepad;
 }
 QT_END_NAMESPACE
-//! [2]
 
-//! [3]
 class Notepad : public QMainWindow
 {
     Q_OBJECT
-//! [3]
 
-//! [4]
 public:
     explicit Notepad(QWidget *parent = nullptr);
-//! [4]
-//! [5]
     ~Notepad();
-//! [5]
 
 private slots:
     void newDocument();
-
     void open();
-
     void save();
-
     void saveAs();
-
     void print();
-
     void selectFont();
-
     void setFontBold(bool bold);
-
     void setFontUnderline(bool underline);
-
     void setFontItalic(bool italic);
-
     void about();
 
-//! [6]
 private:
     Ui::Notepad *ui;
     QString currentFile;
-//! [6]
 };
-//! [all]
 
 #endif // NOTEPAD_H