QMenu/QToolBar: remove addAction() functions

They're now in QWidget itself. Remove them from the API, but not the
ABI.

The QToolBar case is straight-forward. QMenu is a bit more complicated:

Since QT_CONFIG(shortcut) builds changed the signature of an existing
function instead of adding/removing an overload, we have to deal with
two cases: In a QT_CONFIG(shortcut) build, these overloads that take a
trailing QKeySequence parameter have been deprecated and therefore
cannot be removed. In a !QT_CONFIG(shortcut) build, the same functions
are 1:1 copies of QWidget functions and can be removed (from the API).

[ChangeLog][QtWidgets][QMenu/QToolBar] The addAction() functions have
been moved down into QWidget.

Change-Id: I49997b3440c137a1d4e3858d1d27d34a191e1eed
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

5 files changed, 16 insertions, 16 deletions

diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
index 4be214ad64..6ba5bde2e0 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
@@ -78,8 +78,8 @@ QKeySequence(Qt::CTRL + Qt::Key_X, Qt::CTRL + Qt::Key_C); // deprecated
 void Wrapper::wrapper() {
 //! [2]
 QMenu *file = new QMenu(this);
-file->addAction(tr("&Open..."), this, SLOT(open()),
-                  QKeySequence(tr("Ctrl+O", "File|Open")));
+file->addAction(tr("&Open..."), QKeySequence(tr("Ctrl+O", "File|Open")),
+                this, SLOT(open()));
 //! [2]
 
 } // Wrapper::wrapper
diff --git a/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp
index 5179208f61..119cf1b5f7 100644
--- a/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp
@@ -59,8 +59,8 @@ MainWindow::MainWindow()
 {
     QMenu *fileMenu = new QMenu(tr("&File"));
 
-    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
-        QKeySequence(tr("Ctrl+Q", "File|Exit")));
+    fileMenu->addAction(tr("E&xit"), QKeySequence(tr("Ctrl+Q", "File|Exit")),
+                        this, SLOT(close()));
 
     QMenu *actionsMenu = new QMenu(tr("&Actions"));
     actionsMenu->addAction(tr("&Highlight List Items"),
@@ -69,8 +69,8 @@ MainWindow::MainWindow()
 
     QMenu *insertMenu = new QMenu(tr("&Insert"));
 
-    insertMenu->addAction(tr("&List"), this, SLOT(insertList()),
-        QKeySequence(tr("Ctrl+L", "Insert|List")));
+    insertMenu->addAction(tr("&List"), QKeySequence(tr("Ctrl+L", "Insert|List")),
+                          this, SLOT(insertList()));
 
     menuBar()->addMenu(fileMenu);
     menuBar()->addMenu(insertMenu);
diff --git a/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
index dcf28b92ba..49f96bff18 100644
--- a/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
@@ -57,13 +57,13 @@ MainWindow::MainWindow()
 {
     QMenu *fileMenu = new QMenu(tr("&File"));
 
-    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
-        QKeySequence(tr("Ctrl+Q", "File|Exit")));
+    fileMenu->addAction(tr("E&xit"), QKeySequence(tr("Ctrl+Q", "File|Exit")),
+                        this, SLOT(close()));
 
     QMenu *insertMenu = new QMenu(tr("&Insert"));
 
-    insertMenu->addAction(tr("&List"), this, SLOT(insertList()),
-        QKeySequence(tr("Ctrl+L", "Insert|List")));
+    insertMenu->addAction(tr("&List"), QKeySequence(tr("Ctrl+L", "Insert|List")),
+                          this, SLOT(insertList()));
 
     menuBar()->addMenu(fileMenu);
     menuBar()->addMenu(insertMenu);
diff --git a/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp b/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
index bccbef178e..60d94a99ba 100644
--- a/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
@@ -60,8 +60,8 @@ MainWindow::MainWindow()
 {
     QMenu *fileMenu = new QMenu(tr("&File"));
 
-    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
-                        QKeySequence(tr("Ctrl+O", "File|Open")));
+    fileMenu->addAction(tr("&Open..."), QKeySequence(tr("Ctrl+O", "File|Open"))
+                        this, SLOT(openFile()));
 
     printAction = fileMenu->addAction(tr("&Print..."), this, SLOT(printFile()));
     printAction->setEnabled(false);
@@ -69,8 +69,8 @@ MainWindow::MainWindow()
     pdfPrintAction = fileMenu->addAction(tr("Print as P&DF..."), this, SLOT(printPdf()));
     pdfPrintAction->setEnabled(false);
 
-    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
-                        QKeySequence(tr("Ctrl+Q", "File|Exit")));
+    fileMenu->addAction(tr("E&xit"), QKeySequence(tr("Ctrl+Q", "File|Exit")),
+                        this, SLOT(close()));
 
     menuBar()->addMenu(fileMenu);
 
diff --git a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
index 3e491151bc..ef25fa9112 100644
--- a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
@@ -55,8 +55,8 @@ MainWindow::MainWindow()
 {
     QMenu *fileMenu = new QMenu(tr("&File"));
 
-    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
-                        QKeySequence(tr("Ctrl+O", "File|Open")));
+    fileMenu->addAction(tr("&Open..."), QKeySequence(tr("Ctrl+O", "File|Open")),
+                        this, SLOT(openFile()));
 
     QAction *quitAction = fileMenu->addAction(tr("E&xit"), this, SLOT(close()));
     quitAction->setShortcut(tr("Ctrl+Q"));