From 107ff4c1d6b5da2cb11c65b2bd9106817f7fdb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 16 Sep 2020 12:04:31 +0200 Subject: Q(Any|Utf8)StringView: move array size deduction feature to fromArray The constructor taking an array literal will now stop at the first null-terminator encountered. And fromArray is introduced which only supports array literals. Constructs a view of the full size. Explicit so it shouldn't be surprising. Change-Id: I1497c33a5c12453a95e87c990abe6335b2817081 Reviewed-by: Andrei Golubev Reviewed-by: Lars Knoll --- src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp | 4 ++-- src/corelib/doc/snippets/code/src_corelib_text_qstringview.cpp | 4 ---- src/corelib/doc/snippets/code/src_corelib_text_qutf8stringview.cpp | 5 ----- 3 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src/corelib/doc') diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp index 745e5e7e10..de5c511348 100644 --- a/src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp @@ -54,6 +54,6 @@ //! [0] //! [2] - auto sv1 = QAnyStringView{std::begin(array), std::end(array)}; // using C++11 std::begin()/std::end() - auto sv2 = QAnyStringView(array, std::size(array)); // using C++17 std::size() + auto sv1 = QAnyStringView{std::begin(array), std::end(array) - 1}; // using C++11 std::begin()/std::end() + auto sv2 = QAnyStringView(array, std::size(array) - 1); // using C++17 std::size() //! [2] diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qstringview.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qstringview.cpp index fc426e1977..380e069b53 100644 --- a/src/corelib/doc/snippets/code/src_corelib_text_qstringview.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_text_qstringview.cpp @@ -56,7 +56,3 @@ //! [1] void fun(QChar ch) { fun(QStringView(&ch, 1)); } //! [1] - -//! [2] - auto sv = QStringView(array, std::size(array)); // using C++17 std::size() -//! [2] diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qutf8stringview.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qutf8stringview.cpp index b1033371b1..ba52e2d5c2 100644 --- a/src/corelib/doc/snippets/code/src_corelib_text_qutf8stringview.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_text_qutf8stringview.cpp @@ -52,8 +52,3 @@ void myfun1(QUtf8StringView sv); // preferred void myfun2(const QUtf8StringView &sv); // compiles and works, but slower //! [0] - -//! [2] - auto sv1 = QUtf8StringView{std::begin(array), std::end(array)}; // using C++11 std::begin()/std::end() - auto sv2 = QUtf8StringView(array, std::size(array)); // using C++17 std::size() -//! [2] -- cgit v1.2.3