diff options
19 files changed, 76 insertions, 86 deletions
diff --git a/src/lib/corelib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp index 28b8a40fa..32b7accc7 100644 --- a/src/lib/corelib/api/jobs.cpp +++ b/src/lib/corelib/api/jobs.cpp @@ -229,10 +229,8 @@ SetupProjectJob::SetupProjectJob(const Logger &logger, QObject *parent) */ Project SetupProjectJob::project() const { - const InternalJobThreadWrapper * const wrapper - = qobject_cast<InternalJobThreadWrapper *>(internalJob()); - const InternalSetupProjectJob * const job - = qobject_cast<InternalSetupProjectJob *>(wrapper->synchronousJob()); + auto const wrapper = qobject_cast<const InternalJobThreadWrapper *>(internalJob()); + auto const job = qobject_cast<const InternalSetupProjectJob *>(wrapper->synchronousJob()); return Project(job->project(), job->logger()); } @@ -244,20 +242,16 @@ void SetupProjectJob::resolve(const Project &existingProject, = existingProject.d ? existingProject.d->internalProject : TopLevelProjectPtr(); if (existingInternalProject && !lockProject(existingInternalProject)) return; - InternalJobThreadWrapper * const wrapper - = qobject_cast<InternalJobThreadWrapper *>(internalJob()); - InternalSetupProjectJob * const job - = qobject_cast<InternalSetupProjectJob *>(wrapper->synchronousJob()); + auto const wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob()); + auto const job = qobject_cast<InternalSetupProjectJob *>(wrapper->synchronousJob()); job->init(existingInternalProject, parameters); wrapper->start(); } void SetupProjectJob::reportError(const ErrorInfo &error) { - InternalJobThreadWrapper * const wrapper - = qobject_cast<InternalJobThreadWrapper *>(internalJob()); - InternalSetupProjectJob * const job - = qobject_cast<InternalSetupProjectJob *>(wrapper->synchronousJob()); + auto const wrapper = qobject_cast<const InternalJobThreadWrapper *>(internalJob()); + auto const job = qobject_cast<InternalSetupProjectJob *>(wrapper->synchronousJob()); job->reportError(error); } @@ -351,7 +345,7 @@ void CleanJob::clean(const TopLevelProjectPtr &project, const QList<ResolvedProd { if (!lockProject(project)) return; - InternalJobThreadWrapper * wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob()); + auto wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob()); qobject_cast<InternalCleanJob *>(wrapper->synchronousJob())->init(project, products, options); wrapper->start(); } @@ -371,8 +365,8 @@ void InstallJob::install(const TopLevelProjectPtr &project, { if (!lockProject(project)) return; - InternalJobThreadWrapper *wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob()); - InternalInstallJob *installJob = qobject_cast<InternalInstallJob *>(wrapper->synchronousJob()); + auto wrapper = qobject_cast<InternalJobThreadWrapper *>(internalJob()); + auto installJob = qobject_cast<InternalInstallJob *>(wrapper->synchronousJob()); installJob->init(project, std::vector<ResolvedProductPtr>(products.cbegin(), products.cend()), options); diff --git a/src/lib/corelib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp index ebcc00b07..29fcbafa5 100644 --- a/src/lib/corelib/api/qmljsrewriter.cpp +++ b/src/lib/corelib/api/qmljsrewriter.cpp @@ -177,11 +177,11 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb if (cast<UiObjectDefinition*>(member)) lastObjectDef = iter; - else if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(member)) + else if (auto arrayBinding = cast<UiArrayBinding*>(member)) idx = propertyOrder.indexOf(toString(arrayBinding->qualifiedId)); - else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member)) + else if (auto objectBinding = cast<UiObjectBinding*>(member)) idx = propertyOrder.indexOf(toString(objectBinding->qualifiedId)); - else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member)) + else if (auto scriptBinding = cast<UiScriptBinding*>(member)) idx = propertyOrder.indexOf(toString(scriptBinding->qualifiedId)); else if (cast<UiPublicMember*>(member)) idx = propertyOrder.indexOf(QLatin1String("property")); @@ -210,11 +210,11 @@ UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *member if (cast<UiObjectDefinition*>(member)) lastObjectDef = iter; - else if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(member)) + else if (auto arrayBinding = cast<UiArrayBinding*>(member)) idx = propertyOrder.indexOf(toString(arrayBinding->qualifiedId)); - else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member)) + else if (auto objectBinding = cast<UiObjectBinding*>(member)) idx = propertyOrder.indexOf(toString(objectBinding->qualifiedId)); - else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member)) + else if (auto scriptBinding = cast<UiScriptBinding*>(member)) idx = propertyOrder.indexOf(toString(scriptBinding->qualifiedId)); else if (cast<UiPublicMember*>(member)) idx = propertyOrder.indexOf(QLatin1String("property")); @@ -241,13 +241,13 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb for (UiObjectMemberList *iter = members; iter; iter = iter->next) { UiObjectMember *member = iter->member; - if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(member)) + if (auto arrayBinding = cast<UiArrayBinding*>(member)) orderedMembers[toString(arrayBinding->qualifiedId)] = iter; - else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member)) + else if (auto objectBinding = cast<UiObjectBinding*>(member)) orderedMembers[toString(objectBinding->qualifiedId)] = iter; else if (cast<UiObjectDefinition*>(member)) orderedMembers[QString::null] = iter; - else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member)) + else if (auto scriptBinding = cast<UiScriptBinding*>(member)) orderedMembers[toString(scriptBinding->qualifiedId)] = iter; else if (cast<UiPublicMember*>(member)) orderedMembers[QLatin1String("property")] = iter; @@ -306,7 +306,7 @@ void Rewriter::changeBinding(UiObjectInitializer *ast, break; // for grouped properties: } else if (!prefix.isEmpty()) { - if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) { + if (auto def = cast<UiObjectDefinition *>(member)) { if (toString(def->qualifiedTypeNameId) == prefix) changeBinding(def->initializer, suffix, newValue, binding); } @@ -321,16 +321,16 @@ void Rewriter::replaceMemberValue(UiObjectMember *propertyMember, QString replacement = newValue; int startOffset = -1; int endOffset = -1; - if (UiObjectBinding *objectBinding = AST::cast<UiObjectBinding *>(propertyMember)) { + if (auto objectBinding = AST::cast<UiObjectBinding *>(propertyMember)) { startOffset = objectBinding->qualifiedTypeNameId->identifierToken.offset; endOffset = objectBinding->initializer->rbraceToken.end(); - } else if (UiScriptBinding *scriptBinding = AST::cast<UiScriptBinding *>(propertyMember)) { + } else if (auto scriptBinding = AST::cast<UiScriptBinding *>(propertyMember)) { startOffset = scriptBinding->statement->firstSourceLocation().offset; endOffset = scriptBinding->statement->lastSourceLocation().end(); - } else if (UiArrayBinding *arrayBinding = AST::cast<UiArrayBinding *>(propertyMember)) { + } else if (auto arrayBinding = AST::cast<UiArrayBinding *>(propertyMember)) { startOffset = arrayBinding->lbracketToken.offset; endOffset = arrayBinding->rbracketToken.end(); - } else if (UiPublicMember *publicMember = AST::cast<UiPublicMember*>(propertyMember)) { + } else if (auto publicMember = AST::cast<UiPublicMember*>(propertyMember)) { if (publicMember->statement) { startOffset = publicMember->statement->firstSourceLocation().offset; if (publicMember->semicolonToken.isValid()) @@ -357,13 +357,13 @@ void Rewriter::replaceMemberValue(UiObjectMember *propertyMember, bool Rewriter::isMatchingPropertyMember(const QString &propertyName, UiObjectMember *member) { - if (UiPublicMember *publicMember = cast<UiPublicMember*>(member)) + if (auto publicMember = cast<UiPublicMember*>(member)) return publicMember->name == propertyName; - else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(member)) + else if (auto objectBinding = cast<UiObjectBinding*>(member)) return toString(objectBinding->qualifiedId) == propertyName; - else if (UiScriptBinding *scriptBinding = cast<UiScriptBinding*>(member)) + else if (auto scriptBinding = cast<UiScriptBinding*>(member)) return toString(scriptBinding->qualifiedId) == propertyName; - else if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(member)) + else if (auto arrayBinding = cast<UiArrayBinding*>(member)) return toString(arrayBinding->qualifiedId) == propertyName; else return false; @@ -409,7 +409,7 @@ void Rewriter::removeBindingByName(UiObjectInitializer *ast, const QString &prop removeMember(member); // check for grouped properties: } else if (!prefix.isEmpty()) { - if (UiObjectDefinition *def = cast<UiObjectDefinition *>(member)) { + if (auto def = cast<UiObjectDefinition *>(member)) { if (toString(def->qualifiedTypeNameId) == prefix) removeGroupedProperty(def, propertyName); } @@ -680,10 +680,10 @@ void Rewriter::removeObjectMember(UiObjectMember *member, UiObjectMember *parent int start = member->firstSourceLocation().offset; int end = member->lastSourceLocation().end(); - if (UiArrayBinding *parentArray = cast<UiArrayBinding *>(parent)) { + if (auto parentArray = cast<UiArrayBinding *>(parent)) { extendToLeadingOrTrailingComma(parentArray, member, start, end); } else { - if (UiObjectDefinition *parentObjectDefinition = cast<UiObjectDefinition *>(parent)) + if (auto parentObjectDefinition = cast<UiObjectDefinition *>(parent)) includeEmptyGroupedProperty(parentObjectDefinition, member, start, end); includeSurroundingWhitespace(m_originalText, start, end); } diff --git a/src/lib/corelib/buildgraph/artifact.cpp b/src/lib/corelib/buildgraph/artifact.cpp index f46e24d78..e82919560 100644 --- a/src/lib/corelib/buildgraph/artifact.cpp +++ b/src/lib/corelib/buildgraph/artifact.cpp @@ -153,7 +153,7 @@ void Artifact::load(PersistentPool &pool) children.load(pool); // restore parents of the loaded children - for (NodeSet::const_iterator it = children.constBegin(); it != children.constEnd(); ++it) + for (auto it = children.constBegin(); it != children.constEnd(); ++it) (*it)->parents.insert(this); pool.load(childrenAddedByScanner); diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index d949cc831..27e28ce44 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -450,7 +450,7 @@ void connect(BuildGraphNode *p, BuildGraphNode *c) QBS_CHECK(p != c); qCDebug(lcBuildGraph).noquote() << "connect" << p->toString() << "->" << c->toString(); if (c->type() == BuildGraphNode::ArtifactNodeType) { - Artifact * const ac = static_cast<Artifact *>(c); + auto const ac = static_cast<Artifact *>(c); for (const Artifact *child : filterByType<Artifact>(p->children)) { if (child == ac) return; @@ -562,7 +562,7 @@ Artifact *lookupArtifact(const ResolvedProductConstPtr &product, it != lookupResults.constEnd(); ++it) { if ((*it)->fileType() != FileResourceBase::FileTypeArtifact) continue; - Artifact *artifact = static_cast<Artifact *>(*it); + auto artifact = static_cast<Artifact *>(*it); if (compareByName ? artifact->product->uniqueName() == product->uniqueName() : artifact->product == product) { @@ -749,7 +749,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, ? static_cast<Artifact *>(node) : nullptr; if (!artifact) { QBS_CHECK(node->type() == BuildGraphNode::RuleNodeType); - RuleNode * const ruleNode = static_cast<RuleNode *>(node); + auto const ruleNode = static_cast<RuleNode *>(node); QBS_CHECK(ruleNode->rule()); QBS_CHECK(ruleNode->rule()->product); QBS_CHECK(ruleNode->rule()->product == ruleNode->product.get()); diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 368fa6ccb..ce20391cd 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -247,7 +247,7 @@ void Executor::doBuild() for (const FileResourceBase * const file : files) { if (file->fileType() != FileResourceBase::FileTypeArtifact) continue; - const Artifact * const artifact = static_cast<const Artifact *>(file); + auto const artifact = static_cast<const Artifact *>(file); if (contains(m_productsToBuild, artifact->product.lock())) { m_tagsOfFilesToConsider.unite(artifact->fileTags()); m_productsOfFilesToConsider << artifact->product.lock(); @@ -327,7 +327,7 @@ void Executor::updateLeaves(BuildGraphNode *node, NodeSet &seenNodes) if (node->buildState == BuildGraphNode::Untouched) { node->buildState = BuildGraphNode::Buildable; if (node->type() == BuildGraphNode::ArtifactNodeType) { - Artifact * const artifact = static_cast<Artifact *>(node); + auto const artifact = static_cast<Artifact *>(node); if (artifact->artifactType == Artifact::SourceFile) retrieveSourceFileTimestamp(artifact); } @@ -1032,7 +1032,7 @@ void Executor::possiblyInstallArtifact(const Artifact *artifact) void Executor::onJobFinished(const qbs::ErrorInfo &err) { try { - ExecutorJob * const job = qobject_cast<ExecutorJob *>(sender()); + auto const job = qobject_cast<ExecutorJob *>(sender()); QBS_CHECK(job); if (m_evalContext->engine()->isActive()) { qCDebug(lcExec) << "Executor job finished while rule execution is pausing. " diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index d183b1879..7255a36ba 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -84,7 +84,7 @@ static void resolveDepencency(const RawScannedDependency &dependency, fileDependencyArtifact = static_cast<FileDependency *>(lookupResult); break; case FileResourceBase::FileTypeArtifact: { - Artifact * const foundArtifact = static_cast<Artifact *>(lookupResult); + auto const foundArtifact = static_cast<Artifact *>(lookupResult); if (foundArtifact->product == product) dependencyInProduct = foundArtifact; else @@ -277,8 +277,7 @@ resolved: if (artifactsToScan && resolvedDependency.file) { if (resolvedDependency.file->fileType() == FileResourceBase::FileTypeArtifact) { // Do not scan an artifact that is not built yet: Its contents might still change. - Artifact * const artifactDependency - = static_cast<Artifact *>(resolvedDependency.file); + auto const artifactDependency = static_cast<Artifact *>(resolvedDependency.file); if (artifactDependency->artifactType == Artifact::SourceFile || artifactDependency->buildState == BuildGraphNode::Built) { artifactsToScan->push_back(artifactDependency); diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index a658a331a..ccb6c5123 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -167,7 +167,7 @@ static void disconnectArtifactParents(Artifact *artifact) parent->children.remove(artifact); if (parent->type() != BuildGraphNode::ArtifactNodeType) continue; - Artifact * const parentArtifact = static_cast<Artifact *>(parent); + auto const parentArtifact = static_cast<Artifact *>(parent); QBS_CHECK(parentArtifact->transformer); parentArtifact->childrenAddedByScanner.remove(artifact); parentArtifact->transformer->inputs.remove(artifact); diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp index f7620dbf8..4bc005ccb 100644 --- a/src/lib/corelib/buildgraph/rulecommands.cpp +++ b/src/lib/corelib/buildgraph/rulecommands.cpp @@ -395,8 +395,7 @@ bool JavaScriptCommand::equals(const AbstractCommand *otherAbstractCommand) cons { if (!AbstractCommand::equals(otherAbstractCommand)) return false; - const JavaScriptCommand * const other - = static_cast<const JavaScriptCommand *>(otherAbstractCommand); + auto const other = static_cast<const JavaScriptCommand *>(otherAbstractCommand); return m_sourceCode == other->m_sourceCode; } diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index 4569b9955..0a067f6a4 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -227,7 +227,7 @@ AbstractCommandPtr Transformer::createCommandFromScriptValue(const QScriptValue if (cmdBase) cmdBase->fillFromScriptValue(&scriptValue, codeLocation); if (className == StringConstants::commandType()) { - ProcessCommand *procCmd = static_cast<ProcessCommand *>(cmdBase.get()); + auto procCmd = static_cast<ProcessCommand *>(cmdBase.get()); procCmd->clearRelevantEnvValues(); for (const QString &key : procCmd->relevantEnvVars()) procCmd->addRelevantEnvValue(key, product()->buildEnvironment.value(key)); diff --git a/src/lib/corelib/buildgraph/transformerchangetracking.cpp b/src/lib/corelib/buildgraph/transformerchangetracking.cpp index aa13f967f..551d2b1b1 100644 --- a/src/lib/corelib/buildgraph/transformerchangetracking.cpp +++ b/src/lib/corelib/buildgraph/transformerchangetracking.cpp @@ -231,7 +231,7 @@ const Artifact *TrafoChangeTracker::getArtifact(const QString &filePath, const Artifact *artifact = nullptr; for (const FileResourceBase * const candidate : candidates) { if (candidate->fileType() == FileResourceBase::FileTypeArtifact) { - const Artifact * const a = static_cast<const Artifact *>(candidate); + auto const a = static_cast<const Artifact *>(candidate); if (a->product.get() == product) { m_lastArtifact = artifact = a; break; diff --git a/src/lib/corelib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp index 347080906..dc84fbdaf 100644 --- a/src/lib/corelib/jsextensions/domxml.cpp +++ b/src/lib/corelib/jsextensions/domxml.cpp @@ -367,7 +367,7 @@ QScriptValue XmlDomNode::nextSibling(const QString &tagName) const QScriptValue XmlDomNode::appendChild(QScriptValue newChild) { - XmlDomNode *newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); + auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); if (!newNode) { context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); return QScriptValue(); @@ -377,13 +377,13 @@ QScriptValue XmlDomNode::appendChild(QScriptValue newChild) QScriptValue XmlDomNode::insertBefore(const QScriptValue &newChild, const QScriptValue &refChild) { - XmlDomNode *newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); + auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); if (!newNode) { context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); return QScriptValue(); } - XmlDomNode *refNode = qobject_cast<XmlDomNode*>(refChild.toQObject()); + auto refNode = qobject_cast<XmlDomNode*>(refChild.toQObject()); if (!refNode) { context()->throwError(QString::fromLatin1("Second argument is not a XmlDomNode object")); return QScriptValue(); @@ -394,13 +394,13 @@ QScriptValue XmlDomNode::insertBefore(const QScriptValue &newChild, const QScrip QScriptValue XmlDomNode::insertAfter(const QScriptValue &newChild, const QScriptValue &refChild) { - XmlDomNode *newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); + auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); if (!newNode) { context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); return QScriptValue(); } - XmlDomNode *refNode = qobject_cast<XmlDomNode*>(refChild.toQObject()); + auto refNode = qobject_cast<XmlDomNode*>(refChild.toQObject()); if (!refNode) { context()->throwError(QString::fromLatin1("Second argument is not a XmlDomNode object")); return QScriptValue(); @@ -411,13 +411,13 @@ QScriptValue XmlDomNode::insertAfter(const QScriptValue &newChild, const QScript QScriptValue XmlDomNode::replaceChild(const QScriptValue &newChild, const QScriptValue &oldChild) { - XmlDomNode *newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); + auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject()); if (!newNode) { context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); return QScriptValue(); } - XmlDomNode *oldNode = qobject_cast<XmlDomNode*>(oldChild.toQObject()); + auto oldNode = qobject_cast<XmlDomNode*>(oldChild.toQObject()); if (!oldNode) { context()->throwError(QString::fromLatin1("Second argument is not a XmlDomNode object")); return QScriptValue(); @@ -428,7 +428,7 @@ QScriptValue XmlDomNode::replaceChild(const QScriptValue &newChild, const QScrip QScriptValue XmlDomNode::removeChild(const QScriptValue &oldChild) { - XmlDomNode *oldNode = qobject_cast<XmlDomNode*>(oldChild.toQObject()); + auto oldNode = qobject_cast<XmlDomNode*>(oldChild.toQObject()); if (!oldNode) { context()->throwError(QString::fromLatin1("First argument is not a XmlDomNode object")); return QScriptValue(); diff --git a/src/lib/corelib/jsextensions/environmentextension.cpp b/src/lib/corelib/jsextensions/environmentextension.cpp index e40831f5d..22c4f069b 100644 --- a/src/lib/corelib/jsextensions/environmentextension.cpp +++ b/src/lib/corelib/jsextensions/environmentextension.cpp @@ -72,7 +72,7 @@ static QProcessEnvironment *getProcessEnvironment(QScriptContext *context, QScri const QString &func, bool doThrow = true) { QVariant v = engine->property(StringConstants::qbsProcEnvVarInternal()); - QProcessEnvironment *procenv = reinterpret_cast<QProcessEnvironment *>(v.value<void *>()); + auto procenv = reinterpret_cast<QProcessEnvironment *>(v.value<void *>()); if (!procenv && doThrow) throw context->throwError(QScriptContext::UnknownError, QStringLiteral("%1 can only be called from ").arg(func) + diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index 7607b3dc2..4deed3fd1 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -261,7 +261,7 @@ void ModuleProperties::init(QScriptValue artifactObject, const Artifact *artifac void ModuleProperties::setModuleScriptValue(QScriptValue targetObject, const QScriptValue &moduleObject, const QString &moduleName) { - ScriptEngine * const e = static_cast<ScriptEngine *>(targetObject.engine()); + auto const e = static_cast<ScriptEngine *>(targetObject.engine()); const QualifiedId name = QualifiedId::fromString(moduleName); QScriptValue obj = targetObject; for (int i = 0; i < name.size() - 1; ++i) { diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm index a7c7eb98d..75154d252 100644 --- a/src/lib/corelib/jsextensions/propertylist.mm +++ b/src/lib/corelib/jsextensions/propertylist.mm @@ -101,13 +101,13 @@ public: QScriptValue PropertyList::ctor(QScriptContext *context, QScriptEngine *engine) { - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + auto const se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); se->checkContext(QLatin1String("qbs.PropertyList"), dubiousContexts); - PropertyList *p = new PropertyList(context); + auto p = new PropertyList(context); QScriptValue obj = engine->newQObject(p, QScriptEngine::ScriptOwnership); return obj; } @@ -132,14 +132,14 @@ PropertyList::PropertyList(QScriptContext *context) bool PropertyList::isEmpty() const { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); return p->d->propertyListObject.isNull(); } void PropertyList::clear() { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); p->d->propertyListObject = QVariant(); p->d->propertyListFormat = 0; } @@ -147,7 +147,7 @@ void PropertyList::clear() void PropertyList::readFromObject(const QScriptValue &value) { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); p->d->propertyListObject = value.toVariant(); p->d->propertyListFormat = 0; // wasn't deserialized from any external format } @@ -160,7 +160,7 @@ void PropertyList::readFromString(const QString &input) void PropertyList::readFromFile(const QString &filePath) { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); QFile file(filePath); if (file.open(QIODevice::ReadOnly)) { @@ -177,14 +177,14 @@ void PropertyList::readFromFile(const QString &filePath) void PropertyList::readFromData(const QByteArray &data) { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); p->d->readFromData(p->context(), data); } void PropertyList::writeToFile(const QString &filePath, const QString &plistFormat) { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); QFile file(filePath); QByteArray data = p->d->writeToData(p->context(), plistFormat); @@ -200,7 +200,7 @@ void PropertyList::writeToFile(const QString &filePath, const QString &plistForm QScriptValue PropertyList::format() const { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); switch (p->d->propertyListFormat) { case QPropertyListOpenStepFormat: @@ -219,14 +219,14 @@ QScriptValue PropertyList::format() const QScriptValue PropertyList::toObject() const { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); return p->engine()->toScriptValue(p->d->propertyListObject); } QString PropertyList::toString(const QString &plistFormat) const { Q_ASSERT(thisObject().engine() == engine()); - PropertyList *p = qscriptvalue_cast<PropertyList*>(thisObject()); + auto p = qscriptvalue_cast<PropertyList*>(thisObject()); if (plistFormat == QLatin1String("binary1")) { p->context()->throwError(QLatin1String("Property list object cannot be converted to a " diff --git a/src/lib/corelib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp index e02720e3a..c4b747a0c 100644 --- a/src/lib/corelib/language/evaluator.cpp +++ b/src/lib/corelib/language/evaluator.cpp @@ -175,7 +175,7 @@ QScriptValue Evaluator::scriptValue(const Item *item) void Evaluator::onItemPropertyChanged(Item *item) { - EvaluationData *data = attachedPointer<EvaluationData>(m_scriptValueMap.value(item)); + auto data = attachedPointer<EvaluationData>(m_scriptValueMap.value(item)); if (data) data->valueCache.clear(); } diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index 6db308a7f..a5e23a131 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -381,7 +381,7 @@ QScriptClass::QueryFlags EvaluatorScriptClass::queryProperty(const QScriptValue if (debugProperties) qDebug() << "[SC] queryProperty " << object.objectId() << " " << name; - EvaluationData *const data = attachedPointer<EvaluationData>(object); + auto const data = attachedPointer<EvaluationData>(object); const QString nameString = name.toString(); if (nameString == QStringLiteral("parent")) { *id = QPTParentProperty; @@ -751,7 +751,7 @@ private: QScriptClassPropertyIterator *EvaluatorScriptClass::newIterator(const QScriptValue &object) { - EvaluationData *const data = attachedPointer<EvaluationData>(object); + auto const data = attachedPointer<EvaluationData>(object); return data ? new EvaluatorScriptClassPropertyIterator(object, data) : nullptr; } diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 9708d2ade..9646013f6 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -166,7 +166,7 @@ public: for (ProductContext * const rootProduct : rootProducts) traverse(rootProduct); if (m_sortedProducts.size() < allProducts.size()) { - for (auto * const product : qAsConst(allProducts)) { + for (auto const product : qAsConst(allProducts)) { QList<ModuleLoader::ProductContext *> path; findCycle(product, path); } @@ -201,7 +201,7 @@ private: throw error; } path << product; - for (auto * const dep : m_dependencyMap.value(product)) + for (auto const dep : m_dependencyMap.value(product)) findCycle(dep, path); path.removeLast(); } diff --git a/src/lib/corelib/tools/filetime.cpp b/src/lib/corelib/tools/filetime.cpp index 42f11b46b..263950d9c 100644 --- a/src/lib/corelib/tools/filetime.cpp +++ b/src/lib/corelib/tools/filetime.cpp @@ -93,8 +93,8 @@ FileTime::FileTime(const FileTime::InternalType &ft) : m_fileTime(ft) int FileTime::compare(const FileTime &other) const { #ifdef Q_OS_WIN - const FILETIME *const t1 = reinterpret_cast<const FILETIME *>(&m_fileTime); - const FILETIME *const t2 = reinterpret_cast<const FILETIME *>(&other.m_fileTime); + auto const t1 = reinterpret_cast<const FILETIME *>(&m_fileTime); + auto const t2 = reinterpret_cast<const FILETIME *>(&other.m_fileTime); return CompareFileTime(t1, t2); #elif HAS_CLOCK_GETTIME if (m_fileTime.tv_sec < other.m_fileTime.tv_sec) @@ -135,7 +135,7 @@ FileTime FileTime::currentTime() FileTime result; SYSTEMTIME st; GetSystemTime(&st); - FILETIME *const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); + auto const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); SystemTimeToFileTime(&st, ft); return result; #elif defined APPLE_CUSTOM_CLOCK_GETTIME @@ -168,7 +168,7 @@ FileTime FileTime::oldestTime() 0 }; FileTime result; - FILETIME *const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); + auto const ft = reinterpret_cast<FILETIME *>(&result.m_fileTime); SystemTimeToFileTime(&st, ft); return result; #elif HAS_CLOCK_GETTIME @@ -190,7 +190,7 @@ double FileTime::asDouble() const QString FileTime::toString() const { #ifdef Q_OS_WIN - const FILETIME *const ft = reinterpret_cast<const FILETIME *>(&m_fileTime); + auto const ft = reinterpret_cast<const FILETIME *>(&m_fileTime); SYSTEMTIME stUTC, stLocal; FileTimeToSystemTime(ft, &stUTC); SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal); diff --git a/src/lib/corelib/tools/qbspluginmanager.cpp b/src/lib/corelib/tools/qbspluginmanager.cpp index a8d22f458..d0be73891 100644 --- a/src/lib/corelib/tools/qbspluginmanager.cpp +++ b/src/lib/corelib/tools/qbspluginmanager.cpp @@ -80,8 +80,7 @@ QbsPluginManager::~QbsPluginManager() unloadStaticPlugins(); for (QLibrary * const lib : qAsConst(d->libs)) { - QbsPluginUnloadFunction unload = reinterpret_cast<QbsPluginUnloadFunction>( - lib->resolve("QbsPluginUnload")); + auto unload = reinterpret_cast<QbsPluginUnloadFunction>(lib->resolve("QbsPluginUnload")); if (unload) unload(); lib->unload(); @@ -146,8 +145,7 @@ void QbsPluginManager::loadPlugins(const std::vector<std::string> &pluginPaths, continue; } - QbsPluginLoadFunction load = reinterpret_cast<QbsPluginLoadFunction>( - lib->resolve("QbsPluginLoad")); + auto load = reinterpret_cast<QbsPluginLoadFunction>(lib->resolve("QbsPluginLoad")); if (load) { load(); qCDebug(lcPluginManager) << "plugin" << QDir::toNativeSeparators(fileName) |