Qt Designer: Disambiguate static variables and functions

They cause conflicts in CMake Unity (Jumbo) builds.

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

4 files changed, 22 insertions, 22 deletions

diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 3009741d6..7b1a320fb 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -33,11 +33,11 @@
 #include <QtCore/qdebug.h>
 
 static const char *widgetBoxRootElementC = "widgetbox";
-static const char *widgetElementC = "widget";
+static const char *wbWidgetElementC = "widget";
 static const char *uiElementC = "ui";
 static const char *categoryElementC = "category";
 static const char *categoryEntryElementC = "categoryentry";
-static const char *nameAttributeC = "name";
+static const char *wbNameAttributeC = "name";
 static const char *typeAttributeC = "type";
 static const char *iconAttributeC = "icon";
 static const char *defaultTypeValueC = "default";
@@ -359,7 +359,7 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString
             if (tag == QLatin1String(categoryElementC)) {
                 // <category name="Layouts">
                 const QXmlStreamAttributes attributes = reader.attributes();
-                const QString categoryName = attributes.value(QLatin1String(nameAttributeC)).toString();
+                const QString categoryName = attributes.value(QLatin1String(wbNameAttributeC)).toString();
                 if (categoryName == QLatin1String(invisibleNameC)) {
                     ignoreEntries = true;
                 } else {
@@ -374,7 +374,7 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString
                 //  <categoryentry name="Vertical Layout" icon="win/editvlayout.png" type="default">
                 if (!ignoreEntries) {
                     QXmlStreamAttributes attr = reader.attributes();
-                    const QString widgetName = attr.value(QLatin1String(nameAttributeC)).toString();
+                    const QString widgetName = attr.value(QLatin1String(wbNameAttributeC)).toString();
                     const QString widgetIcon = attr.value(QLatin1String(iconAttributeC)).toString();
                     const WidgetBoxTreeWidget::Widget::Type widgetType =
                         attr.value(QLatin1String(typeAttributeC)).toString()
@@ -461,7 +461,7 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe
                 if (name == QLatin1String(uiElementC)) {
                     startTagPosition = currentPosition;
                 } else {
-                    if (name == QLatin1String(widgetElementC)) {
+                    if (name == QLatin1String(wbWidgetElementC)) {
                         startTagPosition = currentPosition;
                         parsedWidgetTag = true;
                     } else {
@@ -471,7 +471,7 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe
                 }
             } else {
                 // We are within <ui> looking for the first <widget> tag
-                if (!parsedWidgetTag && r.name() == QLatin1String(widgetElementC)) {
+                if (!parsedWidgetTag && r.name() == QLatin1String(wbWidgetElementC)) {
                     parsedWidgetTag = true;
                 }
             }
@@ -508,7 +508,7 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe
 void WidgetBoxTreeWidget::writeCategories(QXmlStreamWriter &writer, const CategoryList &cat_list) const
 {
     const QString widgetbox = QLatin1String(widgetBoxRootElementC);
-    const QString name = QLatin1String(nameAttributeC);
+    const QString name = QLatin1String(wbNameAttributeC);
     const QString type = QLatin1String(typeAttributeC);
     const QString icon = QLatin1String(iconAttributeC);
     const QString defaultType = QLatin1String(defaultTypeValueC);
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index e1b0ae0d3..acf21e15b 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -46,8 +46,8 @@ static const char *typeImage = "image";
 static const char *typeStyleSheet = "stylesheet";
 static const char *typeOther = "other";
 static const char *fileAttribute = "file";
-static const char *SplitterPosition = "SplitterPosition";
-static const char *Geometry = "Geometry";
+static const char *qrvSplitterPosition = "SplitterPosition";
+static const char *qrvGeometry = "Geometry";
 static const char *ResourceViewDialogC = "ResourceDialog";
 
 // ---------------- ResourceListWidget: A list widget that has drag enabled
@@ -171,7 +171,7 @@ void QtResourceViewPrivate::restoreSettings()
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     settings->beginGroup(m_settingsKey);
 
-    m_splitter->restoreState(settings->value(QLatin1String(SplitterPosition)).toByteArray());
+    m_splitter->restoreState(settings->value(QLatin1String(qrvSplitterPosition)).toByteArray());
     settings->endGroup();
 }
 
@@ -183,7 +183,7 @@ void QtResourceViewPrivate::saveSettings()
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     settings->beginGroup(m_settingsKey);
 
-    settings->setValue(QLatin1String(SplitterPosition), m_splitter->saveState());
+    settings->setValue(QLatin1String(qrvSplitterPosition), m_splitter->saveState());
     settings->endGroup();
 }
 
@@ -821,7 +821,7 @@ QtResourceViewDialog::QtResourceViewDialog(QDesignerFormEditorInterface *core, Q
     QDesignerSettingsInterface *settings = core->settingsManager();
     settings->beginGroup(QLatin1String(ResourceViewDialogC));
 
-    const QVariant geometry = settings->value(QLatin1String(Geometry));
+    const QVariant geometry = settings->value(QLatin1String(qrvGeometry));
     if (geometry.metaType().id() == QMetaType::QByteArray) // Used to be a QRect up until 5.4.0, QTBUG-43374.
         restoreGeometry(geometry.toByteArray());
 
@@ -833,7 +833,7 @@ QtResourceViewDialog::~QtResourceViewDialog()
     QDesignerSettingsInterface *settings = d_ptr->m_core->settingsManager();
     settings->beginGroup(QLatin1String(ResourceViewDialogC));
 
-    settings->setValue(QLatin1String(Geometry), saveGeometry());
+    settings->setValue(QLatin1String(qrvGeometry), saveGeometry());
 
     settings->endGroup();
 }
diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp
index 1be5ee66c..6db5d3493 100644
--- a/src/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/src/designer/src/lib/shared/stylesheeteditor.cpp
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 
 static const char *styleSheetProperty = "styleSheet";
 static const char *StyleSheetDialogC = "StyleSheetDialog";
-static const char *Geometry = "Geometry";
+static const char *seGeometry = "Geometry";
 
 namespace qdesigner_internal {
 
@@ -171,8 +171,8 @@ StyleSheetEditorDialog::StyleSheetEditorDialog(QDesignerFormEditorInterface *cor
     QDesignerSettingsInterface *settings = core->settingsManager();
     settings->beginGroup(QLatin1String(StyleSheetDialogC));
 
-    if (settings->contains(QLatin1String(Geometry)))
-        restoreGeometry(settings->value(QLatin1String(Geometry)).toByteArray());
+    if (settings->contains(QLatin1String(seGeometry)))
+        restoreGeometry(settings->value(QLatin1String(seGeometry)).toByteArray());
 
     settings->endGroup();
 }
@@ -182,7 +182,7 @@ StyleSheetEditorDialog::~StyleSheetEditorDialog()
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     settings->beginGroup(QLatin1String(StyleSheetDialogC));
 
-    settings->setValue(QLatin1String(Geometry), saveGeometry());
+    settings->setValue(QLatin1String(seGeometry), saveGeometry());
     settings->endGroup();
 }
 
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index 254414a0e..517273494 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -35,7 +35,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static QIcon createIconSet(const QString &name)
+static QIcon afwCreateIconSet(const QString &name)
 {
     QStringList candidates = QStringList()
         << (QString::fromUtf8(":/qt-project.org/shared/images/") + name)
@@ -77,7 +77,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
 #endif
 
     m_toolClose = new QToolButton(this);
-    m_toolClose->setIcon(createIconSet(QLatin1String("closetab.png")));
+    m_toolClose->setIcon(afwCreateIconSet(QLatin1String("closetab.png")));
     m_toolClose->setAutoRaise(true);
     layOut->addWidget(m_toolClose);
     connect(m_toolClose, SIGNAL(clicked()), SLOT(deactivate()));
@@ -92,7 +92,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
     m_toolPrevious->setAutoRaise(true);
     m_toolPrevious->setText(tr("&Previous"));
     m_toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    m_toolPrevious->setIcon(createIconSet(QLatin1String("previous.png")));
+    m_toolPrevious->setIcon(afwCreateIconSet(QLatin1String("previous.png")));
     layOut->addWidget(m_toolPrevious);
     connect(m_toolPrevious, SIGNAL(clicked()), SLOT(findPrevious()));
 
@@ -100,7 +100,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
     m_toolNext->setAutoRaise(true);
     m_toolNext->setText(tr("&Next"));
     m_toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    m_toolNext->setIcon(createIconSet(QLatin1String("next.png")));
+    m_toolNext->setIcon(afwCreateIconSet(QLatin1String("next.png")));
     layOut->addWidget(m_toolNext);
     connect(m_toolNext, SIGNAL(clicked()), SLOT(findNext()));
 
@@ -167,7 +167,7 @@ AbstractFindWidget::~AbstractFindWidget() = default;
  */
 QIcon AbstractFindWidget::findIconSet()
 {
-    return createIconSet(QLatin1String("searchfind.png"));
+    return afwCreateIconSet(QLatin1String("searchfind.png"));
 }
 
 /*!