Simplified some QMenu::addAction calls

This new signature is available since Qt 5.6.
vinnydiehl · Mar 18, 2020 · 079ab20 · 079ab20
1 parent d3badef
commit 079ab20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/src/tiled/commanddatamodel.cpp b/src/tiled/commanddatamodel.cpp
@@ -284,27 +284,20 @@ QMenu *CommandDataModel::contextMenu(QWidget *parent, const QModelIndex &index)
     if (row >= 0 && row < mCommands.size()) {
         menu = new QMenu(parent);
 
-        if (row > 0) {
-            connect(menu->addAction(tr("Move Up")), &QAction::triggered,
-                    [=] { moveUp(row); });
-        }
+        if (row > 0)
+            menu->addAction(tr("Move Up"), [=] { moveUp(row); });
 
-        if (row + 1 < mCommands.size()) {
-            connect(menu->addAction(tr("Move Down")), &QAction::triggered,
-                    [=] { moveUp(row + 1); });
-        }
+        if (row + 1 < mCommands.size())
+            menu->addAction(tr("Move Down"), [=] { moveUp(row + 1); });
 
         menu->addSeparator();
-        connect(menu->addAction(tr("Execute")), &QAction::triggered,
-                [=] { execute(row); });
+        menu->addAction(tr("Execute"), [=] { execute(row); });
 #if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
-        connect(menu->addAction(tr("Execute in Terminal")), &QAction::triggered,
-                [=] { executeInTerminal(row); });
+        menu->addAction(tr("Execute in Terminal"), [=] { executeInTerminal(row); });
 #endif
 
         menu->addSeparator();
-        connect(menu->addAction(tr("Delete")), &QAction::triggered,
-                [=] { remove(row); });
+        menu->addAction(tr("Delete"), [=] { remove(row); });
     }
 
     return menu;

diff --git a/src/tiled/tilesetdock.cpp b/src/tiled/tilesetdock.cpp
@@ -1087,8 +1087,8 @@ void TilesetDock::refreshTilesetMenu()
     const int currentIndex = mTabBar->currentIndex();
 
     for (int i = 0; i < mTabBar->count(); ++i) {
-        QAction *action = mTilesetMenu->addAction(mTabBar->tabText(i));
-        connect(action, &QAction::triggered, [=] { mTabBar->setCurrentIndex(i); });
+        QAction *action = mTilesetMenu->addAction(mTabBar->tabText(i),
+                                                  [=] { mTabBar->setCurrentIndex(i); });
 
         action->setCheckable(true);
         mTilesetActionGroup->addAction(action);