1 files changed, 19 insertions, 69 deletions

diff --git a/examples/samplebinding/truck.cpp b/examples/samplebinding/truck.cpp
index 056abfcd6..819d2b1a0 100644
--- a/examples/samplebinding/truck.cpp
+++ b/examples/samplebinding/truck.cpp
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt for Python examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include <iostream>
 #include <random>
@@ -57,40 +10,38 @@ Truck::Truck(bool leaveOnDestruction) : m_leaveOnDestruction(leaveOnDestruction)
 
 Truck::Truck(const Truck &other)
 {
-    for (size_t i = 0; i < other.m_flavors.size(); ++i) {
-        addIcecreamFlavor(other.m_flavors[i]->clone());
-    }
+    assign(other);
 }
 
 Truck &Truck::operator=(const Truck &other)
 {
     if (this != &other) {
-        clearFlavors();
-        for (size_t i = 0; i < other.m_flavors.size(); ++i) {
-            addIcecreamFlavor(other.m_flavors[i]->clone());
-        }
+        m_flavors.clear();
+        assign(other);
     }
     return *this;
 }
 
+Truck::Truck(Truck &&other) = default;
+
+Truck& Truck::operator=(Truck &&other) = default;
+
 Truck::~Truck()
 {
     if (m_leaveOnDestruction)
         leave();
-    clearFlavors();
 }
 
 void Truck::addIcecreamFlavor(Icecream *icecream)
 {
-    m_flavors.push_back(icecream);
+    m_flavors.push_back(IcecreamPtr(icecream));
 }
 
 void Truck::printAvailableFlavors() const
 {
     std::cout << "It sells the following flavors: \n";
-    for (size_t i = 0; i < m_flavors.size(); ++ i) {
-        std::cout << "  * "  << m_flavors[i]->getFlavor() << '\n';
-    }
+    for (const auto &flavor : m_flavors)
+        std::cout << "  * "  << *flavor << '\n';
     std::cout << '\n';
 }
 
@@ -119,6 +70,13 @@ std::string Truck::getArrivalMessage() const
     return m_arrivalMessage;
 }
 
+void Truck::assign(const Truck &other)
+{
+    m_flavors.reserve(other.m_flavors.size());
+    for (const auto &f : other.m_flavors)
+        m_flavors.push_back(IcecreamPtr(f->clone()));
+}
+
 bool Truck::deliver() const
 {
     std::random_device rd;
@@ -133,11 +91,3 @@ bool Truck::deliver() const
 
     return result;
 }
-
-void Truck::clearFlavors()
-{
-    for (size_t i = 0; i < m_flavors.size(); ++i) {
-        delete m_flavors[i];
-    }
-    m_flavors.clear();
-}