1 files changed, 11 insertions, 36 deletions

diff --git a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
index c03e3e8e9f..de54cd5adc 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
+++ b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
@@ -1,32 +1,7 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QTest>
 
 #include <qsignalmapper.h>
 
@@ -41,8 +16,8 @@ class QtTestObject : public QObject
 {
     Q_OBJECT
 public slots:
-    void myslot(int id);
-    void myslot(const QString &str);
+    void myIntSlot(int id);
+    void myStringSlot(const QString &str);
 
 signals:
     void mysignal(int);
@@ -54,12 +29,12 @@ public:
     QString str;
 };
 
-void QtTestObject::myslot(int id)
+void QtTestObject::myIntSlot(int id)
 {
     this->id = id;
 }
 
-void QtTestObject::myslot(const QString &str)
+void QtTestObject::myStringSlot(const QString &str)
 {
     this->str = str;
 }
@@ -71,7 +46,7 @@ void QtTestObject::emit_mysignal(int value)
 
 void tst_QSignalMapper::mapped()
 {
-    QSignalMapper mapper(0);
+    QSignalMapper mapper;
 
     QtTestObject target;
     QtTestObject src1;
@@ -88,8 +63,8 @@ void tst_QSignalMapper::mapped()
     mapper.setMapping(&src2, "two");
     mapper.setMapping(&src3, "three");
 
-    connect(&mapper, SIGNAL(mapped(int)), &target, SLOT(myslot(int)));
-    connect(&mapper, SIGNAL(mapped(QString)), &target, SLOT(myslot(QString)));
+    connect(&mapper, &QSignalMapper::mappedInt, &target, &QtTestObject::myIntSlot);
+    connect(&mapper, &QSignalMapper::mappedString, &target, &QtTestObject::myStringSlot);
 
     src1.emit_mysignal(20);
     QCOMPARE(target.id, 1);