diff options
25 files changed, 46 insertions, 46 deletions
diff --git a/examples/collidingmice/main.cpp b/examples/collidingmice/main.cpp index e5a12300b..ac829caa9 100644 --- a/examples/collidingmice/main.cpp +++ b/examples/collidingmice/main.cpp @@ -76,7 +76,7 @@ int main(int argc, char **argv) //! [3] for (int i = 0; i < MouseCount; ++i) { - Mouse *mouse = new Mouse; + auto mouse = new Mouse; mouse->setPos(::sin((i * 6.28) / MouseCount) * 200, ::cos((i * 6.28) / MouseCount) * 200); scene.addItem(mouse); diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp index 2affa990b..dda1ed523 100644 --- a/src/app/config-ui/mainwindow.cpp +++ b/src/app/config-ui/mainwindow.cpp @@ -68,19 +68,19 @@ MainWindow::MainWindow(const QString &settingsDir, QWidget *parent) QMenu * const fileMenu = menuBar()->addMenu(tr("&File")); QMenu * const viewMenu = menuBar()->addMenu(tr("&View")); - QAction * const reloadAction = new QAction(tr("&Reload"), this); + const auto reloadAction = new QAction(tr("&Reload"), this); reloadAction->setShortcut(QKeySequence::Refresh); connect(reloadAction, &QAction::triggered, this, &MainWindow::reloadSettings); - QAction * const saveAction = new QAction(tr("&Save"), this); + const auto saveAction = new QAction(tr("&Save"), this); saveAction->setShortcut(QKeySequence::Save); connect(saveAction, &QAction::triggered, this, &MainWindow::saveSettings); - QAction * const expandAllAction = new QAction(tr("&Expand All"), this); + const auto expandAllAction = new QAction(tr("&Expand All"), this); expandAllAction->setShortcut(Qt::CTRL | Qt::Key_E); connect(expandAllAction, &QAction::triggered, this, &MainWindow::expandAll); - QAction * const collapseAllAction = new QAction(tr("C&ollapse All"), this); + const auto collapseAllAction = new QAction(tr("C&ollapse All"), this); collapseAllAction->setShortcut(Qt::CTRL | Qt::Key_O); connect(collapseAllAction, &QAction::triggered, this, &MainWindow::collapseAll); - QAction * const exitAction = new QAction(tr("E&xit"), this); + const auto exitAction = new QAction(tr("E&xit"), this); exitAction->setShortcut(QKeySequence::Quit); exitAction->setMenuRole(QAction::QuitRole); connect(exitAction, &QAction::triggered, this, &MainWindow::exit); diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index 2a2731331..8c0718c32 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -378,7 +378,7 @@ void InternalBuildJob::build(const TopLevelProjectPtr &project, m_executor->setBuildOptions(buildOptions); m_executor->setProgressObserver(observer()); - QThread * const executorThread = new QThread(this); + auto executorThread = new QThread(this); m_executor->moveToThread(executorThread); connect(m_executor, &Executor::reportCommandDescription, this, &BuildGraphTouchingJob::reportCommandDescription); diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp index 3ab2bbba6..cfd64c2eb 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -148,7 +148,7 @@ BuildJob *ProjectPrivate::buildProducts(const QList<ResolvedProductPtr> &product if (needsDepencencyResolving) addDependencies(productsToBuild); - BuildJob * const job = new BuildJob(logger, jobOwner); + auto job = new BuildJob(logger, jobOwner); job->build(internalProject, productsToBuild, options); QBS_ASSERT(job->state() == AbstractJob::StateRunning,); return job; @@ -157,7 +157,7 @@ BuildJob *ProjectPrivate::buildProducts(const QList<ResolvedProductPtr> &product CleanJob *ProjectPrivate::cleanProducts(const QList<ResolvedProductPtr> &products, const CleanOptions &options, QObject *jobOwner) { - CleanJob * const job = new CleanJob(logger, jobOwner); + auto job = new CleanJob(logger, jobOwner); job->clean(internalProject, products, options); QBS_ASSERT(job->state() == AbstractJob::StateRunning,); return job; @@ -169,7 +169,7 @@ InstallJob *ProjectPrivate::installProducts(const QList<ResolvedProductPtr> &pro QList<ResolvedProductPtr> productsToInstall = products; if (needsDepencencyResolving) addDependencies(productsToInstall); - InstallJob * const job = new InstallJob(logger, jobOwner); + auto job = new InstallJob(logger, jobOwner); job->install(internalProject, productsToInstall, options); QBS_ASSERT(job->state() == AbstractJob::StateRunning,); return job; @@ -917,7 +917,7 @@ SetupProjectJob *Project::setupProject(const SetupProjectParameters ¶meters, ILogSink *logSink, QObject *jobOwner) { Logger logger(logSink); - SetupProjectJob * const job = new SetupProjectJob(logger, jobOwner); + auto job = new SetupProjectJob(logger, jobOwner); try { loadPlugins(parameters.pluginPaths(), logger); job->resolve(*this, parameters); diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index 0b54e6d3a..332c3e2cd 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -531,7 +531,7 @@ Artifact *lookupArtifact(const ResolvedProductConstPtr &product, const Artifact Artifact *createArtifact(const ResolvedProductPtr &product, const SourceArtifactConstPtr &sourceArtifact) { - Artifact *artifact = new Artifact; + auto artifact = new Artifact; artifact->artifactType = Artifact::SourceFile; artifact->targetOfModule = sourceArtifact->targetOfModule; artifact->setFilePath(sourceArtifact->absoluteFilePath); diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index fd2a22116..e23ef4dbb 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -712,7 +712,7 @@ void Executor::addExecutorJobs() qCDebug(lcExec) << "preparing executor for" << m_buildOptions.maxJobCount() << "jobs in parallel"; for (int i = 1; i <= m_buildOptions.maxJobCount(); i++) { - ExecutorJob *job = new ExecutorJob(m_logger, this); + auto job = new ExecutorJob(m_logger, this); job->setMainThreadScriptEngine(m_evalContext->engine()); job->setObjectName(QString::fromLatin1("J%1").arg(i)); job->setDryRun(m_buildOptions.dryRun()); diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index 177d1dfc8..8e2e9172b 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -187,7 +187,7 @@ Set<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifac if (!cache.valid) { cache.valid = true; for (ScannerPlugin *scanner : ScannerPluginManager::scannersForFileTag(fileTag)) { - PluginDependencyScanner *pluginScanner = new PluginDependencyScanner(scanner); + auto pluginScanner = new PluginDependencyScanner(scanner); cache.scanners.push_back(DependencyScannerPtr(pluginScanner)); } for (const ResolvedScannerConstPtr &scanner : qAsConst(product->scanners)) { diff --git a/src/lib/corelib/jsextensions/temporarydir.cpp b/src/lib/corelib/jsextensions/temporarydir.cpp index 0c4c05694..4d955f86e 100644 --- a/src/lib/corelib/jsextensions/temporarydir.cpp +++ b/src/lib/corelib/jsextensions/temporarydir.cpp @@ -84,7 +84,7 @@ QScriptValue TemporaryDir::ctor(QScriptContext *context, QScriptEngine *engine) }); se->checkContext(QLatin1String("qbs.TemporaryDir"), dubiousContexts); - TemporaryDir *t = new TemporaryDir(context); + auto t = new TemporaryDir(context); QScriptValue obj = engine->newQObject(t, QScriptEngine::ScriptOwnership); return obj; } diff --git a/src/lib/corelib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp index 264dfd4fc..80988b087 100644 --- a/src/lib/corelib/language/evaluator.cpp +++ b/src/lib/corelib/language/evaluator.cpp @@ -166,7 +166,7 @@ QScriptValue Evaluator::scriptValue(const Item *item) return scriptValue; } - EvaluationData *edata = new EvaluationData; + auto edata = new EvaluationData; edata->evaluator = this; edata->item = item; edata->item->setObserver(this); diff --git a/src/lib/corelib/language/itempool.cpp b/src/lib/corelib/language/itempool.cpp index 5b72f6073..9be3b900b 100644 --- a/src/lib/corelib/language/itempool.cpp +++ b/src/lib/corelib/language/itempool.cpp @@ -55,7 +55,7 @@ ItemPool::~ItemPool() Item *ItemPool::allocateItem(const ItemType &type) { - Item *item = new (&m_pool) Item(this, type); + auto item = new (&m_pool) Item(this, type); m_items.push_back(item); return item; } diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 35d0636b6..ada27d1ff 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -560,7 +560,7 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, TopLevelProjectContext *topLevelProjectContext, Item *projectItem, const Set<QString> &referencedFilePaths) { - auto *p = new ProjectContext; + auto p = new ProjectContext; auto &projectContext = *p; projectContext.topLevelProject = topLevelProjectContext; projectContext.result = loadResult; @@ -2327,7 +2327,7 @@ Item *ModuleLoader::moduleInstanceItem(Item *containerItem, const QualifiedId &m } else { const ItemType itemType = i < moduleName.size() - 1 ? ItemType::ModulePrefix : ItemType::ModuleInstance; - Item *newItem = Item::create(m_pool, itemType); + auto newItem = Item::create(m_pool, itemType); instance->setProperty(moduleNameSegment, ItemValue::create(newItem)); instance = newItem; } diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index 0a79df87e..0d22a9a56 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -124,7 +124,7 @@ public: static QStringList parseCommandLine(const QString &commandLine) { QStringList list; - wchar_t *buf = new wchar_t[commandLine.size() + 1]; + auto buf = new wchar_t[commandLine.size() + 1]; buf[commandLine.toWCharArray(buf)] = 0; int argCount = 0; LPWSTR *args = CommandLineToArgvW(buf, &argCount); diff --git a/src/lib/corelib/tools/persistence.h b/src/lib/corelib/tools/persistence.h index 8ed31394b..552db98be 100644 --- a/src/lib/corelib/tools/persistence.h +++ b/src/lib/corelib/tools/persistence.h @@ -165,7 +165,7 @@ template <typename T> inline T *PersistentPool::idLoad() for (; i < m_loadedRaw.size(); ++i) m_loadedRaw[i] = nullptr; - T * const t = new T; + auto t = new T; m_loadedRaw[id] = t; t->load(*this); return t; diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index 3918db6ce..bb98c3512 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -164,7 +164,7 @@ void SettingsModel::addNewKey(const QModelIndex &parent) Node *parentNode = d->indexToNode(parent); if (!parentNode) return; - Node * const newNode = new Node; + auto newNode = new Node; newNode->parent = parentNode; newNode->name = parentNode->uniqueChildName(); beginInsertRows(parent, parentNode->children.size(), parentNode->children.size()); @@ -337,7 +337,7 @@ void SettingsModel::SettingsModelPrivate::readSettings() static Node *createNode(Node *parentNode, const QString &name) { - Node * const node = new Node; + auto node = new Node; node->name = name; node->parent = parentNode; parentNode->children.push_back(node); diff --git a/src/libexec/qbs_processlauncher/launchersockethandler.cpp b/src/libexec/qbs_processlauncher/launchersockethandler.cpp index cd43f67d6..9fb7d4655 100644 --- a/src/libexec/qbs_processlauncher/launchersockethandler.cpp +++ b/src/libexec/qbs_processlauncher/launchersockethandler.cpp @@ -272,7 +272,7 @@ void LauncherSocketHandler::sendPacket(const LauncherPacket &packet) Process *LauncherSocketHandler::setupProcess(quintptr token) { - Process * const p = new Process(token, this); + const auto p = new Process(token, this); connect(p, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), this, &LauncherSocketHandler::handleProcessError); connect(p, static_cast<void (QProcess::*)(int)>(&QProcess::finished), diff --git a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp index c93ca3386..4dde9ac78 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp @@ -72,7 +72,7 @@ MSBuildQbsProductProject::MSBuildQbsProductProject( globalsPropertyGroup()->appendProperty(QStringLiteral("QbsProductName"), product.name()); - MSBuildImport *cppDefaultProps = new MSBuildImport(this); + auto cppDefaultProps = new MSBuildImport(this); cppDefaultProps->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.Default.props")); for (int i = 0; i < count; ++i) { @@ -83,7 +83,7 @@ MSBuildQbsProductProject::MSBuildQbsProductProject( project.commandLines.values().at(i)); } - MSBuildImport *cppProps = new MSBuildImport(this); + auto cppProps = new MSBuildImport(this); cppProps->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.props")); for (int i = 0; i < count; ++i) diff --git a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp index d8389817f..63cee32bf 100644 --- a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp @@ -106,7 +106,7 @@ MSBuildSharedSolutionPropertiesProject::MSBuildSharedSolutionPropertiesProject( setDefaultTargets(QStringLiteral("Build")); setToolsVersion(versionInfo.toolsVersion()); - MSBuildPropertyGroup *group = new MSBuildPropertyGroup(this); + auto group = new MSBuildPropertyGroup(this); group->setLabel(QStringLiteral("UserMacros")); // Order's important here... a variable must be listed before one that uses it diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index 95c1fbcdf..b2c77a036 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -545,7 +545,7 @@ public: Header *h = (Header *)raw; h->tag = JsonDocument::BinaryFormatTag; h->version = 1; - Data *d = new Data(raw, size); + auto d = new Data(raw, size); d->compactionCounter = (b == header->root()) ? compactionCounter : 0; return d; } @@ -3347,7 +3347,7 @@ JsonDocument JsonDocument::fromRawData(const char *data, int size, DataValidatio return JsonDocument(); } - Internal::Data *d = new Internal::Data((char *)data, size); + auto d = new Internal::Data((char *)data, size); d->ownsData = false; if (validation != BypassValidation && !d->valid()) { @@ -3405,7 +3405,7 @@ JsonDocument JsonDocument::fromBinaryData(const std::string &data, DataValidatio return JsonDocument(); memcpy(raw, data.data(), size); - Internal::Data *d = new Internal::Data(raw, size); + auto d = new Internal::Data(raw, size); if (validation != BypassValidation && !d->valid()) { delete d; @@ -4046,7 +4046,7 @@ JsonDocument Parser::parse(JsonParseError *error) error->offset = 0; error->error = JsonParseError::NoError; } - Data *d = new Data(data, current); + auto d = new Data(data, current); return JsonDocument(d); } diff --git a/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp b/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp index 2c6db4403..d6568d77c 100644 --- a/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp +++ b/tests/auto/blackbox/testdata-qt/dbus-adaptors/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) scene.setSceneRect(-500, -500, 1000, 1000); scene.setItemIndexMethod(QGraphicsScene::NoIndex); - Car *car = new Car(); + auto car = new Car(); scene.addItem(car); QGraphicsView view(&scene); diff --git a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp index 3bb9efa5a..94b288440 100644 --- a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp +++ b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/after/main.cpp @@ -41,7 +41,7 @@ public: int main(int argc, char **argv) { QCoreApplication app(argc, argv); - MyObject *obj = new MyObject(&app); + auto obj = new MyObject(&app); return app.exec(); } diff --git a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp index 14a23f67b..0d216e970 100644 --- a/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp +++ b/tests/auto/blackbox/testdata-qt/trackAddMocInclude/before/main.cpp @@ -41,7 +41,7 @@ public: int main(int argc, char **argv) { QCoreApplication app(argc, argv); - MyObject *obj = new MyObject(&app); + auto obj = new MyObject(&app); return app.exec(); } diff --git a/tests/auto/blackbox/testdata/enableRtti/main.cpp b/tests/auto/blackbox/testdata/enableRtti/main.cpp index 6301561b3..b7faa3d6b 100644 --- a/tests/auto/blackbox/testdata/enableRtti/main.cpp +++ b/tests/auto/blackbox/testdata/enableRtti/main.cpp @@ -47,7 +47,7 @@ class B : public I { }; int main() { - I *a = new A(); + auto a = new A(); B *b = dynamic_cast<B *>(a); (void)b; delete a; diff --git a/tests/auto/buildgraph/tst_buildgraph.cpp b/tests/auto/buildgraph/tst_buildgraph.cpp index 04d32c1fd..b83e30c3f 100644 --- a/tests/auto/buildgraph/tst_buildgraph.cpp +++ b/tests/auto/buildgraph/tst_buildgraph.cpp @@ -85,9 +85,9 @@ ResolvedProductConstPtr TestBuildGraph::productWithDirectCycle() const ResolvedProductPtr product = ResolvedProduct::create(); product->project = project; product->buildData.reset(new ProductBuildData); - Artifact * const root = new Artifact; + auto root = new Artifact; root->product = product; - Artifact * const child = new Artifact; + auto child = new Artifact; child->product = product; product->buildData->roots.insert(root); product->buildData->nodes << root << child; @@ -101,9 +101,9 @@ ResolvedProductConstPtr TestBuildGraph::productWithLessDirectCycle() const ResolvedProductPtr product = ResolvedProduct::create(); product->project = project; product->buildData.reset(new ProductBuildData); - Artifact * const root = new Artifact; - Artifact * const child = new Artifact; - Artifact * const grandchild = new Artifact; + auto root = new Artifact; + auto child = new Artifact; + auto grandchild = new Artifact; root->product = product; child->product = product; grandchild->product = product; @@ -121,8 +121,8 @@ ResolvedProductConstPtr TestBuildGraph::productWithNoCycle() const ResolvedProductPtr product = ResolvedProduct::create(); product->project = project; product->buildData.reset(new ProductBuildData); - Artifact * const root = new Artifact; - Artifact * const root2 = new Artifact; + auto root = new Artifact; + auto root2 = new Artifact; root->product = product; root2->product = product; product->buildData->roots << root << root2; diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 0eb466188..8b11b35d2 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -1326,7 +1326,7 @@ public: { JSSourceValuePtr value = JSSourceValue::create(); value->setFile(m_fileContext); - QString *str = new QString(sourceCode); + auto str = new QString(sourceCode); m_strings.push_back(str); value->setSourceCode(QStringRef(str)); return value; diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp index 71af06aaa..44f4303e3 100644 --- a/tests/auto/tools/tst_tools.cpp +++ b/tests/auto/tools/tst_tools.cpp @@ -317,7 +317,7 @@ void TestTools::testSettingsMigration_data() QString TestTools::setupSettingsDir1() { - QTemporaryDir * const baseDir = new QTemporaryDir; + auto baseDir = new QTemporaryDir; m_tmpDirs.push_back(baseDir); const Version thisVersion = Version::fromString(QBS_VERSION); @@ -360,7 +360,7 @@ QString TestTools::setupSettingsDir1() QString TestTools::setupSettingsDir2() { - QTemporaryDir * const baseDir = new QTemporaryDir; + auto baseDir = new QTemporaryDir; m_tmpDirs.push_back(baseDir); const QString settingsDir = baseDir->path(); QSettings s(settingsDir + QLatin1String("/qbs.conf"), @@ -376,7 +376,7 @@ QString TestTools::setupSettingsDir2() QString TestTools::setupSettingsDir3() { - auto * const baseDir = new QTemporaryDir; + auto baseDir = new QTemporaryDir; m_tmpDirs.push_back(baseDir); return baseDir->path(); } |