From 9dcff27fcf9a389bbcded1ff02f32ba4c015f936 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 14 Jun 2023 16:21:31 +0200 Subject: [PATCH] XBEL stream example: move createMenus() earlier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make the description of the type flow more naturally. Task-number: QTBUG-111228 Change-Id: I751bdaf420be7afc9cb4925af4f2a94367840605 Reviewed-by: MÃ¥rten Nordheim Reviewed-by: Mate Barany Reviewed-by: Konrad Kujawa (cherry picked from commit bb69def7d14795b64580ed68cc49ae31bff90340) Reviewed-by: Ievgenii Meshcheriakov --- .../streambookmarks/mainwindow.cpp | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/corelib/serialization/streambookmarks/mainwindow.cpp b/examples/corelib/serialization/streambookmarks/mainwindow.cpp index 41a608bfbcf..b45b348cf03 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]