From a1e84f4bf7c53585ce9f8e3ae369475c35de7ae3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 8 Nov 2022 12:38:19 +0100 Subject: [PATCH] qNN headers: only promise what we can keep In general, we can't make the qNN types behave exactly like their C++NN std counter-parts, because their exact semantics and implementation may depend on C++NN language features, while qNN are back-ports to C++ standards older than NN. Adjust the warning message accordingly. Thanks to Eddy for noticing. Change-Id: I8533214549f2140a99e2216e3bcd979263fe100c Reviewed-by: Volker Hilsheimer Reviewed-by: Edward Welbourne (cherry picked from commit f1c41382af0fd3e769b5792891b204ebeecd3bd2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/q20algorithm.h | 6 +++--- src/corelib/global/q20functional.h | 6 +++--- src/corelib/global/q20iterator.h | 6 +++--- src/corelib/global/q23functional.h | 6 +++--- src/corelib/global/qxpfunctional.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/corelib/global/q20algorithm.h b/src/corelib/global/q20algorithm.h index 69dc2d24463..f670a5dbeee 100644 --- a/src/corelib/global/q20algorithm.h +++ b/src/corelib/global/q20algorithm.h @@ -12,9 +12,9 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. Types and functions defined -// in this file will behave exactly as their std counterparts. You -// may use these definitions in your own code, but be aware that we +// This file is not part of the Qt API. Types and functions defined in this +// file can reliably be replaced by their std counterparts, once available. +// You may use these definitions in your own code, but be aware that we // will remove them once Qt depends on the C++ version that supports // them in namespace std. There will be NO deprecation warning, the // definitions will JUST go away. diff --git a/src/corelib/global/q20functional.h b/src/corelib/global/q20functional.h index 95842526632..7ba10bd4b1b 100644 --- a/src/corelib/global/q20functional.h +++ b/src/corelib/global/q20functional.h @@ -11,9 +11,9 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. Types and functions defined -// in this file will behave exactly as their std counterparts. You -// may use these definitions in your own code, but be aware that we +// This file is not part of the Qt API. Types and functions defined in this +// file can reliably be replaced by their std counterparts, once available. +// You may use these definitions in your own code, but be aware that we // will remove them once Qt depends on the C++ version that supports // them in namespace std. There will be NO deprecation warning, the // definitions will JUST go away. diff --git a/src/corelib/global/q20iterator.h b/src/corelib/global/q20iterator.h index a7f1cf3cfc1..23b6406b64c 100644 --- a/src/corelib/global/q20iterator.h +++ b/src/corelib/global/q20iterator.h @@ -11,9 +11,9 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. Types and functions defined -// in this file will behave exactly as their std counterparts. You -// may use these definitions in your own code, but be aware that we +// This file is not part of the Qt API. Types and functions defined in this +// file can reliably be replaced by their std counterparts, once available. +// You may use these definitions in your own code, but be aware that we // will remove them once Qt depends on the C++ version that supports // them in namespace std. There will be NO deprecation warning, the // definitions will JUST go away. diff --git a/src/corelib/global/q23functional.h b/src/corelib/global/q23functional.h index 5f83df698e4..ae8f78a3d0b 100644 --- a/src/corelib/global/q23functional.h +++ b/src/corelib/global/q23functional.h @@ -10,9 +10,9 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. Types and functions defined -// in this file will behave exactly as their std counterparts. You -// may use these definitions in your own code, but be aware that we +// This file is not part of the Qt API. Types and functions defined in this +// file can reliably be replaced by their std counterparts, once available. +// You may use these definitions in your own code, but be aware that we // will remove them once Qt depends on the C++ version that supports // them in namespace std. There will be NO deprecation warning, the // definitions will JUST go away. diff --git a/src/corelib/global/qxpfunctional.h b/src/corelib/global/qxpfunctional.h index 67350c56ed7..96570597535 100644 --- a/src/corelib/global/qxpfunctional.h +++ b/src/corelib/global/qxpfunctional.h @@ -9,9 +9,9 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. Types and functions defined -// in this file will behave exactly as their std counterparts. You -// may use these definitions in your own code, but be aware that we +// This file is not part of the Qt API. Types and functions defined in this +// file can reliably be replaced by their std counterparts, once available. +// You may use these definitions in your own code, but be aware that we // will remove them once Qt depends on the C++ version that supports // them in namespace std. There will be NO deprecation warning, the // definitions will JUST go away.