From 1e35c4520d5000783206d398cf3f12b2f86f8385 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 24 Nov 2019 16:32:37 +0900 Subject: Apply 'modernize-make-unique' fix-it Change-Id: I93783cfa3267f69237b0ad888d0747e4272cda0a Reviewed-by: Christian Kandeler --- src/app/qbs/session.cpp | 2 +- src/lib/corelib/buildgraph/buildgraphloader.cpp | 3 ++- src/lib/corelib/buildgraph/projectbuilddata.cpp | 6 ++++-- src/lib/corelib/generators/xmlprojectwriter.cpp | 3 ++- src/lib/corelib/generators/xmlworkspacewriter.cpp | 3 ++- src/lib/corelib/language/language.cpp | 2 +- src/lib/corelib/language/moduleloader.cpp | 3 ++- src/lib/corelib/language/projectresolver.cpp | 3 ++- src/lib/corelib/tools/settingscreator.cpp | 5 +++-- src/lib/corelib/tools/settingsmodel.cpp | 4 ++-- src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp | 4 +++- .../generator/visualstudio/msbuild/items/msbuildfileitem.cpp | 4 +++- tests/auto/buildgraph/tst_buildgraph.cpp | 10 ++++++---- tests/auto/shared.h | 2 +- 14 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/app/qbs/session.cpp b/src/app/qbs/session.cpp index 30e71dfd5..ee9ee4cb3 100644 --- a/src/app/qbs/session.cpp +++ b/src/app/qbs/session.cpp @@ -258,7 +258,7 @@ void Session::setupProject(const QJsonObject &request) m_moduleProperties = modulePropertiesFromRequest(request); auto params = SetupProjectParameters::fromJson(request); const ProjectDataMode dataMode = dataModeFromRequest(request); - m_settings.reset(new Settings(params.settingsDirectory())); + m_settings = std::make_unique(params.settingsDirectory()); const Preferences prefs(m_settings.get()); const QString appDir = QDir::cleanPath(QCoreApplication::applicationDirPath()); params.setSearchPaths(prefs.searchPaths(appDir + QLatin1String( diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index bf6c30dcd..cad236db7 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -71,6 +71,7 @@ #include #include +#include #include namespace qbs { @@ -909,7 +910,7 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore if (!restoredProduct->buildData) return; if (!newlyResolvedProduct->buildData) - newlyResolvedProduct->buildData.reset(new ProductBuildData); + newlyResolvedProduct->buildData = std::make_unique(); qCDebug(lcBuildGraph) << "rescue data of product" << restoredProduct->uniqueName(); QBS_CHECK(newlyResolvedProduct->buildData); diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 31012e23e..0c7f7bfdc 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -60,6 +60,8 @@ #include #include +#include + namespace qbs { namespace Internal { @@ -276,7 +278,7 @@ void BuildDataResolver::resolveBuildData(const TopLevelProjectPtr &resolvedProje { QBS_CHECK(!resolvedProject->buildData); m_project = resolvedProject; - resolvedProject->buildData.reset(new ProjectBuildData); + resolvedProject->buildData = std::make_unique(); resolvedProject->buildData->evaluationContext = evalContext; const std::vector &allProducts = resolvedProject->allProducts(); evalContext->initializeObserver(Tr::tr("Setting up build graph for configuration %1") @@ -390,7 +392,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc evalContext()->checkForCancelation(); - product->buildData.reset(new ProductBuildData); + product->buildData = std::make_unique(); ArtifactSetByFileTag artifactsPerFileTag; for (const auto &dependency : qAsConst(product->dependencies)) { diff --git a/src/lib/corelib/generators/xmlprojectwriter.cpp b/src/lib/corelib/generators/xmlprojectwriter.cpp index 5554e5935..190e1304f 100644 --- a/src/lib/corelib/generators/xmlprojectwriter.cpp +++ b/src/lib/corelib/generators/xmlprojectwriter.cpp @@ -33,6 +33,7 @@ #include "xmlproperty.h" #include "xmlpropertygroup.h" +#include #include namespace qbs { @@ -42,7 +43,7 @@ namespace xml { ProjectWriter::ProjectWriter(std::ostream *device) : m_device(device) { - m_writer.reset(new QXmlStreamWriter(&m_buffer)); + m_writer = std::make_unique(&m_buffer); m_writer->setAutoFormatting(true); } diff --git a/src/lib/corelib/generators/xmlworkspacewriter.cpp b/src/lib/corelib/generators/xmlworkspacewriter.cpp index c88cb06d0..d21b63c42 100644 --- a/src/lib/corelib/generators/xmlworkspacewriter.cpp +++ b/src/lib/corelib/generators/xmlworkspacewriter.cpp @@ -33,6 +33,7 @@ #include "xmlworkspace.h" #include "xmlworkspacewriter.h" +#include #include namespace qbs { @@ -42,7 +43,7 @@ namespace xml { WorkspaceWriter::WorkspaceWriter(std::ostream *device) : m_device(device) { - m_writer.reset(new QXmlStreamWriter(&m_buffer)); + m_writer = std::make_unique(&m_buffer); m_writer->setAutoFormatting(true); } diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 53715fd57..8608e08c7 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -356,7 +356,7 @@ FileTags ResolvedProduct::fileTagsForFileName(const QString &fileName) const return result; } } else { - priority.reset(new int(tagger->priority())); + priority = std::make_unique(tagger->priority()); } result.unite(tagger->fileTags()); break; diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 5568febbd..1aeca0411 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -79,6 +79,7 @@ #include #include +#include #include namespace qbs { @@ -292,7 +293,7 @@ ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters ¶meters) = m_elapsedTimePropertyChecking = 0; m_elapsedTimeProbes = 0; m_probesEncountered = m_probesRun = m_probesCachedCurrent = m_probesCachedOld = 0; - m_settings.reset(new Settings(parameters.settingsDirectory())); + m_settings = std::make_unique(parameters.settingsDirectory()); const auto keys = m_parameters.overriddenValues().keys(); for (const QString &key : keys) { diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 868ad32af..6b678cb8f 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -71,6 +71,7 @@ #include #include +#include #include namespace qbs { @@ -810,7 +811,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont group->targetOfModule = moduleProp->value().toString(); ErrorInfo fileError; if (!patterns.empty()) { - group->wildcards = std::unique_ptr(new SourceWildCards); + group->wildcards = std::make_unique(); SourceWildCards *wildcards = group->wildcards.get(); wildcards->group = group.get(); wildcards->excludePatterns = m_evaluator->stringListValue( diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp index eaaf2802c..b7c727cd0 100644 --- a/src/lib/corelib/tools/settingscreator.cpp +++ b/src/lib/corelib/tools/settingscreator.cpp @@ -1,3 +1,4 @@ +#include #include /**************************************************************************** @@ -104,7 +105,7 @@ void SettingsCreator::migrate() // Adapt all paths in settings that point to the old location. At the time of this writing, // that's only preferences.qbsSearchPaths as written by libqtprofilesetup, but we don't want // to hardcode that here. - m_settings.reset(new QSettings(m_newSettingsFilePath, format())); + m_settings = std::make_unique(m_newSettingsFilePath, format()); const auto allKeys = m_settings->allKeys(); for (const QString &key : allKeys) { QVariant v = m_settings->value(key); @@ -136,7 +137,7 @@ void SettingsCreator::createQSettings() m_newSettingsDir = m_settingsBaseDir + QLatin1String("/qbs/") + m_qbsVersion.toString(); m_settingsFileName = fi.fileName(); m_newSettingsFilePath = m_newSettingsDir + QLatin1Char('/') + m_settingsFileName; - m_settings.reset(new QSettings(m_newSettingsFilePath, tmp->format())); + m_settings = std::make_unique(m_newSettingsFilePath, tmp->format()); } Version SettingsCreator::predecessor() const diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index d67f1da5c..7283e959c 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -125,7 +125,7 @@ public: SettingsModel::SettingsModel(const QString &settingsDir, Settings::Scope scope, QObject *parent) : QAbstractItemModel(parent), d(new SettingsModelPrivate) { - d->settings.reset(new qbs::Settings(settingsDir)); + d->settings = std::make_unique(settingsDir); d->settings->setScopeForWriting(scope); d->readSettings(); } @@ -155,7 +155,7 @@ void SettingsModel::updateSettingsDir(const QString &settingsDir) { const Settings::Scope scope = d->scope(); beginResetModel(); - d->settings.reset(new qbs::Settings(settingsDir)); + d->settings = std::make_unique(settingsDir); d->settings->setScopeForWriting(scope); d->readSettings(); endResetModel(); diff --git a/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp b/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp index 634bb2381..12fbe2da5 100644 --- a/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp +++ b/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp @@ -43,6 +43,8 @@ #include +#include + namespace qbs { static const QString kMSBuildSchemaURI = @@ -87,7 +89,7 @@ MSBuildProjectWriter::MSBuildProjectWriter(std::ostream *device) : d(new MSBuildProjectWriterPrivate) { d->device = device; - d->writer.reset(new QXmlStreamWriter(&d->buffer)); + d->writer = std::make_unique(&d->buffer); d->writer->setAutoFormatting(true); } diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp index 4ad7c725a..4cbb01d04 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp @@ -29,6 +29,8 @@ ****************************************************************************/ #include "msbuildfileitem.h" + +#include #include "../msbuilditemmetadata.h" namespace qbs { @@ -43,7 +45,7 @@ MSBuildFileItem::MSBuildFileItem(const QString &name, IMSBuildItemGroup *parent) : MSBuildItem(name, parent) , d(new MSBuildFileItemPrivate) { - d->filter.reset(new MSBuildItemMetadata(QStringLiteral("Filter"), QVariant())); + d->filter = std::make_unique(QStringLiteral("Filter"), QVariant()); } MSBuildFileItem::~MSBuildFileItem() = default; diff --git a/tests/auto/buildgraph/tst_buildgraph.cpp b/tests/auto/buildgraph/tst_buildgraph.cpp index 95314ad20..20f2cc6a5 100644 --- a/tests/auto/buildgraph/tst_buildgraph.cpp +++ b/tests/auto/buildgraph/tst_buildgraph.cpp @@ -51,6 +51,8 @@ #include +#include + using namespace qbs; using namespace qbs::Internal; @@ -58,7 +60,7 @@ const TopLevelProjectPtr project = TopLevelProject::create(); TestBuildGraph::TestBuildGraph(ILogSink *logSink) : m_logSink(logSink) { - project->buildData.reset(new ProjectBuildData); + project->buildData = std::make_unique(); } void TestBuildGraph::initTestCase() @@ -84,7 +86,7 @@ ResolvedProductConstPtr TestBuildGraph::productWithDirectCycle() { const ResolvedProductPtr product = ResolvedProduct::create(); product->project = project; - product->buildData.reset(new ProductBuildData); + product->buildData = std::make_unique(); const auto root = new Artifact; root->product = product; const auto child = new Artifact; @@ -101,7 +103,7 @@ ResolvedProductConstPtr TestBuildGraph::productWithLessDirectCycle() { const ResolvedProductPtr product = ResolvedProduct::create(); product->project = project; - product->buildData.reset(new ProductBuildData); + product->buildData = std::make_unique(); const auto root = new Artifact; const auto child = new Artifact; const auto grandchild = new Artifact; @@ -123,7 +125,7 @@ ResolvedProductConstPtr TestBuildGraph::productWithNoCycle() { const ResolvedProductPtr product = ResolvedProduct::create(); product->project = project; - product->buildData.reset(new ProductBuildData); + product->buildData = std::make_unique(); const auto root = new Artifact; const auto root2 = new Artifact; root->product = product; diff --git a/tests/auto/shared.h b/tests/auto/shared.h index 8f85f5d6c..e251d506c 100644 --- a/tests/auto/shared.h +++ b/tests/auto/shared.h @@ -83,7 +83,7 @@ using SettingsPtr = std::unique_ptr; inline SettingsPtr settings() { const QString settingsDir = QLatin1String(qgetenv("QBS_AUTOTEST_SETTINGS_DIR")); - return SettingsPtr(new qbs::Settings(settingsDir)); + return std::make_unique(settingsDir); } inline QString profileName() -- cgit v1.2.3