1 files changed, 10 insertions, 43 deletions

diff --git a/src/designer/src/components/formeditor/previewactiongroup.cpp b/src/designer/src/components/formeditor/previewactiongroup.cpp
index ea388da33..abcf0b8bd 100644
--- a/src/designer/src/components/formeditor/previewactiongroup.cpp
+++ b/src/designer/src/components/formeditor/previewactiongroup.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Designer 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "previewactiongroup.h"
 
@@ -36,6 +11,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 enum { MaxDeviceActions = 20 };
 
 namespace qdesigner_internal {
@@ -50,22 +27,17 @@ PreviewActionGroup::PreviewActionGroup(QDesignerFormEditorInterface *core, QObje
     connect(this, &PreviewActionGroup::triggered, this, &PreviewActionGroup::slotTriggered);
     setExclusive(true);
 
-    const QString objNamePostfix = QStringLiteral("_action");
     // Create invisible actions for devices. Set index as action data.
-    QString objNamePrefix = QStringLiteral("__qt_designer_device_");
     for (int i = 0; i < MaxDeviceActions; i++) {
         QAction *a = new QAction(this);
-        QString objName = objNamePrefix;
-        objName += QString::number(i);
-        objName += objNamePostfix;
-        a->setObjectName(objName);
+        a->setObjectName(QString::asprintf("__qt_designer_device_%d_action", i));
         a->setVisible(false);
         a->setData(i);
         addAction(a);
     }
     // Create separator at index MaxDeviceActions
     QAction *sep = new QAction(this);
-    sep->setObjectName(QStringLiteral("__qt_designer_deviceseparator"));
+    sep->setObjectName(u"__qt_designer_deviceseparator"_s);
     sep->setSeparator(true);
     sep->setVisible(false);
     addAction(sep);
@@ -74,17 +46,12 @@ PreviewActionGroup::PreviewActionGroup(QDesignerFormEditorInterface *core, QObje
 
     // Add style actions
     const QStringList styles = QStyleFactory::keys();
-    const QStringList::const_iterator cend = styles.constEnd();
     // Make sure ObjectName  is unique in case toolbar solution is used.
-    objNamePrefix = QStringLiteral("__qt_designer_style_");
     // Create styles. Set style name string as action data.
-    for (QStringList::const_iterator it = styles.constBegin(); it !=  cend ;++it) {
-        QAction *a = new QAction(tr("%1 Style").arg(*it), this);
-        QString objName = objNamePrefix;
-        objName += *it;
-        objName += objNamePostfix;
-        a->setObjectName(objName);
-        a->setData(*it);
+    for (const auto &s : styles) {
+        QAction *a = new QAction(tr("%1 Style").arg(s), this);
+        a->setObjectName("__qt_designer_style_"_L1 + s + "_action"_L1);
+        a->setData(s);
         addAction(a);
     }
 }