From 1a1093b849df33baa5cee246d71e6ba63730c52f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 2 Oct 2019 09:36:02 +0900 Subject: wrap_in_function() Because Apple stdlib doesn't have std::function deduction guides. --- lib/qt_connection_util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/qt_connection_util.h') diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h index 9baf8c69..3c81e3ac 100644 --- a/lib/qt_connection_util.h +++ b/lib/qt_connection_util.h @@ -104,7 +104,7 @@ inline auto connectUntil(SenderT* sender, SignalT signal, ContextT* context, const FunctorT& slot, Qt::ConnectionType connType = Qt::AutoConnection) { - return _impl::connectUntil(sender, signal, context, std::function(slot), + return _impl::connectUntil(sender, signal, context, wrap_in_function(slot), connType); } @@ -115,7 +115,7 @@ inline auto connectSingleShot(SenderT* sender, SignalT signal, Qt::ConnectionType connType = Qt::AutoConnection) { return _impl::connectSingleShot( - sender, signal, context, std::function(slot), connType); + sender, signal, context, wrap_in_function(slot), connType); } // Specialisation for usual Qt slots passed as pointers-to-members. @@ -128,7 +128,7 @@ inline auto connectSingleShot(SenderT* sender, SignalT signal, { // TODO: when switching to C++20, use std::bind_front() instead return _impl::connectSingleShot(sender, signal, receiver, - std::function( + wrap_in_function( [receiver, slot](const ArgTs&... args) { (receiver->*slot)(args...); }), -- cgit v1.2.3