diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-17 18:27:10 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-25 14:19:32 +0100 |
commit | a55314a6dd3c2f4778b3de259748f1ee6ba6e16b (patch) | |
tree | a4c2629ff4dbaab583ee84e49501fe91f80ac8fb /src/lib/corelib/language/builtindeclarations.cpp | |
parent | a68fbbbf66b8ef65df9c4cc870b11c0e1b414512 (diff) |
make PropertyDeclaration implicitly shared
Change-Id: Iad2f353371bd64ce8138dc86ed1f07ac994cf237
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/language/builtindeclarations.cpp')
-rw-r--r-- | src/lib/corelib/language/builtindeclarations.cpp | 72 |
1 files changed, 40 insertions, 32 deletions
diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp index 187408add..b4cf7cda2 100644 --- a/src/lib/corelib/language/builtindeclarations.cpp +++ b/src/lib/corelib/language/builtindeclarations.cpp @@ -78,13 +78,13 @@ ItemDeclaration BuiltinDeclarations::declarationsForType(const QString &typeName void BuiltinDeclarations::setupItemForBuiltinType(Item *item) const { foreach (const PropertyDeclaration &pd, declarationsForType(item->typeName()).properties()) { - item->m_propertyDeclarations.insert(pd.name, pd); - ValuePtr &value = item->m_properties[pd.name]; + item->m_propertyDeclarations.insert(pd.name(), pd); + ValuePtr &value = item->m_properties[pd.name()]; if (!value) { JSSourceValuePtr sourceValue = JSSourceValue::create(); sourceValue->setFile(item->file()); - sourceValue->setSourceCode(pd.initialValueSource.isEmpty() ? - QLatin1String("undefined") : pd.initialValueSource); + sourceValue->setSourceCode(pd.initialValueSource().isEmpty() ? + QLatin1String("undefined") : pd.initialValueSource()); value = sourceValue; } } @@ -98,7 +98,7 @@ void BuiltinDeclarations::insert(const ItemDeclaration &decl) static PropertyDeclaration conditionProperty() { PropertyDeclaration decl(QLatin1String("condition"), PropertyDeclaration::Boolean); - decl.initialValueSource = QLatin1String("true"); + decl.setInitialValueSource(QLatin1String("true")); return decl; } @@ -110,10 +110,11 @@ static PropertyDeclaration nameProperty() static PropertyDeclaration prepareScriptProperty() { PropertyDeclaration decl(QLatin1String("prepare"), PropertyDeclaration::Verbatim); - decl.functionArgumentNames - << QLatin1String("project") << QLatin1String("product") - << QLatin1String("inputs") << QLatin1String("outputs") - << QLatin1String("input") << QLatin1String("output"); + decl.setFunctionArgumentNames( + QStringList() + << QLatin1String("project") << QLatin1String("product") + << QLatin1String("inputs") << QLatin1String("outputs") + << QLatin1String("input") << QLatin1String("output")); return decl; } @@ -124,7 +125,7 @@ void BuiltinDeclarations::addArtifactItem() item << PropertyDeclaration(QLatin1String("fileName"), PropertyDeclaration::Verbatim); item << PropertyDeclaration(QLatin1String("fileTags"), PropertyDeclaration::Variant); PropertyDeclaration decl(QLatin1String("alwaysUpdated"), PropertyDeclaration::Boolean); - decl.initialValueSource = QLatin1String("true"); + decl.setInitialValueSource(QLatin1String("true")); item << decl; insert(item); } @@ -136,7 +137,7 @@ void BuiltinDeclarations::addDependsItem() item << nameProperty(); item << PropertyDeclaration(QLatin1String("submodules"), PropertyDeclaration::Variant); PropertyDeclaration requiredDecl(QLatin1String("required"), PropertyDeclaration::Boolean); - requiredDecl.initialValueSource = QLatin1String("true"); + requiredDecl.setInitialValueSource(QLatin1String("true")); item << requiredDecl; insert(item); } @@ -180,10 +181,10 @@ void BuiltinDeclarations::addGroupItem() item << PropertyDeclaration(QLatin1String("prefix"), PropertyDeclaration::Variant, PropertyDeclaration::PropertyNotAvailableInConfig); PropertyDeclaration declaration; - declaration.name = QLatin1String("overrideTags"); - declaration.type = PropertyDeclaration::Boolean; - declaration.flags = PropertyDeclaration::PropertyNotAvailableInConfig; - declaration.initialValueSource = QLatin1String("true"); + declaration.setName(QLatin1String("overrideTags")); + declaration.setType(PropertyDeclaration::Boolean); + declaration.setFlags(PropertyDeclaration::PropertyNotAvailableInConfig); + declaration.setInitialValueSource(QLatin1String("true")); item << declaration; insert(item); } @@ -212,7 +213,7 @@ void BuiltinDeclarations::addModuleItem() item << PropertyDeclaration(QLatin1String("additionalProductFileTags"), PropertyDeclaration::Variant); PropertyDeclaration presentDecl(QLatin1String("present"), PropertyDeclaration::Boolean); - presentDecl.initialValueSource = QLatin1String("true"); + presentDecl.setInitialValueSource(QLatin1String("true")); item << presentDecl; insert(item); } @@ -222,7 +223,7 @@ void BuiltinDeclarations::addProbeItem() ItemDeclaration item(QLatin1String("Probe")); item << conditionProperty(); PropertyDeclaration foundProperty(QLatin1String("found"), PropertyDeclaration::Boolean); - foundProperty.initialValueSource = QLatin1String("false"); + foundProperty.setInitialValueSource(QLatin1String("false")); item << foundProperty; item << PropertyDeclaration(QLatin1String("configure"), PropertyDeclaration::Verbatim); insert(item); @@ -242,14 +243,14 @@ void BuiltinDeclarations::addProductItem() << QLatin1String("Rule")); item << conditionProperty(); PropertyDeclaration decl(QLatin1String("type"), PropertyDeclaration::StringList); - decl.initialValueSource = QLatin1String("[]"); + decl.setInitialValueSource(QLatin1String("[]")); item << decl; item << nameProperty(); decl = PropertyDeclaration(QLatin1String("targetName"), PropertyDeclaration::String); - decl.initialValueSource = QLatin1String("name"); + decl.setInitialValueSource(QLatin1String("name")); item << decl; decl = PropertyDeclaration(QLatin1String("destinationDirectory"), PropertyDeclaration::String); - decl.initialValueSource = QLatin1String("'.'"); + decl.setInitialValueSource(QLatin1String("'.'")); item << decl; item << PropertyDeclaration(QLatin1String("consoleApplication"), PropertyDeclaration::Boolean); @@ -303,15 +304,16 @@ void BuiltinDeclarations::addRuleItem() << QLatin1String("Artifact")); item << conditionProperty(); PropertyDeclaration decl(QLatin1String("multiplex"), PropertyDeclaration::Boolean); - decl.initialValueSource = QLatin1String("false"); + decl.setInitialValueSource(QLatin1String("false")); item << decl; item << PropertyDeclaration(QLatin1String("name"), PropertyDeclaration::String); item << PropertyDeclaration(QLatin1String("inputs"), PropertyDeclaration::StringList); item << PropertyDeclaration(QLatin1String("outputFileTags"), PropertyDeclaration::StringList); decl = PropertyDeclaration(QLatin1String("outputArtifacts"), PropertyDeclaration::Verbatim); - decl.functionArgumentNames - << QLatin1String("project") << QLatin1String("product") - << QLatin1String("inputs") << QLatin1String("input"); + decl.setFunctionArgumentNames( + QStringList() + << QLatin1String("project") << QLatin1String("product") + << QLatin1String("inputs") << QLatin1String("input")); item << decl; item << PropertyDeclaration(QLatin1String("usings"), PropertyDeclaration::StringList); item << PropertyDeclaration(QLatin1String("auxiliaryInputs"), @@ -332,9 +334,9 @@ void BuiltinDeclarations::addSubprojectItem() << QLatin1String("Properties")); item << PropertyDeclaration(QLatin1String("filePath"), PropertyDeclaration::Path); PropertyDeclaration inheritProperty; - inheritProperty.name = QLatin1String("inheritProperties"); - inheritProperty.type = PropertyDeclaration::Boolean; - inheritProperty.initialValueSource = QLatin1String("true"); + inheritProperty.setName(QLatin1String("inheritProperties")); + inheritProperty.setType(PropertyDeclaration::Boolean); + inheritProperty.setInitialValueSource(QLatin1String("true")); item << inheritProperty; insert(item); } @@ -358,15 +360,21 @@ void BuiltinDeclarations::addScannerItem() item << conditionProperty(); item << PropertyDeclaration(QLatin1String("inputs"), PropertyDeclaration::StringList); PropertyDeclaration recursive(QLatin1String("recursive"), PropertyDeclaration::Boolean); - recursive.initialValueSource = QLatin1String("false"); + recursive.setInitialValueSource(QLatin1String("false")); item << recursive; PropertyDeclaration searchPaths(QLatin1String("searchPaths"), PropertyDeclaration::Verbatim); - searchPaths.functionArgumentNames << QLatin1String("project") - << QLatin1String("product") << QLatin1String("input"); + searchPaths.setFunctionArgumentNames( + QStringList() + << QLatin1String("project") + << QLatin1String("product") + << QLatin1String("input")); item << searchPaths; PropertyDeclaration scan(QLatin1String("scan"), PropertyDeclaration::Verbatim); - scan.functionArgumentNames << QLatin1String("project") - << QLatin1String("product") << QLatin1String("input"); + scan.setFunctionArgumentNames( + QStringList() + << QLatin1String("project") + << QLatin1String("product") + << QLatin1String("input")); item << scan; insert(item); } |