1 files changed, 23 insertions, 66 deletions

diff --git a/examples/corelib/bindableproperties/subscription/main.cpp b/examples/corelib/bindableproperties/subscription/main.cpp
index 6ff0c960f1..3f98da7467 100644
--- a/examples/corelib/bindableproperties/subscription/main.cpp
+++ b/examples/corelib/bindableproperties/subscription/main.cpp
@@ -1,63 +1,19 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the 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) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "../shared/subscriptionwindow.h"
 #include "subscription.h"
 #include "user.h"
 
 #include <QApplication>
-#include <QButtonGroup>
 #include <QLabel>
+#include <QLocale>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSpinBox>
+#include <QString>
+
+using namespace Qt::StringLiterals;
 
 int main(int argc, char *argv[])
 {
@@ -71,64 +27,65 @@ int main(int argc, char *argv[])
     SubscriptionWindow w;
 
     // Initialize subscription data
-    QRadioButton *monthly = w.findChild<QRadioButton *>("btnMonthly");
+    QRadioButton *monthly = w.findChild<QRadioButton *>(u"btnMonthly"_s);
     QObject::connect(monthly, &QRadioButton::clicked, &subscription, [&] {
         subscription.setDuration(Subscription::Monthly);
     });
-    QRadioButton *quarterly = w.findChild<QRadioButton *>("btnQuarterly");
+    QRadioButton *quarterly = w.findChild<QRadioButton *>(u"btnQuarterly"_s);
     QObject::connect(quarterly, &QRadioButton::clicked, &subscription, [&] {
         subscription.setDuration(Subscription::Quarterly);
     });
-    QRadioButton *yearly = w.findChild<QRadioButton *>("btnYearly");
+    QRadioButton *yearly = w.findChild<QRadioButton *>(u"btnYearly"_s);
     QObject::connect(yearly, &QRadioButton::clicked, &subscription, [&] {
         subscription.setDuration(Subscription::Yearly);
     });
 
     // Initialize user data
-    QPushButton *germany = w.findChild<QPushButton *>("btnGermany");
+    QPushButton *germany = w.findChild<QPushButton *>(u"btnGermany"_s);
     QObject::connect(germany, &QPushButton::clicked, &user, [&] {
-        user.setCountry(User::Germany);
+        user.setCountry(User::Country::Germany);
     });
-    QPushButton *finland = w.findChild<QPushButton *>("btnFinland");
+    QPushButton *finland = w.findChild<QPushButton *>(u"btnFinland"_s);
     QObject::connect(finland, &QPushButton::clicked, &user, [&] {
-        user.setCountry(User::Finland);
+        user.setCountry(User::Country::Finland);
     });
-    QPushButton *norway = w.findChild<QPushButton *>("btnNorway");
+    QPushButton *norway = w.findChild<QPushButton *>(u"btnNorway"_s);
     QObject::connect(norway, &QPushButton::clicked, &user, [&] {
-        user.setCountry(User::Norway);
+        user.setCountry(User::Country::Norway);
     });
 
-    QSpinBox *ageSpinBox = w.findChild<QSpinBox *>("ageSpinBox");
+    QSpinBox *ageSpinBox = w.findChild<QSpinBox *>(u"ageSpinBox"_s);
     QObject::connect(ageSpinBox, &QSpinBox::valueChanged, &user, [&](int value) {
         user.setAge(value);
     });
 
     // Initialize price data
-    QLabel *priceDisplay = w.findChild<QLabel *>("priceDisplay");
+    QLabel *priceDisplay = w.findChild<QLabel *>(u"priceDisplay"_s);
     priceDisplay->setText(QString::number(subscription.price()));
     priceDisplay->setEnabled(subscription.isValid());
 
     // Track the price changes
 
 //! [connect-price-changed]
-    QObject::connect(&subscription, &Subscription::priceChanged, [&] {
-        priceDisplay->setText(QString::number(subscription.price()));
+    QObject::connect(&subscription, &Subscription::priceChanged, priceDisplay, [&] {
+        QLocale lc{QLocale::AnyLanguage, user.country()};
+        priceDisplay->setText(lc.toCurrencyString(subscription.price() / subscription.duration()));
     });
 //! [connect-price-changed]
 
 //! [connect-validity-changed]
-    QObject::connect(&subscription, &Subscription::isValidChanged, [&] {
+    QObject::connect(&subscription, &Subscription::isValidChanged, priceDisplay, [&] {
         priceDisplay->setEnabled(subscription.isValid());
     });
 //! [connect-validity-changed]
 
 //! [connect-user]
-    QObject::connect(&user, &User::countryChanged, [&] {
+    QObject::connect(&user, &User::countryChanged, &subscription, [&] {
         subscription.calculatePrice();
         subscription.updateValidity();
     });
 
-    QObject::connect(&user, &User::ageChanged, [&] {
+    QObject::connect(&user, &User::ageChanged, &subscription, [&] {
         subscription.updateValidity();
     });
 //! [connect-user]