diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-05-10 01:25:19 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-23 16:50:08 +0000 |
commit | 20149803a44856ea25063077964c1159b6d7a078 (patch) | |
tree | 4cd0b818e1fbe5861095d7acd516451322570bc6 /src/lib/corelib/tools/projectgeneratormanager.cpp | |
parent | 41595d0cf8ac00416a3a8a437eedde2715f75500 (diff) |
Replace QSharedPointer/QWeakPointer with std::shared_ptr/std::weak_ptr
Change-Id: I2915c578968bed425a8d8b617b56df88ed3f2882
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools/projectgeneratormanager.cpp')
-rw-r--r-- | src/lib/corelib/tools/projectgeneratormanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/corelib/tools/projectgeneratormanager.cpp b/src/lib/corelib/tools/projectgeneratormanager.cpp index a417be5e2..9d2e1ae7c 100644 --- a/src/lib/corelib/tools/projectgeneratormanager.cpp +++ b/src/lib/corelib/tools/projectgeneratormanager.cpp @@ -72,11 +72,11 @@ ProjectGeneratorManager *ProjectGeneratorManager::instance() ProjectGeneratorManager::ProjectGeneratorManager() { - std::vector<QSharedPointer<ProjectGenerator> > generators; - generators.push_back(QSharedPointer<ClangCompilationDatabaseGenerator>::create()); + std::vector<std::shared_ptr<ProjectGenerator> > generators; + generators.push_back(std::make_shared<ClangCompilationDatabaseGenerator>()); const auto vsGenerators = qbs::VisualStudioGenerator::createGeneratorList(); std::copy(vsGenerators.cbegin(), vsGenerators.cend(), std::back_inserter(generators)); - for (QSharedPointer<ProjectGenerator> generator : qAsConst(generators)) + for (const auto &generator : qAsConst(generators)) m_generators[generator->generatorName()] = generator; } @@ -85,7 +85,7 @@ QStringList ProjectGeneratorManager::loadedGeneratorNames() return instance()->m_generators.keys(); } -QSharedPointer<ProjectGenerator> ProjectGeneratorManager::findGenerator(const QString &generatorName) +std::shared_ptr<ProjectGenerator> ProjectGeneratorManager::findGenerator(const QString &generatorName) { return instance()->m_generators.value(generatorName); } |