diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 93a6e451b4d..0e197f475dc 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -734,7 +734,7 @@ void Preprocessor::State::updateIncludeGuardState_helper(IncludeGuardStateHint h #endif // DEBUG_INCLUDE_GUARD_TRACKING } -const QString Preprocessor::configurationFileName = QLatin1String(""); +QString Preprocessor::configurationFileName() { return QStringLiteral(""); } Preprocessor::Preprocessor(Client *client, Environment *env) : m_client(client) @@ -1978,7 +1978,7 @@ void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk) // the macro is a feature constraint(e.g. QT_NO_XXX) if (checkUndefined && macroName.startsWith("QT_NO_")) { - if (macro->fileName() == configurationFileName) { + if (macro->fileName() == configurationFileName()) { // and it' defined in a pro file (e.g. DEFINES += QT_NO_QOBJECT) value = false; // take the branch diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index c994df473de..2ec38746f62 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -77,7 +77,7 @@ class CPLUSPLUS_EXPORT Preprocessor typedef Internal::Value Value; public: - static const QString configurationFileName; + static QString configurationFileName(); public: Preprocessor(Client *client, Environment *env); diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp index d383be41896..d67820bd6b8 100644 --- a/src/libs/qmljs/qmljsimportdependencies.cpp +++ b/src/libs/qmljs/qmljsimportdependencies.cpp @@ -481,7 +481,7 @@ bool operator <(const ImportKey &i1, const ImportKey &i2) return i1.compare(i2) < 0; } -const QString Export::LibraryTypeName = QLatin1String("%Library%"); +QString Export::libraryTypeName() { return QStringLiteral("%Library%"); } Export::Export() : intrinsic(false) diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h index 62d09282295..ad30c02e041 100644 --- a/src/libs/qmljs/qmljsimportdependencies.h +++ b/src/libs/qmljs/qmljsimportdependencies.h @@ -131,10 +131,10 @@ bool operator <(const ImportKey &i1, const ImportKey &i2); class QMLJS_EXPORT Export { public: - static const QString LibraryTypeName; + static QString libraryTypeName(); Export(); Export(ImportKey exportName, QString pathRequired, bool intrinsic = false, - const QString &typeName = LibraryTypeName); + const QString &typeName = libraryTypeName()); ImportKey exportName; QString pathRequired; QString typeName; @@ -211,9 +211,9 @@ public: void removeCoreImport(const QString &importId); void addExport(const QString &importId, const ImportKey &importKey, - const QString &requiredPath, const QString &typeName = Export::LibraryTypeName); + const QString &requiredPath, const QString &typeName = Export::libraryTypeName()); void removeExport(const QString &importId, const ImportKey &importKey, - const QString &requiredPath, const QString &typeName = Export::LibraryTypeName); + const QString &requiredPath, const QString &typeName = Export::libraryTypeName()); void iterateOnCoreImports(const ViewerContext &vContext, std::function const &iterF) const; diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index da8347bb800..47f1230c443 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -137,28 +137,28 @@ JsonValue *JsonValue::build(const QVariant &variant, JsonMemoryPool *pool) /////////////////////////////////////////////////////////////////////////////// -const QString JsonSchema::kType(QLatin1String("type")); -const QString JsonSchema::kProperties(QLatin1String("properties")); -const QString JsonSchema::kPatternProperties(QLatin1String("patternProperties")); -const QString JsonSchema::kAdditionalProperties(QLatin1String("additionalProperties")); -const QString JsonSchema::kItems(QLatin1String("items")); -const QString JsonSchema::kAdditionalItems(QLatin1String("additionalItems")); -const QString JsonSchema::kRequired(QLatin1String("required")); -const QString JsonSchema::kDependencies(QLatin1String("dependencies")); -const QString JsonSchema::kMinimum(QLatin1String("minimum")); -const QString JsonSchema::kMaximum(QLatin1String("maximum")); -const QString JsonSchema::kExclusiveMinimum(QLatin1String("exclusiveMinimum")); -const QString JsonSchema::kExclusiveMaximum(QLatin1String("exclusiveMaximum")); -const QString JsonSchema::kMinItems(QLatin1String("minItems")); -const QString JsonSchema::kMaxItems(QLatin1String("maxItems")); -const QString JsonSchema::kUniqueItems(QLatin1String("uniqueItems")); -const QString JsonSchema::kPattern(QLatin1String("pattern")); -const QString JsonSchema::kMinLength(QLatin1String("minLength")); -const QString JsonSchema::kMaxLength(QLatin1String("maxLength")); -const QString JsonSchema::kTitle(QLatin1String("title")); -const QString JsonSchema::kDescription(QLatin1String("description")); -const QString JsonSchema::kExtends(QLatin1String("extends")); -const QString JsonSchema::kRef(QLatin1String("$ref")); +QString JsonSchema::kType() { return QStringLiteral("type"); } +QString JsonSchema::kProperties() { return QStringLiteral("properties"); } +QString JsonSchema::kPatternProperties() { return QStringLiteral("patternProperties"); } +QString JsonSchema::kAdditionalProperties() { return QStringLiteral("additionalProperties"); } +QString JsonSchema::kItems() { return QStringLiteral("items"); } +QString JsonSchema::kAdditionalItems() { return QStringLiteral("additionalItems"); } +QString JsonSchema::kRequired() { return QStringLiteral("required"); } +QString JsonSchema::kDependencies() { return QStringLiteral("dependencies"); } +QString JsonSchema::kMinimum() { return QStringLiteral("minimum"); } +QString JsonSchema::kMaximum() { return QStringLiteral("maximum"); } +QString JsonSchema::kExclusiveMinimum() { return QStringLiteral("exclusiveMinimum"); } +QString JsonSchema::kExclusiveMaximum() { return QStringLiteral("exclusiveMaximum"); } +QString JsonSchema::kMinItems() { return QStringLiteral("minItems"); } +QString JsonSchema::kMaxItems() { return QStringLiteral("maxItems"); } +QString JsonSchema::kUniqueItems() { return QStringLiteral("uniqueItems"); } +QString JsonSchema::kPattern() { return QStringLiteral("pattern"); } +QString JsonSchema::kMinLength() { return QStringLiteral("minLength"); } +QString JsonSchema::kMaxLength() { return QStringLiteral("maxLength"); } +QString JsonSchema::kTitle() { return QStringLiteral("title"); } +QString JsonSchema::kDescription() { return QStringLiteral("description"); } +QString JsonSchema::kExtends() { return QStringLiteral("extends"); } +QString JsonSchema::kRef() { return QStringLiteral("$ref"); } JsonSchema::JsonSchema(JsonObjectValue *rootObject, const JsonSchemaManager *manager) : m_manager(manager) @@ -169,11 +169,11 @@ JsonSchema::JsonSchema(JsonObjectValue *rootObject, const JsonSchemaManager *man bool JsonSchema::isTypeConstrained() const { // Simple types - if (JsonStringValue *sv = getStringValue(kType, currentValue())) + if (JsonStringValue *sv = getStringValue(kType(), currentValue())) return isCheckableType(sv->value()); // Union types - if (JsonArrayValue *av = getArrayValue(kType, currentValue())) { + if (JsonArrayValue *av = getArrayValue(kType(), currentValue())) { QTC_ASSERT(currentIndex() != -1, return false); QTC_ASSERT(av->elements().at(currentIndex())->kind() == JsonValue::String, return false); JsonStringValue *sv = av->elements().at(currentIndex())->toString(); @@ -186,11 +186,11 @@ bool JsonSchema::isTypeConstrained() const bool JsonSchema::acceptsType(const QString &type) const { // Simple types - if (JsonStringValue *sv = getStringValue(kType, currentValue())) + if (JsonStringValue *sv = getStringValue(kType(), currentValue())) return typeMatches(sv->value(), type); // Union types - if (JsonArrayValue *av = getArrayValue(kType, currentValue())) { + if (JsonArrayValue *av = getArrayValue(kType(), currentValue())) { QTC_ASSERT(currentIndex() != -1, return false); QTC_ASSERT(av->elements().at(currentIndex())->kind() == JsonValue::String, return false); JsonStringValue *sv = av->elements().at(currentIndex())->toString(); @@ -204,13 +204,13 @@ QStringList JsonSchema::validTypes(JsonObjectValue *v) { QStringList all; - if (JsonStringValue *sv = getStringValue(kType, v)) + if (JsonStringValue *sv = getStringValue(kType(), v)) all.append(sv->value()); - if (JsonObjectValue *ov = getObjectValue(kType, v)) + if (JsonObjectValue *ov = getObjectValue(kType(), v)) return validTypes(ov); - if (JsonArrayValue *av = getArrayValue(kType, v)) { + if (JsonArrayValue *av = getArrayValue(kType(), v)) { foreach (JsonValue *v, av->elements()) { if (JsonStringValue *sv = v->toString()) all.append(sv->value()); @@ -252,14 +252,14 @@ QStringList JsonSchema::validTypes() const bool JsonSchema::hasTypeSchema() const { - return getObjectValue(kType, currentValue()); + return getObjectValue(kType(), currentValue()); } void JsonSchema::enterNestedTypeSchema() { QTC_ASSERT(hasTypeSchema(), return); - enter(getObjectValue(kType, currentValue())); + enter(getObjectValue(kType(), currentValue())); } QStringList JsonSchema::properties(JsonObjectValue *v) const @@ -268,7 +268,7 @@ QStringList JsonSchema::properties(JsonObjectValue *v) const QStringList all; - if (JsonObjectValue *ov = getObjectValue(kProperties, v)) { + if (JsonObjectValue *ov = getObjectValue(kProperties(), v)) { const MemberConstIterator cend = ov->members().constEnd(); for (MemberConstIterator it = ov->members().constBegin(); it != cend; ++it) if (hasPropertySchema(it.key())) @@ -291,7 +291,7 @@ QStringList JsonSchema::properties() const JsonObjectValue *JsonSchema::propertySchema(const QString &property, JsonObjectValue *v) const { - if (JsonObjectValue *ov = getObjectValue(kProperties, v)) { + if (JsonObjectValue *ov = getObjectValue(kProperties(), v)) { JsonValue *member = ov->member(property); if (member && member->kind() == JsonValue::Object) return member->toObject(); @@ -329,14 +329,14 @@ bool JsonSchema::hasItemSchema() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Array)), return false); - return getObjectValue(kItems, currentValue()); + return getObjectValue(kItems(), currentValue()); } void JsonSchema::enterNestedItemSchema() { QTC_ASSERT(hasItemSchema(), return); - enter(getObjectValue(kItems, currentValue())); + enter(getObjectValue(kItems(), currentValue())); } /*! @@ -350,14 +350,14 @@ bool JsonSchema::hasItemArraySchema() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Array)), return false); - return getArrayValue(kItems, currentValue()); + return getArrayValue(kItems(), currentValue()); } int JsonSchema::itemArraySchemaSize() const { QTC_ASSERT(hasItemArraySchema(), return false); - return getArrayValue(kItems, currentValue())->size(); + return getArrayValue(kItems(), currentValue())->size(); } /*! @@ -377,7 +377,7 @@ bool JsonSchema::maybeEnterNestedArraySchema(int index) QTC_ASSERT(itemArraySchemaSize(), return false); QTC_ASSERT(index >= 0 && index < itemArraySchemaSize(), return false); - JsonValue *v = getArrayValue(kItems, currentValue())->elements().at(index); + JsonValue *v = getArrayValue(kItems(), currentValue())->elements().at(index); return maybeEnter(v, Array, index); } @@ -391,12 +391,12 @@ bool JsonSchema::maybeEnterNestedArraySchema(int index) */ bool JsonSchema::hasUnionSchema() const { - return getArrayValue(kType, currentValue()); + return getArrayValue(kType(), currentValue()); } int JsonSchema::unionSchemaSize() const { - return getArrayValue(kType, currentValue())->size(); + return getArrayValue(kType(), currentValue())->size(); } /*! @@ -416,7 +416,7 @@ bool JsonSchema::maybeEnterNestedUnionSchema(int index) QTC_ASSERT(unionSchemaSize(), return false); QTC_ASSERT(index >= 0 && index < unionSchemaSize(), return false); - JsonValue *v = getArrayValue(kType, currentValue())->elements().at(index); + JsonValue *v = getArrayValue(kType(), currentValue())->elements().at(index); return maybeEnter(v, Union, index); } @@ -430,7 +430,7 @@ void JsonSchema::leaveNestedSchema() bool JsonSchema::required() const { - if (JsonBooleanValue *bv = getBooleanValue(kRequired, currentValue())) + if (JsonBooleanValue *bv = getBooleanValue(kRequired(), currentValue())) return bv->value(); return false; @@ -440,21 +440,21 @@ bool JsonSchema::hasMinimum() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Int)), return false); - return getDoubleValue(kMinimum, currentValue()); + return getDoubleValue(kMinimum(), currentValue()); } double JsonSchema::minimum() const { QTC_ASSERT(hasMinimum(), return 0); - return getDoubleValue(kMinimum, currentValue())->value(); + return getDoubleValue(kMinimum(), currentValue())->value(); } bool JsonSchema::hasExclusiveMinimum() { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Int)), return false); - if (JsonBooleanValue *bv = getBooleanValue(kExclusiveMinimum, currentValue())) + if (JsonBooleanValue *bv = getBooleanValue(kExclusiveMinimum(), currentValue())) return bv->value(); return false; @@ -464,21 +464,21 @@ bool JsonSchema::hasMaximum() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Int)), return false); - return getDoubleValue(kMaximum, currentValue()); + return getDoubleValue(kMaximum(), currentValue()); } double JsonSchema::maximum() const { QTC_ASSERT(hasMaximum(), return 0); - return getDoubleValue(kMaximum, currentValue())->value(); + return getDoubleValue(kMaximum(), currentValue())->value(); } bool JsonSchema::hasExclusiveMaximum() { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Int)), return false); - if (JsonBooleanValue *bv = getBooleanValue(kExclusiveMaximum, currentValue())) + if (JsonBooleanValue *bv = getBooleanValue(kExclusiveMaximum(), currentValue())) return bv->value(); return false; @@ -488,7 +488,7 @@ QString JsonSchema::pattern() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::String)), return QString()); - if (JsonStringValue *sv = getStringValue(kPattern, currentValue())) + if (JsonStringValue *sv = getStringValue(kPattern(), currentValue())) return sv->value(); return QString(); @@ -498,7 +498,7 @@ int JsonSchema::minimumLength() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::String)), return -1); - if (JsonDoubleValue *dv = getDoubleValue(kMinLength, currentValue())) + if (JsonDoubleValue *dv = getDoubleValue(kMinLength(), currentValue())) return dv->value(); return -1; @@ -508,7 +508,7 @@ int JsonSchema::maximumLength() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::String)), return -1); - if (JsonDoubleValue *dv = getDoubleValue(kMaxLength, currentValue())) + if (JsonDoubleValue *dv = getDoubleValue(kMaxLength(), currentValue())) return dv->value(); return -1; @@ -518,7 +518,7 @@ bool JsonSchema::hasAdditionalItems() const { QTC_ASSERT(acceptsType(JsonValue::kindToString(JsonValue::Array)), return false); - return currentValue()->member(kAdditionalItems); + return currentValue()->member(kAdditionalItems()); } bool JsonSchema::maybeSchemaName(const QString &s) @@ -600,7 +600,7 @@ void JsonSchema::leave() JsonObjectValue *JsonSchema::resolveReference(JsonObjectValue *ov) const { - if (JsonStringValue *sv = getStringValue(kRef, ov)) { + if (JsonStringValue *sv = getStringValue(kRef(), ov)) { JsonSchema *referenced = m_manager->schemaByName(sv->value()); if (referenced) return referenced->rootValue(); @@ -611,7 +611,7 @@ JsonObjectValue *JsonSchema::resolveReference(JsonObjectValue *ov) const JsonObjectValue *JsonSchema::resolveBase(JsonObjectValue *ov) const { - if (JsonValue *v = ov->member(kExtends)) { + if (JsonValue *v = ov->member(kExtends())) { if (v->kind() == JsonValue::String) { JsonSchema *schema = m_manager->schemaByName(v->toString()->value()); if (schema) diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h index 9edc9dbae4c..7cca396740a 100644 --- a/src/libs/utils/json.h +++ b/src/libs/utils/json.h @@ -355,28 +355,28 @@ private: static bool maybeSchemaName(const QString &s); - static const QString kType; - static const QString kProperties; - static const QString kPatternProperties; - static const QString kAdditionalProperties; - static const QString kItems; - static const QString kAdditionalItems; - static const QString kRequired; - static const QString kDependencies; - static const QString kMinimum; - static const QString kMaximum; - static const QString kExclusiveMinimum; - static const QString kExclusiveMaximum; - static const QString kMinItems; - static const QString kMaxItems; - static const QString kUniqueItems; - static const QString kPattern; - static const QString kMinLength; - static const QString kMaxLength; - static const QString kTitle; - static const QString kDescription; - static const QString kExtends; - static const QString kRef; + static QString kType(); + static QString kProperties(); + static QString kPatternProperties(); + static QString kAdditionalProperties(); + static QString kItems(); + static QString kAdditionalItems(); + static QString kRequired(); + static QString kDependencies(); + static QString kMinimum(); + static QString kMaximum(); + static QString kExclusiveMinimum(); + static QString kExclusiveMaximum(); + static QString kMinItems(); + static QString kMaxItems(); + static QString kUniqueItems(); + static QString kPattern(); + static QString kMinLength(); + static QString kMaxLength(); + static QString kTitle(); + static QString kDescription(); + static QString kExtends(); + static QString kRef(); struct Context { diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index e15d1f659c3..34f329af84f 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -253,7 +253,7 @@ QString CppModelManager::editorConfigurationFileName() QString CppModelManager::configurationFileName() { - return Preprocessor::configurationFileName; + return Preprocessor::configurationFileName(); } void CppModelManager::updateModifiedSourceFiles() diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index bb826bbf27e..493f762afd6 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -154,7 +154,7 @@ static QString qualifiedTypeNameForContext(const ObjectValue *objectValue, case ImportType::Library: { QString typeName = objectValue->className(); - if (!e.typeName.isEmpty() && e.typeName != Export::LibraryTypeName) { + if (!e.typeName.isEmpty() && e.typeName != Export::libraryTypeName()) { typeName = e.typeName; if (typeName != objectValue->className()) qCWarning(qmljsLog) << "Outdated classname " << objectValue->className()