summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2023-06-14 16:21:31 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2023-07-13 17:07:28 +0200
commit9dcff27fcf9a389bbcded1ff02f32ba4c015f936 (patch)
tree98665fc93a5057ebcc94179d4d264ed21bad8090 /examples
parent167117237543eec785b7c305cfa179e6b401fddf (diff)
XBEL stream example: move createMenus() earlier
This will make the description of the type flow more naturally. Task-number: QTBUG-111228 Change-Id: I751bdaf420be7afc9cb4925af4f2a94367840605 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Mate Barany <mate.barany@qt.io> Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io> (cherry picked from commit bb69def7d14795b64580ed68cc49ae31bff90340) Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/corelib/serialization/streambookmarks/mainwindow.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/examples/corelib/serialization/streambookmarks/mainwindow.cpp b/examples/corelib/serialization/streambookmarks/mainwindow.cpp
index 41a608bfbc..b45b348cf0 100644
--- a/examples/corelib/serialization/streambookmarks/mainwindow.cpp
+++ b/examples/corelib/serialization/streambookmarks/mainwindow.cpp
@@ -63,6 +63,27 @@ void MainWindow::onCustomContextMenuRequested(const QPoint &pos)
}
#endif // QT_CONFIG(clipboard) && QT_CONFIG(contextmenu)
+//! [5]
+void MainWindow::createMenus()
+{
+ QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+ QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &MainWindow::open);
+ openAct->setShortcuts(QKeySequence::Open);
+
+ QAction *saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &MainWindow::saveAs);
+ saveAsAct->setShortcuts(QKeySequence::SaveAs);
+
+ QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
+ exitAct->setShortcuts(QKeySequence::Quit);
+
+ menuBar()->addSeparator();
+
+ QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+ helpMenu->addAction(tr("&About"), this, &MainWindow::about);
+ helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
+}
+//! [5]
+
//! [1]
void MainWindow::open()
{
@@ -130,24 +151,3 @@ void MainWindow::about()
"QXmlStream classes to read and write XML documents."));
}
//! [3]
-
-//! [5]
-void MainWindow::createMenus()
-{
- QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
- QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &MainWindow::open);
- openAct->setShortcuts(QKeySequence::Open);
-
- QAction *saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &MainWindow::saveAs);
- saveAsAct->setShortcuts(QKeySequence::SaveAs);
-
- QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
- exitAct->setShortcuts(QKeySequence::Quit);
-
- menuBar()->addSeparator();
-
- QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
- helpMenu->addAction(tr("&About"), this, &MainWindow::about);
- helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
-}
-//! [5]