From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 27 May 2020 18:00:11 +0000 (+0200)
Subject: Add some more make_unique calls
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~183
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=00d20b03ac4681b1a20bcf95a2029c01186a2711;p=nextcloud-desktop.git

Add some more make_unique calls

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/.clang-tidy b/.clang-tidy
index 5d611df00..311e66d9e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,6 @@
 Checks: '-*,
     cppcoreguidelines-init-variables,
-    modernize-make-shared,
+    modernize-make-*,
     modernize-redundant-void-arg,
     modernize-replace-*,
     modernize-return-braced-init-list,
diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h
index 4a436569a..17889a1a7 100644
--- a/test/syncenginetestutils.h
+++ b/test/syncenginetestutils.h
@@ -17,6 +17,8 @@
 #include <QNetworkReply>
 #include <QMap>
 #include <QtTest>
+#include <memory>
+
 
 /*
  * TODO: In theory we should use QVERIFY instead of Q_ASSERT for testing, but this
@@ -895,8 +897,8 @@ public:
         _account->setCredentials(new FakeCredentials{_fakeQnam});
         _account->setDavDisplayName("fakename");
 
-        _journalDb.reset(new OCC::SyncJournalDb(localPath() + "._sync_test.db"));
-        _syncEngine.reset(new OCC::SyncEngine(_account, localPath(), "", _journalDb.get()));
+        _journalDb = std::make_unique<OCC::SyncJournalDb>(localPath() + "._sync_test.db");
+        _syncEngine = std::make_unique<OCC::SyncEngine>(_account, localPath(), "", _journalDb.get());
 
         // A new folder will update the local file state database on first sync.
         // To have a state matching what users will encounter, we have to a sync