From 5e6474dba9392c8439a5c9cc877fbb1570337a6c Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sat, 29 Aug 2020 17:12:34 +0800 Subject: Doc: Simplify example for specifying overloaded signals/slots Keep qOverload<> only, which is arguably better than all the others: * QOverload<>::of is obsolete since Qt 6 requires C++17 * static_cast<> is harder to read * The explicitly-typed function pointer variable is arguably harder to read too: auto mySlot = qOverload(&QLCDNumber::display); vs. void (QLCDNumber::*mySlot)(int) = &QLCDNumber::display; Change-Id: I6cba15bcf1b46b4fecd704b4d842deb4be5db81f Reviewed-by: Paul Wicking --- doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'doc/src/snippets') diff --git a/doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp b/doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp index a6d9aa6f8..ec7bcb4f1 100644 --- a/doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp +++ b/doc/src/snippets/signalsandslots/signalslotsyntaxes.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 Sze Howe Koh +** Copyright (C) 2020 Sze Howe Koh ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -143,20 +143,7 @@ void DemoWidget::demoOverloadConnect() connect(slider, SIGNAL(valueChanged(int)), lcd, SLOT(display(int))); - // Functor-based syntax, first alternative - connect(slider, &QSlider::valueChanged, - lcd, static_cast(&QLCDNumber::display)); - - // Functor-based syntax, second alternative - void (QLCDNumber::*mySlot)(int) = &QLCDNumber::display; - connect(slider, &QSlider::valueChanged, - lcd, mySlot); - - // Functor-based syntax, third alternative - connect(slider, &QSlider::valueChanged, - lcd, QOverload::of(&QLCDNumber::display)); - - // Functor-based syntax, fourth alternative (requires C++14) + // Functor-based syntax connect(slider, &QSlider::valueChanged, lcd, qOverload(&QLCDNumber::display)); //! [overload] -- cgit v1.2.3