1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port examples/widgets/mainwindows/menus to new connection syntax.

Browse Source 
Change-Id: Ia7fa905cdda131d7c4a2c8a57557ea694eef3541
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Friedemann Kleint 2015-07-20 11:21:29 +02:00
parent dfa78b00da
commit 956b7023eb
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
examples/widgets/mainwindows/menus/mainwindow.cpp
View File

@ -198,63 +198,63 @@ void MainWindow::createActions()
newAct = new QAction(tr("&New"), this); newAct = new QAction(tr("&New"), this);
newAct->setShortcuts(QKeySequence::New); newAct->setShortcuts(QKeySequence::New);
newAct->setStatusTip(tr("Create a new file")); newAct->setStatusTip(tr("Create a new file"));
connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); connect(newAct, &QAction::triggered, this, &MainWindow::newFile);
//! [4] //! [4]
openAct = new QAction(tr("&Open..."), this); openAct = new QAction(tr("&Open..."), this);
openAct->setShortcuts(QKeySequence::Open); openAct->setShortcuts(QKeySequence::Open);
openAct->setStatusTip(tr("Open an existing file")); openAct->setStatusTip(tr("Open an existing file"));
connect(openAct, SIGNAL(triggered()), this, SLOT(open())); connect(openAct, &QAction::triggered, this, &MainWindow::open);
//! [5] //! [5]
saveAct = new QAction(tr("&Save"), this); saveAct = new QAction(tr("&Save"), this);
saveAct->setShortcuts(QKeySequence::Save); saveAct->setShortcuts(QKeySequence::Save);
saveAct->setStatusTip(tr("Save the document to disk")); saveAct->setStatusTip(tr("Save the document to disk"));
connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); connect(saveAct, &QAction::triggered, this, &MainWindow::save);
printAct = new QAction(tr("&Print..."), this); printAct = new QAction(tr("&Print..."), this);
printAct->setShortcuts(QKeySequence::Print); printAct->setShortcuts(QKeySequence::Print);
printAct->setStatusTip(tr("Print the document")); printAct->setStatusTip(tr("Print the document"));
connect(printAct, SIGNAL(triggered()), this, SLOT(print())); connect(printAct, &QAction::triggered, this, &MainWindow::print);
exitAct = new QAction(tr("E&xit"), this); exitAct = new QAction(tr("E&xit"), this);
exitAct->setShortcuts(QKeySequence::Quit); exitAct->setShortcuts(QKeySequence::Quit);
exitAct->setStatusTip(tr("Exit the application")); exitAct->setStatusTip(tr("Exit the application"));
connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); connect(exitAct, &QAction::triggered, this, &QWidget::close);
undoAct = new QAction(tr("&Undo"), this); undoAct = new QAction(tr("&Undo"), this);
undoAct->setShortcuts(QKeySequence::Undo); undoAct->setShortcuts(QKeySequence::Undo);
undoAct->setStatusTip(tr("Undo the last operation")); undoAct->setStatusTip(tr("Undo the last operation"));
connect(undoAct, SIGNAL(triggered()), this, SLOT(undo())); connect(undoAct, &QAction::triggered, this, &MainWindow::undo);
redoAct = new QAction(tr("&Redo"), this); redoAct = new QAction(tr("&Redo"), this);
redoAct->setShortcuts(QKeySequence::Redo); redoAct->setShortcuts(QKeySequence::Redo);
redoAct->setStatusTip(tr("Redo the last operation")); redoAct->setStatusTip(tr("Redo the last operation"));
connect(redoAct, SIGNAL(triggered()), this, SLOT(redo())); connect(redoAct, &QAction::triggered, this, &MainWindow::redo);
cutAct = new QAction(tr("Cu&t"), this); cutAct = new QAction(tr("Cu&t"), this);
cutAct->setShortcuts(QKeySequence::Cut); cutAct->setShortcuts(QKeySequence::Cut);
cutAct->setStatusTip(tr("Cut the current selection's contents to the " cutAct->setStatusTip(tr("Cut the current selection's contents to the "
"clipboard")); "clipboard"));
connect(cutAct, SIGNAL(triggered()), this, SLOT(cut())); connect(cutAct, &QAction::triggered, this, &MainWindow::cut);
copyAct = new QAction(tr("&Copy"), this); copyAct = new QAction(tr("&Copy"), this);
copyAct->setShortcuts(QKeySequence::Copy); copyAct->setShortcuts(QKeySequence::Copy);
copyAct->setStatusTip(tr("Copy the current selection's contents to the " copyAct->setStatusTip(tr("Copy the current selection's contents to the "
"clipboard")); "clipboard"));
connect(copyAct, SIGNAL(triggered()), this, SLOT(copy())); connect(copyAct, &QAction::triggered, this, &MainWindow::copy);
pasteAct = new QAction(tr("&Paste"), this); pasteAct = new QAction(tr("&Paste"), this);
pasteAct->setShortcuts(QKeySequence::Paste); pasteAct->setShortcuts(QKeySequence::Paste);
pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
"selection")); "selection"));
connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste())); connect(pasteAct, &QAction::triggered, this, &MainWindow::paste);
boldAct = new QAction(tr("&Bold"), this); boldAct = new QAction(tr("&Bold"), this);
boldAct->setCheckable(true); boldAct->setCheckable(true);
boldAct->setShortcut(QKeySequence::Bold); boldAct->setShortcut(QKeySequence::Bold);
boldAct->setStatusTip(tr("Make the text bold")); boldAct->setStatusTip(tr("Make the text bold"));
connect(boldAct, SIGNAL(triggered()), this, SLOT(bold())); connect(boldAct, &QAction::triggered, this, &MainWindow::bold);
QFont boldFont = boldAct->font(); QFont boldFont = boldAct->font();
boldFont.setBold(true); boldFont.setBold(true);
@ -264,7 +264,7 @@ void MainWindow::createActions()
italicAct->setCheckable(true); italicAct->setCheckable(true);
italicAct->setShortcut(QKeySequence::Italic); italicAct->setShortcut(QKeySequence::Italic);
italicAct->setStatusTip(tr("Make the text italic")); italicAct->setStatusTip(tr("Make the text italic"));
connect(italicAct, SIGNAL(triggered()), this, SLOT(italic())); connect(italicAct, &QAction::triggered, this, &MainWindow::italic);
QFont italicFont = italicAct->font(); QFont italicFont = italicAct->font();
italicFont.setItalic(true); italicFont.setItalic(true);
@ -273,45 +273,45 @@ void MainWindow::createActions()
setLineSpacingAct = new QAction(tr("Set &Line Spacing..."), this); setLineSpacingAct = new QAction(tr("Set &Line Spacing..."), this);
setLineSpacingAct->setStatusTip(tr("Change the gap between the lines of a " setLineSpacingAct->setStatusTip(tr("Change the gap between the lines of a "
"paragraph")); "paragraph"));
connect(setLineSpacingAct, SIGNAL(triggered()), this, SLOT(setLineSpacing())); connect(setLineSpacingAct, &QAction::triggered, this, &MainWindow::setLineSpacing);
setParagraphSpacingAct = new QAction(tr("Set &Paragraph Spacing..."), this); setParagraphSpacingAct = new QAction(tr("Set &Paragraph Spacing..."), this);
setParagraphSpacingAct->setStatusTip(tr("Change the gap between paragraphs")); setParagraphSpacingAct->setStatusTip(tr("Change the gap between paragraphs"));
connect(setParagraphSpacingAct, SIGNAL(triggered()), connect(setParagraphSpacingAct, &QAction::triggered,
this, SLOT(setParagraphSpacing())); this, &MainWindow::setParagraphSpacing);
aboutAct = new QAction(tr("&About"), this); aboutAct = new QAction(tr("&About"), this);
aboutAct->setStatusTip(tr("Show the application's About box")); aboutAct->setStatusTip(tr("Show the application's About box"));
connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); connect(aboutAct, &QAction::triggered, this, &MainWindow::about);
aboutQtAct = new QAction(tr("About &Qt"), this); aboutQtAct = new QAction(tr("About &Qt"), this);
aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); connect(aboutQtAct, &QAction::triggered, qApp, &QApplication::aboutQt);
connect(aboutQtAct, SIGNAL(triggered()), this, SLOT(aboutQt())); connect(aboutQtAct, &QAction::triggered, this, &MainWindow::aboutQt);
leftAlignAct = new QAction(tr("&Left Align"), this); leftAlignAct = new QAction(tr("&Left Align"), this);
leftAlignAct->setCheckable(true); leftAlignAct->setCheckable(true);
leftAlignAct->setShortcut(tr("Ctrl+L")); leftAlignAct->setShortcut(tr("Ctrl+L"));
leftAlignAct->setStatusTip(tr("Left align the selected text")); leftAlignAct->setStatusTip(tr("Left align the selected text"));
connect(leftAlignAct, SIGNAL(triggered()), this, SLOT(leftAlign())); connect(leftAlignAct, &QAction::triggered, this, &MainWindow::leftAlign);
rightAlignAct = new QAction(tr("&Right Align"), this); rightAlignAct = new QAction(tr("&Right Align"), this);
rightAlignAct->setCheckable(true); rightAlignAct->setCheckable(true);
rightAlignAct->setShortcut(tr("Ctrl+R")); rightAlignAct->setShortcut(tr("Ctrl+R"));
rightAlignAct->setStatusTip(tr("Right align the selected text")); rightAlignAct->setStatusTip(tr("Right align the selected text"));
connect(rightAlignAct, SIGNAL(triggered()), this, SLOT(rightAlign())); connect(rightAlignAct, &QAction::triggered, this, &MainWindow::rightAlign);
justifyAct = new QAction(tr("&Justify"), this); justifyAct = new QAction(tr("&Justify"), this);
justifyAct->setCheckable(true); justifyAct->setCheckable(true);
justifyAct->setShortcut(tr("Ctrl+J")); justifyAct->setShortcut(tr("Ctrl+J"));
justifyAct->setStatusTip(tr("Justify the selected text")); justifyAct->setStatusTip(tr("Justify the selected text"));
connect(justifyAct, SIGNAL(triggered()), this, SLOT(justify())); connect(justifyAct, &QAction::triggered, this, &MainWindow::justify);
centerAct = new QAction(tr("&Center"), this); centerAct = new QAction(tr("&Center"), this);
centerAct->setCheckable(true); centerAct->setCheckable(true);
centerAct->setShortcut(tr("Ctrl+E")); centerAct->setShortcut(tr("Ctrl+E"));
centerAct->setStatusTip(tr("Center the selected text")); centerAct->setStatusTip(tr("Center the selected text"));
connect(centerAct, SIGNAL(triggered()), this, SLOT(center())); connect(centerAct, &QAction::triggered, this, &MainWindow::center);
//! [6] //! [7] //! [6] //! [7]
alignmentGroup = new QActionGroup(this); alignmentGroup = new QActionGroup(this);