Qt Designer: Disambiguate static variables and functions

They cause conflicts in CMake Unity (Jumbo) builds.

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I896678dd4c189c27b59b1338881702dcbe5f7e88
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

2 files changed, 10 insertions, 10 deletions

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();
 }