From 73a9c52fedf25196ed17d55cd1c6b1c1c9fd991d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Aug 2019 11:09:48 +0200
Subject: Reference Examples: Use initializer lists to avoid repeating type
 naems

Change-Id: Iff0b31d9b641a55ea246235ba1d7a066592ef0c0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/qml/referenceexamples/attached/birthdayparty.cpp    | 2 +-
 examples/qml/referenceexamples/coercion/birthdayparty.cpp    | 2 +-
 examples/qml/referenceexamples/default/birthdayparty.cpp     | 2 +-
 examples/qml/referenceexamples/grouped/birthdayparty.cpp     | 2 +-
 examples/qml/referenceexamples/methods/birthdayparty.cpp     | 2 +-
 examples/qml/referenceexamples/properties/birthdayparty.cpp  | 4 ++--
 examples/qml/referenceexamples/signal/birthdayparty.cpp      | 2 +-
 examples/qml/referenceexamples/valuesource/birthdayparty.cpp | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'examples/qml')

diff --git a/examples/qml/referenceexamples/attached/birthdayparty.cpp b/examples/qml/referenceexamples/attached/birthdayparty.cpp
index 26aa56e86c..da0cb800fc 100644
--- a/examples/qml/referenceexamples/attached/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/attached/birthdayparty.cpp
@@ -81,7 +81,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/qml/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/referenceexamples/coercion/birthdayparty.cpp
index e729c42bb5..1bae55076c 100644
--- a/examples/qml/referenceexamples/coercion/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/coercion/birthdayparty.cpp
@@ -66,7 +66,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/qml/referenceexamples/default/birthdayparty.cpp b/examples/qml/referenceexamples/default/birthdayparty.cpp
index e729c42bb5..1bae55076c 100644
--- a/examples/qml/referenceexamples/default/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/default/birthdayparty.cpp
@@ -66,7 +66,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/qml/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/referenceexamples/grouped/birthdayparty.cpp
index e729c42bb5..1bae55076c 100644
--- a/examples/qml/referenceexamples/grouped/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/grouped/birthdayparty.cpp
@@ -66,7 +66,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/qml/referenceexamples/methods/birthdayparty.cpp b/examples/qml/referenceexamples/methods/birthdayparty.cpp
index dfb36257eb..f13c500bcf 100644
--- a/examples/qml/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/methods/birthdayparty.cpp
@@ -67,7 +67,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/qml/referenceexamples/properties/birthdayparty.cpp b/examples/qml/referenceexamples/properties/birthdayparty.cpp
index 717c3e0f71..9abb08dbd9 100644
--- a/examples/qml/referenceexamples/properties/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/properties/birthdayparty.cpp
@@ -67,11 +67,11 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, this,
+    return {this, this,
              &BirthdayParty::appendGuest,
              &BirthdayParty::guestCount,
              &BirthdayParty::guest,
-             &BirthdayParty::clearGuests);
+             &BirthdayParty::clearGuests};
 }
 
 void BirthdayParty::appendGuest(Person* p) {
diff --git a/examples/qml/referenceexamples/signal/birthdayparty.cpp b/examples/qml/referenceexamples/signal/birthdayparty.cpp
index a5fbb742a5..9d34cdf146 100644
--- a/examples/qml/referenceexamples/signal/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/signal/birthdayparty.cpp
@@ -82,7 +82,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
diff --git a/examples/qml/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
index b107c61570..68d5767e8d 100644
--- a/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp
@@ -82,7 +82,7 @@ void BirthdayParty::setHost(Person *c)
 
 QQmlListProperty<Person> BirthdayParty::guests()
 {
-    return QQmlListProperty<Person>(this, m_guests);
+    return {this, m_guests};
 }
 
 int BirthdayParty::guestCount() const
-- 
cgit v1.2.3


From 66fabff2530f2080c07bcf89a47474daea4c7c38 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Aug 2019 11:04:30 +0200
Subject: Reference Examples: Use auto for results of new and
 component.create()

Change-Id: Ibfd92fbc5a99b38cf8b31a11c0adfdfa69e2bb36
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/qml/referenceexamples/adding/main.cpp                   | 2 +-
 examples/qml/referenceexamples/attached/main.cpp                 | 2 +-
 examples/qml/referenceexamples/binding/happybirthdaysong.cpp     | 2 +-
 examples/qml/referenceexamples/binding/main.cpp                  | 2 +-
 examples/qml/referenceexamples/coercion/main.cpp                 | 2 +-
 examples/qml/referenceexamples/default/main.cpp                  | 2 +-
 examples/qml/referenceexamples/extended/main.cpp                 | 2 +-
 examples/qml/referenceexamples/grouped/main.cpp                  | 2 +-
 examples/qml/referenceexamples/methods/birthdayparty.cpp         | 2 +-
 examples/qml/referenceexamples/methods/main.cpp                  | 2 +-
 examples/qml/referenceexamples/properties/main.cpp               | 2 +-
 examples/qml/referenceexamples/signal/main.cpp                   | 2 +-
 examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp | 2 +-
 examples/qml/referenceexamples/valuesource/main.cpp              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'examples/qml')

diff --git a/examples/qml/referenceexamples/adding/main.cpp b/examples/qml/referenceexamples/adding/main.cpp
index 5c3c891130..e312149da1 100644
--- a/examples/qml/referenceexamples/adding/main.cpp
+++ b/examples/qml/referenceexamples/adding/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    Person *person = qobject_cast<Person *>(component.create());
+    auto *person = qobject_cast<Person *>(component.create());
     if (person) {
         qWarning() << "The person's name is" << person->name();
         qWarning() << "They wear a" << person->shoeSize() << "sized shoe";
diff --git a/examples/qml/referenceexamples/attached/main.cpp b/examples/qml/referenceexamples/attached/main.cpp
index f07f16ae0f..581b033dfc 100644
--- a/examples/qml/referenceexamples/attached/main.cpp
+++ b/examples/qml/referenceexamples/attached/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
index fae016091b..5f8e6d696e 100644
--- a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
+++ b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
@@ -54,7 +54,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
 : QObject(parent), m_line(-1)
 {
     setName(QString());
-    QTimer *timer = new QTimer(this);
+    auto *timer = new QTimer(this);
     QObject::connect(timer, &QTimer::timeout, this, &HappyBirthdaySong::advance);
     timer->start(1000);
 }
diff --git a/examples/qml/referenceexamples/binding/main.cpp b/examples/qml/referenceexamples/binding/main.cpp
index cc9ce8f373..99187eba3e 100644
--- a/examples/qml/referenceexamples/binding/main.cpp
+++ b/examples/qml/referenceexamples/binding/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/coercion/main.cpp b/examples/qml/referenceexamples/coercion/main.cpp
index 04a78b05f7..262cdf6320 100644
--- a/examples/qml/referenceexamples/coercion/main.cpp
+++ b/examples/qml/referenceexamples/coercion/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/default/main.cpp b/examples/qml/referenceexamples/default/main.cpp
index d8c3e466ce..017d6495cd 100644
--- a/examples/qml/referenceexamples/default/main.cpp
+++ b/examples/qml/referenceexamples/default/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/extended/main.cpp b/examples/qml/referenceexamples/extended/main.cpp
index c99e052ae5..f91cec76b1 100644
--- a/examples/qml/referenceexamples/extended/main.cpp
+++ b/examples/qml/referenceexamples/extended/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char ** argv)
 // ![1]
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    QLineEdit *edit = qobject_cast<QLineEdit *>(component.create());
+    auto *edit = qobject_cast<QLineEdit *>(component.create());
 // ![1]
 
     if (edit) {
diff --git a/examples/qml/referenceexamples/grouped/main.cpp b/examples/qml/referenceexamples/grouped/main.cpp
index 17dcd09c34..14cd64fe68 100644
--- a/examples/qml/referenceexamples/grouped/main.cpp
+++ b/examples/qml/referenceexamples/grouped/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/methods/birthdayparty.cpp b/examples/qml/referenceexamples/methods/birthdayparty.cpp
index f13c500bcf..7e750e4f4b 100644
--- a/examples/qml/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/referenceexamples/methods/birthdayparty.cpp
@@ -82,7 +82,7 @@ Person *BirthdayParty::guest(int index) const
 
 void BirthdayParty::invite(const QString &name)
 {
-    Person *person = new Person(this);
+    auto *person = new Person(this);
     person->setName(name);
     m_guests.append(person);
 }
diff --git a/examples/qml/referenceexamples/methods/main.cpp b/examples/qml/referenceexamples/methods/main.cpp
index 974cc26338..89404ec822 100644
--- a/examples/qml/referenceexamples/methods/main.cpp
+++ b/examples/qml/referenceexamples/methods/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/properties/main.cpp b/examples/qml/referenceexamples/properties/main.cpp
index fbdbd13fd0..a0a2335034 100644
--- a/examples/qml/referenceexamples/properties/main.cpp
+++ b/examples/qml/referenceexamples/properties/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/signal/main.cpp b/examples/qml/referenceexamples/signal/main.cpp
index 7e096edd78..bb75e02bc2 100644
--- a/examples/qml/referenceexamples/signal/main.cpp
+++ b/examples/qml/referenceexamples/signal/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
index d8e4cad963..da09d3d7ba 100644
--- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
+++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
@@ -54,7 +54,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
 : QObject(parent), m_line(-1)
 {
     setName(QString());
-    QTimer *timer = new QTimer(this);
+    auto *timer = new QTimer(this);
     QObject::connect(timer, &QTimer::timeout, this, &HappyBirthdaySong::advance);
     timer->start(1000);
 }
diff --git a/examples/qml/referenceexamples/valuesource/main.cpp b/examples/qml/referenceexamples/valuesource/main.cpp
index 2f3c466935..4bef695fe2 100644
--- a/examples/qml/referenceexamples/valuesource/main.cpp
+++ b/examples/qml/referenceexamples/valuesource/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char ** argv)
 
     QQmlEngine engine;
     QQmlComponent component(&engine, QUrl("qrc:example.qml"));
-    BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
+    auto *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
         qWarning() << party->host()->name() << "is having a birthday!";
-- 
cgit v1.2.3


From 3cc226ffe74a45509746dddb4e72457f1651be56 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Aug 2019 11:01:17 +0200
Subject: Reference Examples: Use nullptr

Change-Id: I325cfdcf488e9d238e618ca23ef40aedf7c5eec1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/qml/referenceexamples/adding/person.h                 | 2 +-
 examples/qml/referenceexamples/attached/birthdayparty.h        | 2 +-
 examples/qml/referenceexamples/attached/person.h               | 6 +++---
 examples/qml/referenceexamples/binding/birthdayparty.h         | 2 +-
 examples/qml/referenceexamples/binding/happybirthdaysong.h     | 2 +-
 examples/qml/referenceexamples/binding/person.h                | 8 ++++----
 examples/qml/referenceexamples/coercion/birthdayparty.h        | 2 +-
 examples/qml/referenceexamples/coercion/person.h               | 6 +++---
 examples/qml/referenceexamples/default/birthdayparty.h         | 2 +-
 examples/qml/referenceexamples/default/person.h                | 6 +++---
 examples/qml/referenceexamples/grouped/birthdayparty.h         | 2 +-
 examples/qml/referenceexamples/grouped/person.h                | 8 ++++----
 examples/qml/referenceexamples/methods/birthdayparty.h         | 2 +-
 examples/qml/referenceexamples/methods/person.h                | 2 +-
 examples/qml/referenceexamples/properties/birthdayparty.h      | 2 +-
 examples/qml/referenceexamples/properties/person.h             | 2 +-
 examples/qml/referenceexamples/signal/birthdayparty.h          | 2 +-
 examples/qml/referenceexamples/signal/person.h                 | 8 ++++----
 examples/qml/referenceexamples/valuesource/birthdayparty.h     | 2 +-
 examples/qml/referenceexamples/valuesource/happybirthdaysong.h | 2 +-
 examples/qml/referenceexamples/valuesource/person.h            | 8 ++++----
 21 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'examples/qml')

diff --git a/examples/qml/referenceexamples/adding/person.h b/examples/qml/referenceexamples/adding/person.h
index 44e2ac3b1b..f40c8d8086 100644
--- a/examples/qml/referenceexamples/adding/person.h
+++ b/examples/qml/referenceexamples/adding/person.h
@@ -58,7 +58,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
diff --git a/examples/qml/referenceexamples/attached/birthdayparty.h b/examples/qml/referenceexamples/attached/birthdayparty.h
index 0684f16255..15375f14d9 100644
--- a/examples/qml/referenceexamples/attached/birthdayparty.h
+++ b/examples/qml/referenceexamples/attached/birthdayparty.h
@@ -76,7 +76,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/attached/person.h b/examples/qml/referenceexamples/attached/person.h
index 9b63773d49..2398da38bf 100644
--- a/examples/qml/referenceexamples/attached/person.h
+++ b/examples/qml/referenceexamples/attached/person.h
@@ -87,7 +87,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(ShoeDescription *shoe READ shoe)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -102,14 +102,14 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 
 #endif // PERSON_H
diff --git a/examples/qml/referenceexamples/binding/birthdayparty.h b/examples/qml/referenceexamples/binding/birthdayparty.h
index 93dad927d7..15e1908ece 100644
--- a/examples/qml/referenceexamples/binding/birthdayparty.h
+++ b/examples/qml/referenceexamples/binding/birthdayparty.h
@@ -83,7 +83,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.h b/examples/qml/referenceexamples/binding/happybirthdaysong.h
index ab264b80c7..6960c7a330 100644
--- a/examples/qml/referenceexamples/binding/happybirthdaysong.h
+++ b/examples/qml/referenceexamples/binding/happybirthdaysong.h
@@ -61,7 +61,7 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_INTERFACES(QQmlPropertyValueSource)
 public:
-    HappyBirthdaySong(QObject *parent = 0);
+    HappyBirthdaySong(QObject *parent = nullptr);
 
     virtual void setTarget(const QQmlProperty &);
 
diff --git a/examples/qml/referenceexamples/binding/person.h b/examples/qml/referenceexamples/binding/person.h
index 2cff97a6cd..543b24f971 100644
--- a/examples/qml/referenceexamples/binding/person.h
+++ b/examples/qml/referenceexamples/binding/person.h
@@ -61,7 +61,7 @@ class ShoeDescription : public QObject
     Q_PROPERTY(QString brand READ brand WRITE setBrand NOTIFY shoeChanged)
     Q_PROPERTY(qreal price READ price WRITE setPrice NOTIFY shoeChanged)
 public:
-    ShoeDescription(QObject *parent = 0);
+    ShoeDescription(QObject *parent = nullptr);
 
     int size() const;
     void setSize(int);
@@ -92,7 +92,7 @@ class Person : public QObject
     Q_PROPERTY(ShoeDescription *shoe READ shoe CONSTANT)
 // ![0]
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -110,14 +110,14 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 
 #endif // PERSON_H
diff --git a/examples/qml/referenceexamples/coercion/birthdayparty.h b/examples/qml/referenceexamples/coercion/birthdayparty.h
index bb20212ac9..554e7ab0da 100644
--- a/examples/qml/referenceexamples/coercion/birthdayparty.h
+++ b/examples/qml/referenceexamples/coercion/birthdayparty.h
@@ -62,7 +62,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
 // ![0]
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/coercion/person.h b/examples/qml/referenceexamples/coercion/person.h
index 7169859cce..692cf4eb19 100644
--- a/examples/qml/referenceexamples/coercion/person.h
+++ b/examples/qml/referenceexamples/coercion/person.h
@@ -58,7 +58,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -76,7 +76,7 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 //! [girl class]
@@ -84,7 +84,7 @@ class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 //! [girl class]
 
diff --git a/examples/qml/referenceexamples/default/birthdayparty.h b/examples/qml/referenceexamples/default/birthdayparty.h
index 6acb395f47..ea63a6a16d 100644
--- a/examples/qml/referenceexamples/default/birthdayparty.h
+++ b/examples/qml/referenceexamples/default/birthdayparty.h
@@ -62,7 +62,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/default/person.h b/examples/qml/referenceexamples/default/person.h
index 878c2953e5..87f69276bf 100644
--- a/examples/qml/referenceexamples/default/person.h
+++ b/examples/qml/referenceexamples/default/person.h
@@ -58,7 +58,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -74,14 +74,14 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 
 #endif // PERSON_H
diff --git a/examples/qml/referenceexamples/grouped/birthdayparty.h b/examples/qml/referenceexamples/grouped/birthdayparty.h
index 7a9a03dabb..edaa11fa88 100644
--- a/examples/qml/referenceexamples/grouped/birthdayparty.h
+++ b/examples/qml/referenceexamples/grouped/birthdayparty.h
@@ -61,7 +61,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/grouped/person.h b/examples/qml/referenceexamples/grouped/person.h
index b4e6a894cd..6f6caaee7c 100644
--- a/examples/qml/referenceexamples/grouped/person.h
+++ b/examples/qml/referenceexamples/grouped/person.h
@@ -61,7 +61,7 @@ class ShoeDescription : public QObject
     Q_PROPERTY(QString brand READ brand WRITE setBrand)
     Q_PROPERTY(qreal price READ price WRITE setPrice)
 public:
-    ShoeDescription(QObject *parent = 0);
+    ShoeDescription(QObject *parent = nullptr);
 
     int size() const;
     void setSize(int);
@@ -89,7 +89,7 @@ class Person : public QObject
     Q_PROPERTY(ShoeDescription *shoe READ shoe)
 // ![1]
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -104,14 +104,14 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 
 #endif // PERSON_H
diff --git a/examples/qml/referenceexamples/methods/birthdayparty.h b/examples/qml/referenceexamples/methods/birthdayparty.h
index 27c164728a..0eb968a841 100644
--- a/examples/qml/referenceexamples/methods/birthdayparty.h
+++ b/examples/qml/referenceexamples/methods/birthdayparty.h
@@ -60,7 +60,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(Person *host READ host WRITE setHost)
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/methods/person.h b/examples/qml/referenceexamples/methods/person.h
index 488f8ebac4..749109dc72 100644
--- a/examples/qml/referenceexamples/methods/person.h
+++ b/examples/qml/referenceexamples/methods/person.h
@@ -58,7 +58,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
diff --git a/examples/qml/referenceexamples/properties/birthdayparty.h b/examples/qml/referenceexamples/properties/birthdayparty.h
index 00c5e443b4..8d62c8dcd5 100644
--- a/examples/qml/referenceexamples/properties/birthdayparty.h
+++ b/examples/qml/referenceexamples/properties/birthdayparty.h
@@ -68,7 +68,7 @@ class BirthdayParty : public QObject
 // ![2]
 // ![3]
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/properties/person.h b/examples/qml/referenceexamples/properties/person.h
index 488f8ebac4..749109dc72 100644
--- a/examples/qml/referenceexamples/properties/person.h
+++ b/examples/qml/referenceexamples/properties/person.h
@@ -58,7 +58,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
diff --git a/examples/qml/referenceexamples/signal/birthdayparty.h b/examples/qml/referenceexamples/signal/birthdayparty.h
index 759450691e..9aecc8929c 100644
--- a/examples/qml/referenceexamples/signal/birthdayparty.h
+++ b/examples/qml/referenceexamples/signal/birthdayparty.h
@@ -76,7 +76,7 @@ class BirthdayParty : public QObject
     Q_PROPERTY(QQmlListProperty<Person> guests READ guests)
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/signal/person.h b/examples/qml/referenceexamples/signal/person.h
index 9b63773d49..06d4f2eb27 100644
--- a/examples/qml/referenceexamples/signal/person.h
+++ b/examples/qml/referenceexamples/signal/person.h
@@ -61,7 +61,7 @@ class ShoeDescription : public QObject
     Q_PROPERTY(QString brand READ brand WRITE setBrand)
     Q_PROPERTY(qreal price READ price WRITE setPrice)
 public:
-    ShoeDescription(QObject *parent = 0);
+    ShoeDescription(QObject *parent = nullptr);
 
     int size() const;
     void setSize(int);
@@ -87,7 +87,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(ShoeDescription *shoe READ shoe)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -102,14 +102,14 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 
 #endif // PERSON_H
diff --git a/examples/qml/referenceexamples/valuesource/birthdayparty.h b/examples/qml/referenceexamples/valuesource/birthdayparty.h
index f965695cf6..18a9b96147 100644
--- a/examples/qml/referenceexamples/valuesource/birthdayparty.h
+++ b/examples/qml/referenceexamples/valuesource/birthdayparty.h
@@ -80,7 +80,7 @@ class BirthdayParty : public QObject
 // ![0]
     Q_CLASSINFO("DefaultProperty", "guests")
 public:
-    BirthdayParty(QObject *parent = 0);
+    BirthdayParty(QObject *parent = nullptr);
 
     Person *host() const;
     void setHost(Person *);
diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.h b/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
index 89bd13c295..5900f118f1 100644
--- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
+++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
@@ -65,7 +65,7 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
     Q_PROPERTY(QString name READ name WRITE setName)
 // ![1]
 public:
-    HappyBirthdaySong(QObject *parent = 0);
+    HappyBirthdaySong(QObject *parent = nullptr);
 
     virtual void setTarget(const QQmlProperty &);
 // ![1]
diff --git a/examples/qml/referenceexamples/valuesource/person.h b/examples/qml/referenceexamples/valuesource/person.h
index 9b63773d49..06d4f2eb27 100644
--- a/examples/qml/referenceexamples/valuesource/person.h
+++ b/examples/qml/referenceexamples/valuesource/person.h
@@ -61,7 +61,7 @@ class ShoeDescription : public QObject
     Q_PROPERTY(QString brand READ brand WRITE setBrand)
     Q_PROPERTY(qreal price READ price WRITE setPrice)
 public:
-    ShoeDescription(QObject *parent = 0);
+    ShoeDescription(QObject *parent = nullptr);
 
     int size() const;
     void setSize(int);
@@ -87,7 +87,7 @@ class Person : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(ShoeDescription *shoe READ shoe)
 public:
-    Person(QObject *parent = 0);
+    Person(QObject *parent = nullptr);
 
     QString name() const;
     void setName(const QString &);
@@ -102,14 +102,14 @@ class Boy : public Person
 {
     Q_OBJECT
 public:
-    Boy(QObject * parent = 0);
+    Boy(QObject * parent = nullptr);
 };
 
 class Girl : public Person
 {
     Q_OBJECT
 public:
-    Girl(QObject * parent = 0);
+    Girl(QObject * parent = nullptr);
 };
 
 #endif // PERSON_H
-- 
cgit v1.2.3


From adcb79025af8bd46a13efd4b884ff2feff64f477 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Aug 2019 11:06:39 +0200
Subject: Reference Examples: Use override for overridden virtual functions

Change-Id: I9f4225bf312856d08fd08431353f3cb36d0f7fa5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/qml/referenceexamples/binding/happybirthdaysong.h     | 2 +-
 examples/qml/referenceexamples/valuesource/happybirthdaysong.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/qml')

diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.h b/examples/qml/referenceexamples/binding/happybirthdaysong.h
index 6960c7a330..dcfebc06ba 100644
--- a/examples/qml/referenceexamples/binding/happybirthdaysong.h
+++ b/examples/qml/referenceexamples/binding/happybirthdaysong.h
@@ -63,7 +63,7 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
 public:
     HappyBirthdaySong(QObject *parent = nullptr);
 
-    virtual void setTarget(const QQmlProperty &);
+    void setTarget(const QQmlProperty &) override;
 
     QString name() const;
     void setName(const QString &);
diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.h b/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
index 5900f118f1..e2205a4ebb 100644
--- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
+++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.h
@@ -67,7 +67,7 @@ class HappyBirthdaySong : public QObject, public QQmlPropertyValueSource
 public:
     HappyBirthdaySong(QObject *parent = nullptr);
 
-    virtual void setTarget(const QQmlProperty &);
+    void setTarget(const QQmlProperty &) override;
 // ![1]
 
     QString name() const;
-- 
cgit v1.2.3


From a2e10253548f1fd7f20a59e67669daa0e6713b0a Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 19 Aug 2019 11:10:51 +0200
Subject: Reference Examples: Avoid static_cast on function arguments

qobject_cast is safer and not very expensive here.

Change-Id: Ie87219e2a5092e453d257064a95a790de31015f5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/qml/referenceexamples/extended/lineedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/qml')

diff --git a/examples/qml/referenceexamples/extended/lineedit.cpp b/examples/qml/referenceexamples/extended/lineedit.cpp
index 777e15db07..feb1a08585 100644
--- a/examples/qml/referenceexamples/extended/lineedit.cpp
+++ b/examples/qml/referenceexamples/extended/lineedit.cpp
@@ -51,7 +51,7 @@
 #include <qqml.h>
 
 LineEditExtension::LineEditExtension(QObject *object)
-: QObject(object), m_lineedit(static_cast<QLineEdit *>(object))
+: QObject(object), m_lineedit(qobject_cast<QLineEdit *>(object))
 {
 }
 
-- 
cgit v1.2.3