diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2017-04-22 13:21:28 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2017-04-29 08:24:24 +0000 |
| commit | 9d918495ee56dca5826070df888d20adfcc29641 (patch) | |
| tree | f747852109c01af142ca8fe2e100c13a0c690247 /src/widgets/widgets | |
| parent | a6c091c2d18f6e7f849da7dfa3bd1971017fca73 (diff) | |
Add a few std::move in functions accepting slots
This allows the use of move-only function objects
Task-number: QTBUG-60339
Change-Id: If3595fca338cf7f3039eb566cc02e4e73cd04c86
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qmenu.h | 8 | ||||
| -rw-r--r-- | src/widgets/widgets/qtoolbar.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index e9a5db1112..dbfd12124c 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -108,7 +108,7 @@ public: #else result->setShortcut(shortcut); #endif - connect(result, &QAction::triggered, object, slot); + connect(result, &QAction::triggered, object, std::move(slot)); return result; } // addAction(QString): Connect to a functor or function pointer (without context) @@ -121,7 +121,7 @@ public: #else result->setShortcut(shortcut); #endif - connect(result, &QAction::triggered, slot); + connect(result, &QAction::triggered, std::move(slot)); return result; } // addAction(QIcon, QString): Connect to a QObject slot / functor or function pointer (with context) @@ -136,7 +136,7 @@ public: #else result->setShortcut(shortcut); #endif - connect(result, &QAction::triggered, object, slot); + connect(result, &QAction::triggered, object, std::move(slot)); return result; } // addAction(QIcon, QString): Connect to a functor or function pointer (without context) @@ -149,7 +149,7 @@ public: #else result->setShortcut(shortcut); #endif - connect(result, &QAction::triggered, slot); + connect(result, &QAction::triggered, std::move(slot)); return result; } #endif // !Q_QDOC diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index e0f2d9b073..9ffb472c76 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -121,7 +121,7 @@ public: addAction(const QString &text, const Obj *object, Func1 slot) { QAction *result = addAction(text); - connect(result, &QAction::triggered, object, slot); + connect(result, &QAction::triggered, object, std::move(slot)); return result; } // addAction(QString): Connect to a functor or function pointer (without context) @@ -139,7 +139,7 @@ public: addAction(const QIcon &actionIcon, const QString &text, const Obj *object, Func1 slot) { QAction *result = addAction(actionIcon, text); - connect(result, &QAction::triggered, object, slot); + connect(result, &QAction::triggered, object, std::move(slot)); return result; } // addAction(QIcon, QString): Connect to a functor or function pointer (without context) |