From 13c198cedb169327d5fe8152b0e8d762c0ae1278 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Mon, 18 Jul 2016 08:34:35 +0200
Subject: Doc: Fix snippet to use initializer list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can expect C++11 now, and using an initializer list
is much shorter.

Change-Id: I6424d24ce7660b342a629e836b94d62c8868a44d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
---
 src/corelib/doc/snippets/code/src_corelib_kernel_qvariant.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/corelib/doc/snippets')

diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qvariant.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qvariant.cpp
index 576aea1cf5..ca1ea21b02 100644
--- a/src/corelib/doc/snippets/code/src_corelib_kernel_qvariant.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qvariant.cpp
@@ -147,10 +147,7 @@ QVariant data = QVariant::fromValue(object);
 
 //! [9]
 
-QList<int> intList;
-intList.push_back(7);
-intList.push_back(11);
-intList.push_back(42);
+QList<int> intList = {7, 11, 42};
 
 QVariant variant = QVariant::fromValue(intList);
 if (variant.canConvert<QVariantList>()) {
-- 
cgit v1.2.3


From 62cbb434579a56871f0917bc306d592055381c00 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 19 Jul 2016 08:48:40 +0200
Subject: Fix typo in doc snippets of qOverload and related

Task-number: QTBUG-54808
Change-Id: Ic565710e4d3a95abf98d4696ae7c0001a9171697
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/corelib/doc/snippets')

diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index a022187c21..54b5c95a34 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -583,13 +583,13 @@ template<> class QTypeInfo<A> : public QTypeInfoMerger<A, B, C, D> {};
         void overloadedFunction();
         void overloadedFunction(int, QString);
     };
-    ... qOverload<>(&Foo:overloadedFunction)
-    ... qOverload<int, QString>(&Foo:overloadedFunction)
+    ... qOverload<>(&Foo::overloadedFunction)
+    ... qOverload<int, QString>(&Foo::overloadedFunction)
 //! [52]
 
 //! [53]
-    ... QOverload<>::of(&Foo:overloadedFunction)
-    ... QOverload<int, QString>::of(&Foo:overloadedFunction)
+    ... QOverload<>::of(&Foo::overloadedFunction)
+    ... QOverload<int, QString>::of(&Foo::overloadedFunction)
 //! [53]
 
 //! [54]
@@ -597,8 +597,8 @@ template<> class QTypeInfo<A> : public QTypeInfoMerger<A, B, C, D> {};
         void overloadedFunction(int, QString);
         void overloadedFunction(int, QString) const;
     };
-    ... qConstOverload<>(&Foo:overloadedFunction)
-    ... qNonConstOverload<int, QString>(&Foo:overloadedFunction)
+    ... qConstOverload<>(&Foo::overloadedFunction)
+    ... qNonConstOverload<int, QString>(&Foo::overloadedFunction)
 //! [54]
 
 //! [qlikely]
-- 
cgit v1.2.3