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>
This commit is contained in:
Marc Mutz 2021-07-13 07:02:21 +02:00
parent a3a8a1dd7c
commit 0e02f6536a
3 changed files with 13 additions and 13 deletions

View File

@ -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);

View File

@ -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()

View File

@ -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"));