diff options
25 files changed, 62 insertions, 62 deletions
diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp index 836f2539b..2affa990b 100644 --- a/src/app/config-ui/mainwindow.cpp +++ b/src/app/config-ui/mainwindow.cpp @@ -180,7 +180,7 @@ extern "C" void qt_macos_forceTransformProcessToForegroundApplicationAndActivate bool MainWindow::eventFilter(QObject *watched, QEvent *event) { if (ui->treeView->hasFocus() && event->type() == QEvent::KeyPress) { - QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event); + const auto keyEvent = static_cast<const QKeyEvent *>(event); if (keyEvent->matches(QKeySequence::Delete)) { const QModelIndexList indexes = ui->treeView->selectionModel()->selectedRows(); if (indexes.size() == 1) { diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 2fe477418..feb69b207 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -125,7 +125,7 @@ void CommandLineParser::printHelp() const QTextStream stream(stdout); Q_ASSERT(d->command == d->commandPool.getCommand(HelpCommandType)); - const HelpCommand * const helpCommand = static_cast<HelpCommand *>(d->command); + const auto helpCommand = static_cast<const HelpCommand *>(d->command); if (helpCommand->commandToDescribe().isEmpty()) { stream << "Qbs " QBS_VERSION ", a cross-platform build tool.\n"; stream << d->generalHelp(); diff --git a/src/lib/corelib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp index 85c0d2399..82c10e1a6 100644 --- a/src/lib/corelib/api/jobs.cpp +++ b/src/lib/corelib/api/jobs.cpp @@ -308,7 +308,7 @@ BuildJob::BuildJob(const Logger &logger, QObject *parent) { connect(&LauncherInterface::instance(), &LauncherInterface::errorOccurred, this, &BuildJob::handleLauncherError); - InternalBuildJob *job = static_cast<InternalBuildJob *>(internalJob()); + auto job = static_cast<InternalBuildJob *>(internalJob()); connect(job, &BuildGraphTouchingJob::reportCommandDescription, this, &BuildJob::reportCommandDescription); connect(job, &BuildGraphTouchingJob::reportProcessResult, diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp index 8d5a704eb..836aa6abe 100644 --- a/src/lib/corelib/api/projectfileupdater.cpp +++ b/src/lib/corelib/api/projectfileupdater.cpp @@ -333,12 +333,12 @@ void ProjectFileFilesAdder::doApply(QString &fileContent, UiProgram *ast) QString filesRepresentation; if (filesBinding->statement->kind != QbsQmlJS::AST::Node::Kind_ExpressionStatement) throw ErrorInfo(Tr::tr("JavaScript construct in source file is too complex.")); // TODO: rename, add new and concat. - const ExpressionStatement * const exprStatement - = static_cast<ExpressionStatement *>(filesBinding->statement); + const auto exprStatement + = static_cast<const ExpressionStatement *>(filesBinding->statement); switch (exprStatement->expression->kind) { case QbsQmlJS::AST::Node::Kind_ArrayLiteral: { - const ElementList *elem - = static_cast<ArrayLiteral *>(exprStatement->expression)->elements; + const auto elem + = static_cast<const ArrayLiteral *>(exprStatement->expression)->elements; QStringList oldFileReprs; while (elem) { oldFileReprs << getNodeRepresentation(fileContent, elem->expression); @@ -359,8 +359,8 @@ void ProjectFileFilesAdder::doApply(QString &fileContent, UiProgram *ast) break; } case QbsQmlJS::AST::Node::Kind_StringLiteral: { - const QString existingElement - = static_cast<StringLiteral *>(exprStatement->expression)->value.toString(); + const auto existingElement + = static_cast<const StringLiteral *>(exprStatement->expression)->value.toString(); sortedFiles << existingElement; sortedFiles.sort(); addToFilesRepr(filesRepresentation, sortedFiles, arrayElemIndentation); @@ -447,20 +447,20 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast) const int bindingIndentation = itemIndentation + 4; const int arrayElemIndentation = bindingIndentation + 4; - const ExpressionStatement * const exprStatement - = static_cast<ExpressionStatement *>(bindingFinder.binding()->statement); + const auto exprStatement + = static_cast<const ExpressionStatement *>(bindingFinder.binding()->statement); switch (exprStatement->expression->kind) { case QbsQmlJS::AST::Node::Kind_ArrayLiteral: { QStringList filesToRemove = m_files; QStringList newFilesList; - const ElementList *elem = static_cast<ArrayLiteral *>(exprStatement->expression)->elements; + const auto elem = static_cast<const ArrayLiteral *>(exprStatement->expression)->elements; while (elem) { if (elem->expression->kind != QbsQmlJS::AST::Node::Kind_StringLiteral) { throw ErrorInfo(Tr::tr("JavaScript construct in source file is too complex."), bindingLocation); } - const QString existingFile - = static_cast<StringLiteral *>(elem->expression)->value.toString(); + const auto existingFile + = static_cast<const StringLiteral *>(elem->expression)->value.toString(); if (!filesToRemove.removeOne(existingFile)) newFilesList << existingFile; elem = elem->next; @@ -485,8 +485,8 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast) throw ErrorInfo(Tr::tr("Was requested to remove %1 files, but there is only " "one in the list.").arg(m_files.size()), bindingLocation); } - const QString existingFile - = static_cast<StringLiteral *>(exprStatement->expression)->value.toString(); + const auto existingFile + = static_cast<const StringLiteral *>(exprStatement->expression)->value.toString(); if (existingFile != m_files.front()) { throw ErrorInfo(Tr::tr("File '%1' could not be found in the 'files' list.") .arg(m_files.front()), bindingLocation); diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index a906a5fa9..df9a234da 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -280,11 +280,11 @@ static void updateProductAndRulePointers(const ResolvedProductPtr &newProduct) return RuleConstPtr(); }; if (node->type() == BuildGraphNode::RuleNodeType) { - RuleNode * const ruleNode = static_cast<RuleNode *>(node); + const auto ruleNode = static_cast<RuleNode *>(node); ruleNode->setRule(findNewRule(ruleNode->rule())); } else { QBS_CHECK(node->type() == BuildGraphNode::ArtifactNodeType); - Artifact * const artifact = static_cast<Artifact *>(node); + const auto artifact = static_cast<const Artifact *>(node); if (artifact->artifactType == Artifact::Generated) { QBS_CHECK(artifact->transformer); artifact->transformer->rule = findNewRule(artifact->transformer->rule); @@ -760,7 +760,7 @@ void BuildGraphLoader::onProductRemoved(const ResolvedProductPtr &product, if (product->buildData) { for (BuildGraphNode * const node : qAsConst(product->buildData->nodes)) { if (node->type() == BuildGraphNode::ArtifactNodeType) { - Artifact * const artifact = static_cast<Artifact *>(node); + const auto artifact = static_cast<Artifact *>(node); projectBuildData->removeArtifact(artifact, m_logger, removeArtifactsFromDisk, false); if (removeArtifactsFromDisk && artifact->artifactType == Artifact::Generated) diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 9b14af579..890e85abd 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -1141,7 +1141,7 @@ void Executor::setupForBuildingSelectedFiles(const BuildGraphNode *node) return; if (!m_productsOfFilesToConsider.contains(node->product.lock())) return; - const RuleNode * const ruleNode = static_cast<const RuleNode *>(node); + const auto ruleNode = static_cast<const RuleNode *>(node); const Rule * const rule = ruleNode->rule().get(); if (rule->inputs.intersects(m_tagsOfFilesToConsider)) { FileTags otherInputs = rule->auxiliaryInputs; diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 7c99f7f44..cb247d6ef 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -226,7 +226,7 @@ static void removeFromRuleNodes(Artifact *artifact) for (BuildGraphNode *n : qAsConst(product->buildData->nodes)) { if (n->type() != BuildGraphNode::RuleNodeType) continue; - RuleNode * const ruleNode = static_cast<RuleNode *>(n); + const auto ruleNode = static_cast<RuleNode *>(n); qCDebug(lcBuildGraph) << "remove old input" << artifact->filePath() << "from rule" << ruleNode->rule()->toString(); ruleNode->removeOldInputArtifact(artifact); diff --git a/src/lib/corelib/buildgraph/qtmocscanner.cpp b/src/lib/corelib/buildgraph/qtmocscanner.cpp index 5eb7e619c..0f247ba52 100644 --- a/src/lib/corelib/buildgraph/qtmocscanner.cpp +++ b/src/lib/corelib/buildgraph/qtmocscanner.cpp @@ -103,7 +103,7 @@ QtMocScanner::QtMocScanner(const ResolvedProductPtr &product, QScriptValue targe , m_cppScanner(nullptr) , m_hppScanner(nullptr) { - ScriptEngine *engine = static_cast<ScriptEngine *>(targetScriptValue.engine()); + const auto engine = static_cast<ScriptEngine *>(targetScriptValue.engine()); QScriptValue scannerObj = engine->newObject(); targetScriptValue.setProperty(qtMocScannerJsName(), scannerObj); QScriptValue applyFunction = engine->newFunction(&js_apply, this); diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp index 8f740f34d..5b180dd3d 100644 --- a/src/lib/corelib/buildgraph/rulecommands.cpp +++ b/src/lib/corelib/buildgraph/rulecommands.cpp @@ -263,7 +263,7 @@ bool ProcessCommand::equals(const AbstractCommand *otherAbstractCommand) const { if (!AbstractCommand::equals(otherAbstractCommand)) return false; - const ProcessCommand * const other = static_cast<const ProcessCommand *>(otherAbstractCommand); + const auto other = static_cast<const ProcessCommand *>(otherAbstractCommand); return m_program == other->m_program && m_arguments == other->m_arguments && m_workingDir == other->m_workingDir diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index 9c7178c17..96dcf1a05 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -167,7 +167,7 @@ ResolvedProductPtr Transformer::product() const void Transformer::setupInputs(QScriptValue targetScriptValue, const ArtifactSet &inputs, const QString &defaultModuleName) { - ScriptEngine *const scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine()); + const auto scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine()); QScriptValue scriptValue = translateInOutputs(scriptEngine, inputs, defaultModuleName); targetScriptValue.setProperty(StringConstants::inputsVar(), scriptValue); QScriptValue inputScriptValue; @@ -188,7 +188,7 @@ void Transformer::setupInputs(QScriptValue targetScriptValue) void Transformer::setupOutputs(QScriptValue targetScriptValue) { - ScriptEngine * const scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine()); + const auto scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine()); const QString &defaultModuleName = rule->module->name; QScriptValue scriptValue = translateInOutputs(scriptEngine, outputs, defaultModuleName); targetScriptValue.setProperty(StringConstants::outputsVar(), scriptValue); @@ -205,7 +205,7 @@ void Transformer::setupOutputs(QScriptValue targetScriptValue) void Transformer::setupExplicitlyDependsOn(QScriptValue targetScriptValue) { - ScriptEngine * const scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine()); + const auto scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine()); QScriptValue scriptValue = translateInOutputs(scriptEngine, explicitlyDependsOn, rule->module->name); targetScriptValue.setProperty(StringConstants::explicitlyDependsOnVar(), scriptValue); diff --git a/src/lib/corelib/jsextensions/binaryfile.cpp b/src/lib/corelib/jsextensions/binaryfile.cpp index c5fae1101..6ccd073cf 100644 --- a/src/lib/corelib/jsextensions/binaryfile.cpp +++ b/src/lib/corelib/jsextensions/binaryfile.cpp @@ -121,7 +121,7 @@ QScriptValue BinaryFile::ctor(QScriptContext *context, QScriptEngine *engine) return context->throwError(Tr::tr("BinaryFile constructor takes at most two parameters.")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); se->addResourceAcquiringScriptObject(t); const DubiousContextList dubiousContexts { DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) diff --git a/src/lib/corelib/jsextensions/file.cpp b/src/lib/corelib/jsextensions/file.cpp index e59798563..4c7514c09 100644 --- a/src/lib/corelib/jsextensions/file.cpp +++ b/src/lib/corelib/jsextensions/file.cpp @@ -131,7 +131,7 @@ QScriptValue File::js_copy(QScriptContext *context, QScriptEngine *engine) Tr::tr("copy expects 2 arguments")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation), DubiousContext(EvalContext::RuleExecution, DubiousContext::SuggestMoving) @@ -155,7 +155,7 @@ QScriptValue File::js_exists(QScriptContext *context, QScriptEngine *engine) } const QString filePath = context->argument(0).toString(); const bool exists = FileInfo::exists(filePath); - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); se->addFileExistsResult(filePath, exists); return exists; } @@ -168,14 +168,14 @@ QScriptValue File::js_directoryEntries(QScriptContext *context, QScriptEngine *e Tr::tr("directoryEntries expects 2 arguments")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); se->checkContext(QLatin1String("File.directoryEntries()"), dubiousContexts); const QString path = context->argument(0).toString(); - const QDir::Filters filters = static_cast<QDir::Filters>(context->argument(1).toUInt32()); + const auto filters = static_cast<QDir::Filters>(context->argument(1).toUInt32()); QDir dir(path); const QStringList entries = dir.entryList(filters, QDir::Name); se->addDirectoryEntriesResult(path, filters, entries); @@ -190,7 +190,7 @@ QScriptValue File::js_remove(QScriptContext *context, QScriptEngine *engine) Tr::tr("remove expects 1 argument")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) }); se->checkContext(QLatin1String("File.remove()"), dubiousContexts); @@ -211,7 +211,7 @@ QScriptValue File::js_lastModified(QScriptContext *context, QScriptEngine *engin } const QString filePath = context->argument(0).toString(); const FileTime timestamp = FileInfo(filePath).lastModified(); - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); se->addFileLastModifiedResult(filePath, timestamp); return timestamp.asDouble(); } @@ -224,7 +224,7 @@ QScriptValue File::js_makePath(QScriptContext *context, QScriptEngine *engine) Tr::tr("makePath expects 1 argument")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) }); se->checkContext(QLatin1String("File.makePath()"), dubiousContexts); @@ -239,7 +239,7 @@ QScriptValue File::js_move(QScriptContext *context, QScriptEngine *engine) Tr::tr("move expects 2 arguments")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) }); se->checkContext(QLatin1String("File.move()"), dubiousContexts); diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index 394f3ccbb..d726dc7e6 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -169,7 +169,7 @@ void ModuleProperties::init(QScriptValue objectWithProperties, const void *ptr, void ModuleProperties::setupModules(QScriptValue &object, const ResolvedProduct *product, const Artifact *artifact) { - ScriptEngine *engine = static_cast<ScriptEngine *>(object.engine()); + const auto engine = static_cast<ScriptEngine *>(object.engine()); QScriptClass *modulePropertyScriptClass = engine->modulePropertyScriptClass(); if (!modulePropertyScriptClass) { modulePropertyScriptClass = new ModulePropertyScriptClass(engine); @@ -241,7 +241,7 @@ QScriptValue ModuleProperties::moduleProperty(QScriptContext *context, QScriptEn QLatin1String("Internal error: invalid type")); } - ScriptEngine * const qbsEngine = static_cast<ScriptEngine *>(engine); + const auto qbsEngine = static_cast<ScriptEngine *>(engine); const QString moduleName = context->argument(0).toString(); const QString propertyName = context->argument(1).toString(); return getModuleProperty(properties, artifact, qbsEngine, moduleName, propertyName); diff --git a/src/lib/corelib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp index b38c10aad..bffeeaea2 100644 --- a/src/lib/corelib/jsextensions/process.cpp +++ b/src/lib/corelib/jsextensions/process.cpp @@ -127,7 +127,7 @@ QScriptValue Process::ctor(QScriptContext *context, QScriptEngine *engine) return context->throwError(QLatin1String("Process()")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); se->addResourceAcquiringScriptObject(t); const DubiousContextList dubiousContexts ({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) diff --git a/src/lib/corelib/jsextensions/temporarydir.cpp b/src/lib/corelib/jsextensions/temporarydir.cpp index e54ac1f1a..0c4c05694 100644 --- a/src/lib/corelib/jsextensions/temporarydir.cpp +++ b/src/lib/corelib/jsextensions/temporarydir.cpp @@ -78,7 +78,7 @@ QBS_JSEXTENSION_REGISTER(TemporaryDir, &initializeJsExtensionTemporaryDir) QScriptValue TemporaryDir::ctor(QScriptContext *context, QScriptEngine *engine) { - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) }); diff --git a/src/lib/corelib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp index 57c928d86..ccadd131e 100644 --- a/src/lib/corelib/jsextensions/textfile.cpp +++ b/src/lib/corelib/jsextensions/textfile.cpp @@ -131,7 +131,7 @@ QScriptValue TextFile::ctor(QScriptContext *context, QScriptEngine *engine) return context->throwError(Tr::tr("TextFile constructor takes at most three parameters.")); } - ScriptEngine * const se = static_cast<ScriptEngine *>(engine); + const auto se = static_cast<ScriptEngine *>(engine); se->addResourceAcquiringScriptObject(t); const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving) diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index e632a705c..608d918f1 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -412,7 +412,7 @@ void EvaluatorScriptClass::collectValuesFromNextChain(const EvaluationData *data for (ValuePtr next = value; next; next = next->next()) { QScriptValue v = data->evaluator->property(next->definingItem(), propertyName); - ScriptEngine * const se = static_cast<ScriptEngine *>(engine()); + const auto se = static_cast<const ScriptEngine *>(engine()); if (se->hasErrorOrException(v)) { *result = se->lastErrorValue(v); return; @@ -592,7 +592,7 @@ QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QS m_queryResult.itemOfProperty = nullptr; QBS_ASSERT(data, return QScriptValue()); - const QueryPropertyType qpt = static_cast<QueryPropertyType>(id); + const auto qpt = static_cast<QueryPropertyType>(id); if (qpt == QPTParentProperty) { return data->item->parent() ? data->evaluator->scriptValue(data->item->parent()) diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 5fd011eee..7f8dbde0e 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -1436,7 +1436,7 @@ static void mergeProperty(Item *dst, const QString &name, const ValuePtr &value) QBS_CHECK(baseValue->type() == Value::JSSourceValueType); const JSSourceValuePtr jsBaseValue = std::static_pointer_cast<JSSourceValue>( baseValue->clone()); - JSSourceValue *jsValue = static_cast<JSSourceValue *>(value.get()); + const auto jsValue = static_cast<JSSourceValue *>(value.get()); jsValue->setBaseValue(jsBaseValue); } } diff --git a/src/lib/corelib/language/modulemerger.cpp b/src/lib/corelib/language/modulemerger.cpp index 13cd5eeab..af9f94c5c 100644 --- a/src/lib/corelib/language/modulemerger.cpp +++ b/src/lib/corelib/language/modulemerger.cpp @@ -72,7 +72,7 @@ void ModuleMerger::replaceItemInValues(QualifiedId moduleName, Item *containerIt Value * const val = it.value().get(); QBS_CHECK(val); QBS_CHECK(val->type() == Value::ItemValueType); - ItemValue * const itemVal = static_cast<ItemValue *>(val); + const auto itemVal = static_cast<ItemValue *>(val); if (moduleName.empty()) { QBS_CHECK(itemVal->item() == toReplace); itemVal->setItem(m_mergedModule.item); diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp index 63b376208..eac65018e 100644 --- a/src/lib/corelib/language/scriptengine.cpp +++ b/src/lib/corelib/language/scriptengine.cpp @@ -329,7 +329,7 @@ void ScriptEngine::unobserveProperties() static QScriptValue js_deprecatedGet(QScriptContext *context, QScriptEngine *qtengine) { - ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine); + const auto engine = static_cast<const ScriptEngine *>(qtengine); const QScriptValue data = context->callee().property(getterFuncHelperProperty()); engine->logger().qbsWarning() << ScriptEngine::tr("Property %1 is deprecated. Please use %2 instead.").arg( @@ -423,7 +423,7 @@ QScriptValue ScriptEngine::js_loadExtension(QScriptContext *context, QScriptEngi "an extension name.")); } - ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine); + const auto engine = static_cast<const ScriptEngine *>(qtengine); ErrorInfo deprWarning(Tr::tr("The loadExtension() function is deprecated and will be " "removed in a future version of Qbs. Use require() " "instead."), context->backtrace()); @@ -439,7 +439,7 @@ QScriptValue ScriptEngine::js_loadFile(QScriptContext *context, QScriptEngine *q ScriptEngine::tr("The loadFile function requires a file path.")); } - ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine); + const auto engine = static_cast<const ScriptEngine *>(qtengine); ErrorInfo deprWarning(Tr::tr("The loadFile() function is deprecated and will be " "removed in a future version of Qbs. Use require() " "instead."), context->backtrace()); @@ -450,7 +450,7 @@ QScriptValue ScriptEngine::js_loadFile(QScriptContext *context, QScriptEngine *q QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qtengine) { - ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine); + const auto engine = static_cast<ScriptEngine *>(qtengine); if (context->argumentCount() < 1) { return context->throwError( ScriptEngine::tr("The require function requires a module name or path.")); diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp index 2dc7ab30a..624d4b024 100644 --- a/src/lib/corelib/tools/persistence.cpp +++ b/src/lib/corelib/tools/persistence.cpp @@ -131,7 +131,7 @@ void PersistentPool::finalizeWriteStream() m_stream << QByteArray(QBS_PERSISTENCE_MAGIC); if (m_stream.status() != QDataStream::Ok) throw ErrorInfo(Tr::tr("Failure serializing build graph.")); - QFile * const file = static_cast<QFile *>(m_stream.device()); + const auto file = static_cast<QFile *>(m_stream.device()); if (!file->flush()) { file->close(); file->remove(); diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index 73f8bd6b0..f59b557f8 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -310,7 +310,7 @@ QModelIndex SettingsModel::index(int row, int column, const QModelIndex &parent) QModelIndex SettingsModel::parent(const QModelIndex &child) const { - Node * const childNode = static_cast<Node *>(child.internalPointer()); + const auto childNode = static_cast<const Node *>(child.internalPointer()); Q_ASSERT(childNode); Node * const parentNode = childNode->parent; if (parentNode == &d->rootNode) diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 739b863de..f03156fb5 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -143,7 +143,7 @@ static void scanCppFile(void *opaq, CPlusPlus::Lexer &yylex, bool scanForFileTag const QLatin1Literal qgadgetLiteral("Q_GADGET"); const QLatin1Literal qnamespaceLiteral("Q_NAMESPACE"); const QLatin1Literal pluginMetaDataLiteral("Q_PLUGIN_METADATA"); - Opaq *opaque = static_cast<Opaq *>(opaq); + const auto opaque = static_cast<Opaq *>(opaq); const TokenComparator tc(opaque->fileContent); Token tk; Token oldTk; @@ -255,13 +255,13 @@ static void *openScanner(const unsigned short *filePath, const char *fileTags, i static void closeScanner(void *ptr) { - Opaq *opaque = static_cast<Opaq *>(ptr); + const auto opaque = static_cast<Opaq *>(ptr); delete opaque; } static const char *next(void *opaq, int *size, int *flags) { - Opaq *opaque = static_cast<Opaq*>(opaq); + const auto opaque = static_cast<Opaq*>(opaq); if (opaque->currentResultIndex < opaque->includedFiles.size()) { const ScanResult &result = opaque->includedFiles.at(opaque->currentResultIndex); ++opaque->currentResultIndex; @@ -281,7 +281,7 @@ static const char **additionalFileTags(void *opaq, int *size) static const char *thMocPluginHpp[] = { "moc_hpp_plugin" }; static const char *thMocPluginCpp[] = { "moc_cpp_plugin" }; - Opaq *opaque = static_cast<Opaq*>(opaq); + const auto opaque = static_cast<const Opaq*>(opaq); if (opaque->hasQObjectMacro) { *size = 1; switch (opaque->fileType) { diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp index 10947e61c..5a790efc1 100644 --- a/src/plugins/scanner/qt/qtscanner.cpp +++ b/src/plugins/scanner/qt/qtscanner.cpp @@ -142,13 +142,13 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags static void closeScannerQrc(void *ptr) { - OpaqQrc *opaque = static_cast<OpaqQrc *>(ptr); + const auto opaque = static_cast<OpaqQrc *>(ptr); delete opaque; } static const char *nextQrc(void *opaq, int *size, int *flags) { - OpaqQrc *o= static_cast<OpaqQrc *>(opaq); + const auto o = static_cast<OpaqQrc *>(opaq); while (!o->xml->atEnd()) { o->xml->readNext(); switch (o->xml->tokenType()) { diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index c84eb560c..95c1fbcdf 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -4621,11 +4621,11 @@ void Data::compact() Base *base = header->root(); int reserve = 0; if (base->is_object) { - Object *o = static_cast<Object *>(base); + const auto o = static_cast<Object *>(base); for (int i = 0; i < (int)o->length; ++i) reserve += o->entryAt(i)->usedStorage(o); } else { - Array *a = static_cast<Array *>(base); + const auto a = static_cast<Array *>(base); for (int i = 0; i < (int)a->length; ++i) reserve += (*a)[i].usedStorage(a); } @@ -4643,8 +4643,8 @@ void Data::compact() int offset = sizeof(Base); if (b->is_object) { - Object *o = static_cast<Object *>(base); - Object *no = static_cast<Object *>(b); + const auto o = static_cast<const Object *>(base); + const auto no = static_cast<const Object *>(b); for (int i = 0; i < (int)o->length; ++i) { no->table()[i] = offset; @@ -4662,8 +4662,8 @@ void Data::compact() } } } else { - Array *a = static_cast<Array *>(base); - Array *na = static_cast<Array *>(b); + const auto a = static_cast<Array *>(base); + const auto na = static_cast<Array *>(b); for (int i = 0; i < (int)a->length; ++i) { const Value &v = (*a)[i]; |