summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2021-07-13 07:02:21 +0200
committerMarc Mutz <marc.mutz@kdab.com>2021-07-14 00:46:49 +0200
commit0e02f6536acb721a55af12c11fef27299b354d24 (patch)
tree857864bd783d336c1cf41e2303044f007c7661ee /examples
parenta3a8a1dd7c7e9d6a98ed2597ebac638edf5f067d (diff)
Port all in-tree addAction() users from postfix to infix QKeySequence
The former is QT_DEPRECATED_SINCE(6, 4). Change-Id: I9e60639651b0832f1e3d3282d15dd0ab0b22d819 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/widgets/itemviews/simpledommodel/mainwindow.cpp4
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp12
-rw-r--r--examples/widgets/widgets/tablet/mainwindow.cpp10
3 files changed, 13 insertions, 13 deletions
diff --git a/examples/widgets/itemviews/simpledommodel/mainwindow.cpp b/examples/widgets/itemviews/simpledommodel/mainwindow.cpp
index 86543b07a6..56e1381869 100644
--- a/examples/widgets/itemviews/simpledommodel/mainwindow.cpp
+++ b/examples/widgets/itemviews/simpledommodel/mainwindow.cpp
@@ -62,8 +62,8 @@ MainWindow::MainWindow(QWidget *parent)
view(new QTreeView(this))
{
fileMenu = menuBar()->addMenu(tr("&File"));
- fileMenu->addAction(tr("&Open..."), this, &MainWindow::openFile, QKeySequence::Open);
- fileMenu->addAction(tr("E&xit"), this, &QWidget::close, QKeySequence::Quit);
+ fileMenu->addAction(tr("&Open..."), QKeySequence::Open, this, &MainWindow::openFile);
+ fileMenu->addAction(tr("E&xit"), QKeySequence::Quit, this, &QWidget::close);
view->setModel(model);
diff --git a/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp b/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp
index 2dba0ba73e..e09579881d 100644
--- a/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp
+++ b/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp
@@ -117,12 +117,12 @@ void MainWindow::setupFileMenu()
QMenu *fileMenu = new QMenu(tr("&File"), this);
menuBar()->addMenu(fileMenu);
- fileMenu->addAction(tr("&New"), this,
- &MainWindow::newFile, QKeySequence::New);
- fileMenu->addAction(tr("&Open..."),
- this, [this](){ openFile(); }, QKeySequence::Open);
- fileMenu->addAction(tr("E&xit"), qApp,
- &QApplication::quit, QKeySequence::Quit);
+ fileMenu->addAction(tr("&New"), QKeySequence::New,
+ this, &MainWindow::newFile);
+ fileMenu->addAction(tr("&Open..."), QKeySequence::Open,
+ this, [this](){ openFile(); });
+ fileMenu->addAction(tr("E&xit"), QKeySequence::Quit,
+ qApp, &QApplication::quit);
}
void MainWindow::setupHelpMenu()
diff --git a/examples/widgets/widgets/tablet/mainwindow.cpp b/examples/widgets/widgets/tablet/mainwindow.cpp
index 102fb813b8..812be9e7e2 100644
--- a/examples/widgets/widgets/tablet/mainwindow.cpp
+++ b/examples/widgets/widgets/tablet/mainwindow.cpp
@@ -155,13 +155,13 @@ void MainWindow::about()
void MainWindow::createMenus()
{
QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
- fileMenu->addAction(tr("&Open..."), this, &MainWindow::load, QKeySequence::Open);
- fileMenu->addAction(tr("&Save As..."), this, &MainWindow::save, QKeySequence::SaveAs);
- fileMenu->addAction(tr("&New"), this, &MainWindow::clear, QKeySequence::New);
- fileMenu->addAction(tr("E&xit"), this, &MainWindow::close, QKeySequence::Quit);
+ fileMenu->addAction(tr("&Open..."), QKeySequence::Open, this, &MainWindow::load);
+ fileMenu->addAction(tr("&Save As..."), QKeySequence::SaveAs, this, &MainWindow::save);
+ fileMenu->addAction(tr("&New"), QKeySequence::New, this, &MainWindow::clear);
+ fileMenu->addAction(tr("E&xit"), QKeySequence::Quit, this, &MainWindow::close);
QMenu *brushMenu = menuBar()->addMenu(tr("&Brush"));
- brushMenu->addAction(tr("&Brush Color..."), this, &MainWindow::setBrushColor, tr("Ctrl+B"));
+ brushMenu->addAction(tr("&Brush Color..."), tr("Ctrl+B"), this, &MainWindow::setBrushColor);
//! [8]
QMenu *tabletMenu = menuBar()->addMenu(tr("&Tablet"));