aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2019-11-24 16:32:37 +0900
committerIvan Komissarov <ABBAPOH@gmail.com>2019-11-28 12:00:44 +0000
commit1e35c4520d5000783206d398cf3f12b2f86f8385 (patch)
treedd2951801ad028d7a68bfb11cc016a1e915f756d /tests
parent3ed09bb9f6dfac876c6d9f4917fcb32c3ea08635 (diff)
Apply 'modernize-make-unique' fix-it
Change-Id: I93783cfa3267f69237b0ad888d0747e4272cda0a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/buildgraph/tst_buildgraph.cpp10
-rw-r--r--tests/auto/shared.h2
2 files changed, 7 insertions, 5 deletions
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 <QtTest/qtest.h>
+#include <memory>
+
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<ProjectBuildData>();
}
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<ProductBuildData>();
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<ProductBuildData>();
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<ProductBuildData>();
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<qbs::Settings>;
inline SettingsPtr settings()
{
const QString settingsDir = QLatin1String(qgetenv("QBS_AUTOTEST_SETTINGS_DIR"));
- return SettingsPtr(new qbs::Settings(settingsDir));
+ return std::make_unique<qbs::Settings>(settingsDir);
}
inline QString profileName()