1 files changed, 58 insertions, 54 deletions
diff --git a/examples/designer/calculatorbuilder/main.cpp b/examples/designer/calculatorbuilder/main.cpp
index 82c0c6f58..78d071e4e 100644
--- a/examples/designer/calculatorbuilder/main.cpp
+++ b/examples/designer/calculatorbuilder/main.cpp
@@ -1,63 +1,67 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+//! [0]
+#include <QtUiTools>
+//! [0]
 
 #include <QApplication>
+#include <QLabel>
+#include <QSpinBox>
+#include <QVBoxLayout>
 
-#include "calculatorform.h"
+#include <QFile>
 
-int main(int argc, char *argv[])
+#include <memory>
+
+using namespace Qt::StringLiterals;
+
+//! [1]
+static QWidget *loadCalculatorForm(QWidget *parent = nullptr)
 {
-    Q_INIT_RESOURCE(calculatorbuilder);
+    QUiLoader loader;
+
+    QFile file(u":/forms/calculatorform.ui"_s);
+    if (!file.open(QFile::ReadOnly))
+        return nullptr;
+    QWidget *formWidget = loader.load(&file, parent);
+    file.close();
+    if (formWidget == nullptr)
+        return nullptr;
+//! [1]
+
+//! [2]
+    auto *inputSpinBox1 = formWidget->findChild<QSpinBox*>(u"inputSpinBox1"_s);
+    auto *inputSpinBox2 = formWidget->findChild<QSpinBox*>(u"inputSpinBox2"_s);
+    auto *outputWidget = formWidget->findChild<QLabel*>(u"outputWidget"_s);
+//! [2]
 
+//! [3]
+    auto updateResult = [inputSpinBox1, inputSpinBox2, outputWidget]()
+    {
+        const int sum = inputSpinBox1->value() + inputSpinBox2->value();
+        outputWidget->setText(QString::number(sum));
+    };
+    QObject::connect(inputSpinBox1, &QSpinBox::valueChanged, formWidget, updateResult);
+    QObject::connect(inputSpinBox2, &QSpinBox::valueChanged, formWidget, updateResult);
+//! [3]
+
+    return formWidget;
+}
+
+int main(int argc, char *argv[])
+{
     QApplication app(argc, argv);
-    CalculatorForm calculator;
-    calculator.show();
+    QWidget w;
+    auto *formWidget = loadCalculatorForm(&w);
+    if (formWidget == nullptr)
+        return -1;
+    //! [4]
+    auto *layout = new QVBoxLayout(&w);
+    layout->addWidget(formWidget);
+    w.setWindowTitle(QCoreApplication::translate("CalculatorForm",
+                                                 "Calculator Builder"));
+    //! [4]
+    w.show();
     return app.exec();
 }