QmlDesigner: Move PropertyDeclarationTraits

Because it is shared between different namespaces it is moved to the
parent namespace.

Change-Id: I43186bfa3b1b1d6bf95158aaf13b06e0c6bd64b5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h

@@ -1498,7 +1498,7 @@ private:
             json.append(parameter.name);
             json.append("\",\"tn\":\"");
             json.append(parameter.typeName);
-            if (parameter.traits == Storage::Synchronization::PropertyDeclarationTraits::None) {
+            if (parameter.traits == Storage::PropertyDeclarationTraits::None) {
                 json.append("\"}");
             } else {
                 json.append("\",\"tr\":");

src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h

@@ -43,30 +43,15 @@ constexpr std::underlying_type_t<Enumeration> to_underlying(Enumeration enumerat
     return static_cast<std::underlying_type_t<Enumeration>>(enumeration);
 }
 
-using TypeNameString = Utils::BasicSmallString<63>;
-
 } // namespace QmlDesigner
 
-namespace QmlDesigner::Storage::Synchronization {
+namespace QmlDesigner::Storage {
-
-enum class TypeAccessSemantics : int { None, Reference, Value, Sequence, IsEnum = 1 << 8 };
-
-constexpr TypeAccessSemantics operator|(TypeAccessSemantics first, TypeAccessSemantics second)
-{
-    return static_cast<TypeAccessSemantics>(static_cast<int>(first) | static_cast<int>(second));
-}
-
 enum class PropertyDeclarationTraits : int {
     None = 0,
     IsReadOnly = 1 << 0,
     IsPointer = 1 << 1,
     IsList = 1 << 2
 };
-
-enum class TypeNameKind { Exported = 1, QualifiedExported = 2 };
-
-enum class FileType : char { QmlTypes, QmlDocument };
-
 constexpr PropertyDeclarationTraits operator|(PropertyDeclarationTraits first,
                                               PropertyDeclarationTraits second)
 {
@@ -78,6 +63,23 @@ constexpr bool operator&(PropertyDeclarationTraits first, PropertyDeclarationTra
     return static_cast<int>(first) & static_cast<int>(second);
 }
 
+using TypeNameString = Utils::BasicSmallString<63>;
+
+} // namespace QmlDesigner::Storage
+
+namespace QmlDesigner::Storage::Synchronization {
+
+enum class TypeAccessSemantics : int { None, Reference, Value, Sequence, IsEnum = 1 << 8 };
+
+constexpr TypeAccessSemantics operator|(TypeAccessSemantics first, TypeAccessSemantics second)
+{
+    return static_cast<TypeAccessSemantics>(static_cast<int>(first) | static_cast<int>(second));
+}
+
+enum class TypeNameKind { Exported = 1, QualifiedExported = 2 };
+
+enum class FileType : char { QmlTypes, QmlDocument };
+
 class VersionNumber
 {
 public:

src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.cpp

@@ -170,22 +170,22 @@ bool isListProperty(const QStringView rawtypeName)
 struct TypeNameViewAndTraits
 {
     QStringView typeName;
-    Storage::Synchronization::PropertyDeclarationTraits traits;
+    Storage::PropertyDeclarationTraits traits;
 };
 
 TypeNameViewAndTraits filteredListTypeName(const QStringView rawtypeName)
 {
     if (!isListProperty(rawtypeName))
-        return {rawtypeName, Storage::Synchronization::PropertyDeclarationTraits::None};
+        return {rawtypeName, Storage::PropertyDeclarationTraits::None};
 
     return {rawtypeName.mid(5, rawtypeName.size() - 6),
-            Storage::Synchronization::PropertyDeclarationTraits::IsList};
+            Storage::PropertyDeclarationTraits::IsList};
 };
 
 struct TypeNameAndTraits
 {
     Storage::Synchronization::ImportedTypeName importedTypeName;
-    Storage::Synchronization::PropertyDeclarationTraits traits;
+    Storage::PropertyDeclarationTraits traits;
 };
 
 TypeNameAndTraits createImportedTypeNameAndTypeTraits(const QStringView rawtypeName,

src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.cpp

@@ -174,19 +174,19 @@ Storage::Synchronization::ExportedTypes createCppEnumerationExports(
     return exportedTypes;
 }
 
-Storage::Synchronization::PropertyDeclarationTraits createPropertyDeclarationTraits(
+Storage::PropertyDeclarationTraits createPropertyDeclarationTraits(
     const QQmlJSMetaProperty &qmlProperty)
 {
-    Storage::Synchronization::PropertyDeclarationTraits traits{};
+    Storage::PropertyDeclarationTraits traits{};
 
     if (qmlProperty.isList())
-        traits = traits | Storage::Synchronization::PropertyDeclarationTraits::IsList;
+        traits = traits | Storage::PropertyDeclarationTraits::IsList;
 
     if (qmlProperty.isPointer())
-        traits = traits | Storage::Synchronization::PropertyDeclarationTraits::IsPointer;
+        traits = traits | Storage::PropertyDeclarationTraits::IsPointer;
 
     if (!qmlProperty.isWritable())
-        traits = traits | Storage::Synchronization::PropertyDeclarationTraits::IsReadOnly;
+        traits = traits | Storage::PropertyDeclarationTraits::IsReadOnly;
 
     return traits;
 }

tests/unit/unittest/gtest-creator-printing.cpp

@@ -525,6 +525,29 @@ std::ostream &operator<<(std::ostream &out, const SourceContext &sourceContext)
 }
 } // namespace Cache
 
+namespace Storage {
+std::ostream &operator<<(std::ostream &out, PropertyDeclarationTraits traits)
+{
+    const char *padding = "";
+
+    out << "(";
+    if (traits & PropertyDeclarationTraits::IsReadOnly) {
+        out << "readonly";
+        padding = ", ";
+    }
+
+    if (traits & PropertyDeclarationTraits::IsPointer) {
+        out << padding << "pointer";
+        padding = ", ";
+    }
+
+    if (traits & PropertyDeclarationTraits::IsList)
+        out << padding << "list";
+
+    return out << ")";
+}
+} // namespace Storage
+
 namespace Storage::Synchronization {
 
 namespace {
@@ -714,27 +737,6 @@ std::ostream &operator<<(std::ostream &out, const PropertyDeclaration &propertyD
                << propertyDeclaration.aliasPropertyName << "\")";
 }
 
-std::ostream &operator<<(std::ostream &out, PropertyDeclarationTraits traits)
-{
-    const char *padding = "";
-
-    out << "(";
-    if (traits & PropertyDeclarationTraits::IsReadOnly) {
-        out << "readonly";
-        padding = ", ";
-    }
-
-    if (traits & PropertyDeclarationTraits::IsPointer) {
-        out << padding << "pointer";
-        padding = ", ";
-    }
-
-    if (traits & PropertyDeclarationTraits::IsList)
-        out << padding << "list";
-
-    return out << ")";
-}
-
 std::ostream &operator<<(std::ostream &out, const FunctionDeclaration &functionDeclaration)
 {
     return out << "(\"" << functionDeclaration.name << "\", \"" << functionDeclaration.returnTypeName

tests/unit/unittest/gtest-creator-printing.h

@@ -153,6 +153,12 @@ class SourceContext;
 std::ostream &operator<<(std::ostream &out, const SourceContext &sourceContext);
 } // namespace Cache
 
+namespace Storage {
+enum class PropertyDeclarationTraits : int;
+
+std::ostream &operator<<(std::ostream &out, PropertyDeclarationTraits traits);
+} // namespace Storage
+
 namespace Storage::Synchronization {
 class Type;
 class ExportedType;
@@ -161,7 +167,6 @@ class QualifiedImportedType;
 class Version;
 class VersionNumber;
 enum class TypeAccessSemantics : int;
-enum class PropertyDeclarationTraits : int;
 class PropertyDeclaration;
 class FunctionDeclaration;
 class ParameterDeclaration;
@@ -186,7 +191,6 @@ std::ostream &operator<<(std::ostream &out, const ExportedType &exportedType);
 std::ostream &operator<<(std::ostream &out, const ImportedType &importedType);
 std::ostream &operator<<(std::ostream &out, const QualifiedImportedType &importedType);
 std::ostream &operator<<(std::ostream &out, const PropertyDeclaration &propertyDeclaration);
-std::ostream &operator<<(std::ostream &out, PropertyDeclarationTraits traits);
 std::ostream &operator<<(std::ostream &out, const FunctionDeclaration &functionDeclaration);
 std::ostream &operator<<(std::ostream &out, const ParameterDeclaration &parameter);
 std::ostream &operator<<(std::ostream &out, const SignalDeclaration &signalDeclaration);