Qt Designer: Convert remaining strings of QFormBuilderStrings into static constants

Use constexpr QLatin1StringView, which allows for using
propertyByName() in more places since a QLatin1StringView fits
QAnyStringView.

Task-number: QTBUG-118473
Change-Id: Icd1af76934d6528ecf0181d1cabbd1d045b845a2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 47b56e9050b1eaad861427ae9561ae3a06510320)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

5 files changed, 60 insertions, 73 deletions

diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index d2d665b15..728b05d46 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -85,6 +85,8 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
+using QFBE = QFormBuilderExtra;
+
 namespace {
     using DomPropertyList = QList<DomProperty *>;
 }
@@ -1384,20 +1386,19 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren
             }
             QList<DomProperty*> ui_attribute_list;
 
-            const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
             // attribute `icon'
             widget->setCurrentIndex(i);
             QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), widget);
             PropertySheetIconValue icon = qvariant_cast<PropertySheetIconValue>(sheet->property(sheet->indexOf(u"currentTabIcon"_s)));
             DomProperty *p = resourceBuilder()->saveResource(workingDirectory(), QVariant::fromValue(icon));
             if (p) {
-                p->setAttributeName(strings.iconAttribute);
+                p->setAttributeName(QFormBuilderStrings::iconAttribute);
                 ui_attribute_list.append(p);
             }
             // attribute `title'
             p = textBuilder()->saveText(sheet->property(sheet->indexOf(u"currentTabText"_s)));
             if (p) {
-                p->setAttributeName(strings.titleAttribute);
+                p->setAttributeName(QFormBuilderStrings::titleAttribute);
                 ui_attribute_list.append(p);
             }
 
@@ -1406,7 +1407,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren
             if (!qvariant_cast<PropertySheetStringValue>(v).value().isEmpty()) {
                 p = textBuilder()->saveText(v);
                 if (p) {
-                    p->setAttributeName(strings.toolTipAttribute);
+                    p->setAttributeName(QFormBuilderStrings::toolTipAttribute);
                 ui_attribute_list.append(p);
                 }
             }
@@ -1416,7 +1417,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren
             if (!qvariant_cast<PropertySheetStringValue>(v).value().isEmpty()) {
                 p = textBuilder()->saveText(v);
                 if (p) {
-                    p->setAttributeName(strings.whatsThisAttribute);
+                    p->setAttributeName(QFormBuilderStrings::whatsThisAttribute);
                 ui_attribute_list.append(p);
                 }
             }
@@ -1453,20 +1454,18 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW
             // attribute `label'
             QList<DomProperty*> ui_attribute_list;
 
-            const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-
             // attribute `icon'
             widget->setCurrentIndex(i);
             QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), widget);
             PropertySheetIconValue icon = qvariant_cast<PropertySheetIconValue>(sheet->property(sheet->indexOf(u"currentItemIcon"_s)));
             DomProperty *p = resourceBuilder()->saveResource(workingDirectory(), QVariant::fromValue(icon));
             if (p) {
-                p->setAttributeName(strings.iconAttribute);
+                p->setAttributeName(QFormBuilderStrings::iconAttribute);
                 ui_attribute_list.append(p);
             }
             p = textBuilder()->saveText(sheet->property(sheet->indexOf(u"currentItemText"_s)));
             if (p) {
-                p->setAttributeName(strings.labelAttribute);
+                p->setAttributeName(QFormBuilderStrings::labelAttribute);
                 ui_attribute_list.append(p);
             }
 
@@ -1475,7 +1474,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW
             if (!qvariant_cast<PropertySheetStringValue>(v).value().isEmpty()) {
                 p = textBuilder()->saveText(v);
                 if (p) {
-                    p->setAttributeName(strings.toolTipAttribute);
+                    p->setAttributeName(QFormBuilderStrings::toolTipAttribute);
                     ui_attribute_list.append(p);
                 }
             }
@@ -1605,23 +1604,21 @@ bool QDesignerResource::addItem(DomWidget *ui_widget, QWidget *widget, QWidget *
 
         tabWidget->setCurrentIndex(tabIndex);
 
-        const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-
-        const DomPropertyHash attributes = propertyMap(ui_widget->elementAttribute());
+        const auto &attributes = ui_widget->elementAttribute();
         QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), parentWidget);
-        if (DomProperty *picon = attributes.value(strings.iconAttribute)) {
+        if (auto *picon = QFBE::propertyByName(attributes, QFormBuilderStrings::iconAttribute)) {
             QVariant v = resourceBuilder()->loadResource(workingDirectory(), picon);
             sheet->setProperty(sheet->indexOf(u"currentTabIcon"_s), v);
         }
-        if (DomProperty *ptext = attributes.value(strings.titleAttribute)) {
+        if (auto *ptext = QFBE::propertyByName(attributes, QFormBuilderStrings::titleAttribute)) {
             QVariant v = textBuilder()->loadText(ptext);
             sheet->setProperty(sheet->indexOf(u"currentTabText"_s), v);
         }
-        if (DomProperty *ptext = attributes.value(strings.toolTipAttribute)) {
+        if (auto *ptext = QFBE::propertyByName(attributes, QFormBuilderStrings::toolTipAttribute)) {
             QVariant v = textBuilder()->loadText(ptext);
             sheet->setProperty(sheet->indexOf(u"currentTabToolTip"_s), v);
         }
-        if (DomProperty *ptext = attributes.value(strings.whatsThisAttribute)) {
+        if (auto *ptext = QFBE::propertyByName(attributes, QFormBuilderStrings::whatsThisAttribute)) {
             QVariant v = textBuilder()->loadText(ptext);
             sheet->setProperty(sheet->indexOf(u"currentTabWhatsThis"_s), v);
         }
@@ -1632,19 +1629,17 @@ bool QDesignerResource::addItem(DomWidget *ui_widget, QWidget *widget, QWidget *
 
         toolBox->setCurrentIndex(itemIndex);
 
-        const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-
-        const DomPropertyHash attributes = propertyMap(ui_widget->elementAttribute());
+        const auto &attributes = ui_widget->elementAttribute();
         QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), parentWidget);
-        if (DomProperty *picon = attributes.value(strings.iconAttribute)) {
+        if (auto *picon = QFBE::propertyByName(attributes, QFormBuilderStrings::iconAttribute)) {
             QVariant v = resourceBuilder()->loadResource(workingDirectory(), picon);
             sheet->setProperty(sheet->indexOf(u"currentItemIcon"_s), v);
         }
-        if (DomProperty *ptext = attributes.value(strings.labelAttribute)) {
+        if (auto *ptext = QFBE::propertyByName(attributes, QFormBuilderStrings::labelAttribute)) {
             QVariant v = textBuilder()->loadText(ptext);
             sheet->setProperty(sheet->indexOf(u"currentItemText"_s), v);
         }
-        if (DomProperty *ptext = attributes.value(strings.toolTipAttribute)) {
+        if (auto *ptext = QFBE::propertyByName(attributes, QFormBuilderStrings::toolTipAttribute)) {
             QVariant v = textBuilder()->loadText(ptext);
             sheet->setProperty(sheet->indexOf(u"currentItemToolTip"_s), v);
         }
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 0083cbed4..b4b4af528 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -361,7 +361,6 @@ Qt::ToolBarArea QAbstractFormBuilder::toolbarAreaFromDOMAttributes(const DomProp
 */
 bool QAbstractFormBuilder::addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget)
 {
-    const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
     const DomPropertyHash attributes = propertyMap(ui_widget->elementAttribute());
 
     if (parentWidget == nullptr)
@@ -439,25 +438,25 @@ bool QAbstractFormBuilder::addItem(DomWidget *ui_widget, QWidget *widget, QWidge
         widget->setParent(nullptr);
 
         const int tabIndex = tabWidget->count();
-        if (const DomProperty *titleP = attributes.value(strings.titleAttribute, 0))
+        if (auto *titleP = attributes.value(QFormBuilderStrings::titleAttribute))
             tabWidget->addTab(widget, toString(titleP->elementString()));
         else
             tabWidget->addTab(widget, "Page"_L1);
 
-        if (DomProperty *picon = attributes.value(strings.iconAttribute)) {
+        if (const auto *picon = attributes.value(QFormBuilderStrings::iconAttribute)) {
             QVariant v = resourceBuilder()->loadResource(workingDirectory(), picon);
             QVariant nativeValue = resourceBuilder()->toNativeValue(v);
             tabWidget->setTabIcon(tabIndex, qvariant_cast<QIcon>(nativeValue));
         }
 
 #if QT_CONFIG(tooltip)
-        if (const DomProperty *ptoolTip = attributes.value(strings.toolTipAttribute)) {
+        if (const auto *ptoolTip = attributes.value(QFormBuilderStrings::toolTipAttribute)) {
             tabWidget->setTabToolTip(tabIndex, toString(ptoolTip->elementString()));
         }
 #endif
 
 #if QT_CONFIG(whatsthis)
-        if (const DomProperty *pwhatsThis = attributes.value(strings.whatsThisAttribute)) {
+        if (const auto *pwhatsThis = attributes.value(QFormBuilderStrings::whatsThisAttribute)) {
             tabWidget->setTabWhatsThis(tabIndex, toString(pwhatsThis->elementString()));
         }
 #endif
@@ -469,19 +468,19 @@ bool QAbstractFormBuilder::addItem(DomWidget *ui_widget, QWidget *widget, QWidge
 #if QT_CONFIG(toolbox)
     else if (QToolBox *toolBox = qobject_cast<QToolBox*>(parentWidget)) {
         const int tabIndex = toolBox->count();
-        if (const DomProperty *labelP =  attributes.value(strings.labelAttribute, 0))
+        if (const auto *labelP =  attributes.value(QFormBuilderStrings::labelAttribute))
             toolBox->addItem(widget, toString(labelP->elementString()));
         else
             toolBox->addItem(widget, "Page"_L1);
 
-        if (DomProperty *picon = attributes.value(strings.iconAttribute)) {
+        if (const auto *picon = attributes.value(QFormBuilderStrings::iconAttribute)) {
             QVariant v = resourceBuilder()->loadResource(workingDirectory(), picon);
             QVariant nativeValue = resourceBuilder()->toNativeValue(v);
             toolBox->setItemIcon(tabIndex, qvariant_cast<QIcon>(nativeValue));
         }
 
 #if QT_CONFIG(tooltip)
-        if (const DomProperty *ptoolTip = attributes.value(strings.toolTipAttribute)) {
+        if (const auto *ptoolTip = attributes.value(QFormBuilderStrings::toolTipAttribute)) {
             toolBox->setItemToolTip(tabIndex, toString(ptoolTip->elementString()));
         }
 #endif
@@ -1550,13 +1549,12 @@ public:
 template<class T>
 static void storeItemFlags(const T *item, QList<DomProperty*> *properties)
 {
-    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
     static const Qt::ItemFlags defaultFlags = T().flags();
     static const QMetaEnum itemFlags_enum = metaEnum<QAbstractFormBuilderGadget>("itemFlags");
 
     if (item->flags() != defaultFlags) {
         DomProperty *p = new DomProperty;
-        p->setAttributeName(strings.flagsAttribute);
+        p->setAttributeName(QFormBuilderStrings::flagsAttribute);
         p->setElementSet(QString::fromLatin1(itemFlags_enum.valueToKeys(item->flags())));
         properties->append(p);
     }
@@ -1634,13 +1632,12 @@ template<class T>
 static void loadItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, T *item,
         const QHash<QString, DomProperty*> &properties)
 {
-    static const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
     static const QMetaEnum itemFlags_enum = metaEnum<QAbstractFormBuilderGadget>("itemFlags");
 
     loadItemProps<T>(abstractFormBuilder, item, properties);
 
-    DomProperty *p;
-    if ((p = properties.value(strings.flagsAttribute)) && p->kind() == DomProperty::Set)
+    DomProperty *p = properties.value(QFormBuilderStrings::flagsAttribute);
+    if (p != nullptr && p->kind() == DomProperty::Set)
         item->setFlags(enumKeysToValue<Qt::ItemFlags>(itemFlags_enum, p->elementSet().toLatin1()));
 }
 
@@ -1822,7 +1819,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget
     for (int i=0; i < count; ++i) {
         // We might encounter items for which both builders return 0 in Designer
         // (indicating a custom combo adding items in the constructor). Ignore those.
-        DomProperty *textProperty = saveText(QFormBuilderStrings::instance().textAttribute,
+        DomProperty *textProperty = saveText(QFormBuilderStrings::textAttribute,
                                              comboBox->itemData(i, Qt::DisplayPropertyRole));
         DomProperty *iconProperty = saveResource(comboBox->itemData(i, Qt::DecorationPropertyRole));
         if (textProperty || iconProperty) {
@@ -2035,7 +2032,7 @@ void QAbstractFormBuilder::loadTreeWidgetExtraInfo(DomWidget *ui_widget, QTreeWi
                 treeWidget->headerItem()->setData(i, it.first.second, v);
             }
 
-        if ((p = properties.value(strings.iconAttribute))) {
+        if ((p = properties.value(QFormBuilderStrings::iconAttribute))) {
             v = resourceBuilder()->loadResource(workingDirectory(), p);
             QVariant nativeValue = resourceBuilder()->toNativeValue(v);
             treeWidget->headerItem()->setIcon(i, qvariant_cast<QIcon>(nativeValue));
@@ -2063,16 +2060,18 @@ void QAbstractFormBuilder::loadTreeWidgetExtraInfo(DomWidget *ui_widget, QTreeWi
         const auto &properties = domItem->elementProperty();
         int col = -1;
         for (DomProperty *property : properties) {
-            if (property->attributeName() == strings.flagsAttribute && !property->elementSet().isEmpty()) {
+            if (property->attributeName() == QFormBuilderStrings::flagsAttribute
+                && !property->elementSet().isEmpty()) {
                 currentItem->setFlags(enumKeysToValue<Qt::ItemFlags>(itemFlags_enum, property->elementSet().toLatin1()));
-            } else if (property->attributeName() == strings.textAttribute && property->elementString()) {
+            } else if (property->attributeName() == QFormBuilderStrings::textAttribute
+                       && property->elementString()) {
                 col++;
                 QVariant textV = textBuilder()->loadText(property);
                 QVariant nativeValue = textBuilder()->toNativeValue(textV);
                 currentItem->setText(col, qvariant_cast<QString>(nativeValue));
                 currentItem->setData(col, Qt::DisplayPropertyRole, textV);
             } else if (col >= 0) {
-                if (property->attributeName() == strings.iconAttribute) {
+                if (property->attributeName() == QFormBuilderStrings::iconAttribute) {
                     QVariant v = resourceBuilder()->loadResource(workingDirectory(), property);
                     if (v.isValid()) {
                         QVariant nativeValue = resourceBuilder()->toNativeValue(v);
@@ -2159,24 +2158,21 @@ void QAbstractFormBuilder::loadTableWidgetExtraInfo(DomWidget *ui_widget, QTable
 void QAbstractFormBuilder::loadComboBoxExtraInfo(DomWidget *ui_widget, QComboBox *comboBox, QWidget *parentWidget)
 {
     Q_UNUSED(parentWidget);
-    const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
     const auto &elementItem = ui_widget->elementItem();
     for (DomItem *ui_item : elementItem) {
-        const DomPropertyHash properties = propertyMap(ui_item->elementProperty());
+        const auto &properties = ui_item->elementProperty();
         QString text;
         QIcon icon;
         QVariant textData;
         QVariant iconData;
 
-        DomProperty *p = nullptr;
-
-        p = properties.value(strings.textAttribute);
+        DomProperty *p = QFBE::propertyByName(properties, QFormBuilderStrings::textAttribute);
         if (p && p->elementString()) {
              textData = textBuilder()->loadText(p);
              text = qvariant_cast<QString>(textBuilder()->toNativeValue(textData));
         }
 
-        p = properties.value(strings.iconAttribute);
+        p = QFBE::propertyByName(properties, QFormBuilderStrings::iconAttribute);
         if (p) {
              iconData = resourceBuilder()->loadResource(workingDirectory(), p);
              icon = qvariant_cast<QIcon>(resourceBuilder()->toNativeValue(iconData));
@@ -2452,7 +2448,7 @@ void QAbstractFormBuilder::setIconProperty(DomProperty &p, const IconPaths &ip)
 */
     dpi->setText(ip.first);
 
-    p.setAttributeName(QFormBuilderStrings::instance().iconAttribute);
+    p.setAttributeName(QFormBuilderStrings::iconAttribute);
     p.setElementIconSet(dpi);
 }
 
@@ -2478,7 +2474,7 @@ DomProperty *QAbstractFormBuilder::saveResource(const QVariant &v) const
 
     DomProperty *p = resourceBuilder()->saveResource(workingDirectory(), v);
     if (p)
-        p->setAttributeName(QFormBuilderStrings::instance().iconAttribute);
+        p->setAttributeName(QFormBuilderStrings::iconAttribute);
     return p;
 }
 
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index 2c3fd9ee7..7bdae2486 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -712,14 +712,7 @@ DomProperty *QFormBuilderExtra::propertyByName(const QList<DomProperty*> &proper
 
 // ------------ QFormBuilderStrings
 
-QFormBuilderStrings::QFormBuilderStrings() :
-    titleAttribute(u"title"_s),
-    labelAttribute(u"label"_s),
-    toolTipAttribute(u"toolTip"_s),
-    whatsThisAttribute(u"whatsThis"_s),
-    flagsAttribute(u"flags"_s),
-    iconAttribute(u"icon"_s),
-    textAttribute(u"text"_s)
+QFormBuilderStrings::QFormBuilderStrings()
 {
     itemRoles.append(qMakePair(Qt::FontRole, QString::fromLatin1("font")));
     itemRoles.append(qMakePair(Qt::TextAlignmentRole, QString::fromLatin1("textAlignment")));
diff --git a/src/designer/src/lib/uilib/formbuilderextra_p.h b/src/designer/src/lib/uilib/formbuilderextra_p.h
index be504d6eb..0cd92d3b4 100644
--- a/src/designer/src/lib/uilib/formbuilderextra_p.h
+++ b/src/designer/src/lib/uilib/formbuilderextra_p.h
@@ -189,13 +189,13 @@ struct QDESIGNER_UILIB_EXPORT QFormBuilderStrings {
 
     static const QFormBuilderStrings &instance();
 
-    const QString titleAttribute;
-    const QString labelAttribute;
-    const QString toolTipAttribute;
-    const QString whatsThisAttribute;
-    const QString flagsAttribute;
-    const QString iconAttribute;
-    const QString textAttribute;
+    static constexpr auto titleAttribute = QLatin1StringView("title");
+    static constexpr auto labelAttribute = QLatin1StringView("label");
+    static constexpr auto toolTipAttribute = QLatin1StringView("toolTip");
+    static constexpr auto whatsThisAttribute = QLatin1StringView("whatsThis");
+    static constexpr auto flagsAttribute = QLatin1StringView("flags");
+    static constexpr auto iconAttribute = QLatin1StringView("icon");
+    static constexpr auto textAttribute = QLatin1StringView("text") ;
 
     using RoleNName = QPair<Qt::ItemDataRole, QString>;
     QList<RoleNName> itemRoles;
diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index 0c0e07b6d..2621ace1c 100644
--- a/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
@@ -467,9 +467,9 @@ QWidget *FormBuilderPrivate::create(DomWidget *ui_widget, QWidget *parentWidget)
 
 #define TRANSLATE_SUBWIDGET_PROP(mainWidget, attribute, setter, propName) \
     do { \
-        if (const DomProperty *p##attribute = attributes.value(strings.attribute)) { \
+        if (const auto *p = attributes.value(attribute)) { \
             QUiTranslatableStringValue strVal; \
-            const QString text = convertTranslatable(p##attribute, m_class, m_idBased, &strVal); \
+            const QString text = convertTranslatable(p, m_class, m_idBased, &strVal); \
             if (!text.isEmpty()) { \
                 if (dynamicTr) \
                     mainWidget->widget(i)->setProperty(propName, QVariant::fromValue(strVal)); \
@@ -491,28 +491,31 @@ bool FormBuilderPrivate::addItem(DomWidget *ui_widget, QWidget *widget, QWidget
     if (!d->customWidgetAddPageMethod(className).isEmpty())
         return true;
 
-    const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-
     if (0) {
 #if QT_CONFIG(tabwidget)
     } else if (QTabWidget *tabWidget = qobject_cast<QTabWidget*>(parentWidget)) {
         const DomPropertyHash attributes = propertyMap(ui_widget->elementAttribute());
         const int i = tabWidget->count() - 1;
-        TRANSLATE_SUBWIDGET_PROP(tabWidget, titleAttribute, setTabText, PROP_TABPAGETEXT);
+        TRANSLATE_SUBWIDGET_PROP(tabWidget, QFormBuilderStrings::titleAttribute,
+                                 setTabText, PROP_TABPAGETEXT);
 #if QT_CONFIG(tooltip)
-        TRANSLATE_SUBWIDGET_PROP(tabWidget, toolTipAttribute, setTabToolTip, PROP_TABPAGETOOLTIP);
+        TRANSLATE_SUBWIDGET_PROP(tabWidget, QFormBuilderStrings::toolTipAttribute,
+                                 setTabToolTip, PROP_TABPAGETOOLTIP);
 # endif
 #if QT_CONFIG(whatsthis)
-        TRANSLATE_SUBWIDGET_PROP(tabWidget, whatsThisAttribute, setTabWhatsThis, PROP_TABPAGEWHATSTHIS);
+        TRANSLATE_SUBWIDGET_PROP(tabWidget, QFormBuilderStrings::whatsThisAttribute,
+                                 setTabWhatsThis, PROP_TABPAGEWHATSTHIS);
 # endif
 #endif
 #if QT_CONFIG(toolbox)
     } else if (QToolBox *toolBox = qobject_cast<QToolBox*>(parentWidget)) {
         const DomPropertyHash attributes = propertyMap(ui_widget->elementAttribute());
         const int i = toolBox->count() - 1;
-        TRANSLATE_SUBWIDGET_PROP(toolBox, labelAttribute, setItemText, PROP_TOOLITEMTEXT);
+        TRANSLATE_SUBWIDGET_PROP(toolBox, QFormBuilderStrings::labelAttribute,
+                                 setItemText, PROP_TOOLITEMTEXT);
 #if QT_CONFIG(tooltip)
-        TRANSLATE_SUBWIDGET_PROP(toolBox, toolTipAttribute, setItemToolTip, PROP_TOOLITEMTOOLTIP);
+        TRANSLATE_SUBWIDGET_PROP(toolBox, QFormBuilderStrings::toolTipAttribute,
+                                 setItemToolTip, PROP_TOOLITEMTOOLTIP);
 # endif
 #endif
     }