Replace QScopedPointer with std::unique_ptr

Now only one unique pointer class is used.

Change-Id: Ic03106d02614f14b120a316c1fbbf27c8caec8f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

21 files changed, 48 insertions, 30 deletions

diff --git a/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp b/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp
index e18618fcd..c5684e5ba 100644
--- a/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp
+++ b/src/plugins/generator/visualstudio/io/msbuildprojectwriter.cpp
@@ -53,7 +53,7 @@ class MSBuildProjectWriterPrivate : public IMSBuildNodeVisitor
 public:
     std::ostream *device;
     QByteArray buffer;
-    QScopedPointer<QXmlStreamWriter> writer;
+    std::unique_ptr<QXmlStreamWriter> writer;
 
     void visitStart(const MSBuildImport *import) override;
     void visitEnd(const MSBuildImport *import) override;
diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h b/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h
index 4d2436e52..b57011e13 100644
--- a/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h
+++ b/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.h
@@ -32,7 +32,8 @@
 #define IMSBUILDGROUP_H
 
 #include <QtCore/qobject.h>
-#include <QtCore/qscopedpointer.h>
+
+#include <memory>
 
 namespace qbs {
 
@@ -50,7 +51,7 @@ public:
     void setCondition(const QString &condition);
 
 private:
-    QScopedPointer<IMSBuildGroupPrivate> d;
+    std::unique_ptr<IMSBuildGroupPrivate> d;
 };
 
 class IMSBuildItemGroup : public IMSBuildGroup
diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h b/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h
index a1a7676e6..a6032c729 100644
--- a/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h
+++ b/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.h
@@ -32,9 +32,10 @@
 #define IMSBUILDPROPERTY_H
 
 #include <QtCore/qobject.h>
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qvariant.h>
 
+#include <memory>
+
 namespace qbs {
 
 class IMSBuildPropertyPrivate;
@@ -58,7 +59,7 @@ public:
     void setValue(const QVariant &value);
 
 private:
-    QScopedPointer<IMSBuildPropertyPrivate> d;
+    std::unique_ptr<IMSBuildPropertyPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp
index bce7488b4..26c08cacb 100644
--- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp
+++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp
@@ -36,7 +36,7 @@ namespace qbs {
 class MSBuildFileItemPrivate
 {
 public:
-    QScopedPointer<MSBuildItemMetadata> filter;
+    std::unique_ptr<MSBuildItemMetadata> filter;
 };
 
 MSBuildFileItem::MSBuildFileItem(const QString &name, IMSBuildItemGroup *parent)
diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h
index d6e4d485b..820fc7f42 100644
--- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h
+++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.h
@@ -52,7 +52,7 @@ protected:
     explicit MSBuildFileItem(const QString &name, IMSBuildItemGroup *parent = 0);
 
 private:
-    QScopedPointer<MSBuildFileItemPrivate> d;
+    std::unique_ptr<MSBuildFileItemPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h b/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h
index 344783a1e..a47b1a85c 100644
--- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h
+++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.h
@@ -60,7 +60,7 @@ public:
     void setSourceControlFiles(bool sourceControlFiles);
 
 private:
-    QScopedPointer<MSBuildFilterPrivate> d;
+    std::unique_ptr<MSBuildFilterPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildimport.h b/src/plugins/generator/visualstudio/msbuild/msbuildimport.h
index 352616e1b..a6e4c4488 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuildimport.h
+++ b/src/plugins/generator/visualstudio/msbuild/msbuildimport.h
@@ -33,6 +33,8 @@
 #include <QtCore/qobject.h>
 #include "imsbuildnode.h"
 
+#include <memory>
+
 namespace qbs {
 
 class MSBuildImportGroup;
@@ -62,7 +64,7 @@ public:
     void accept(IMSBuildNodeVisitor *visitor) const;
 
 private:
-    QScopedPointer<MSBuildImportPrivate> d;
+    std::unique_ptr<MSBuildImportPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h b/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h
index c2f0b8fc7..ec306886a 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h
+++ b/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.h
@@ -58,7 +58,7 @@ public:
     void accept(IMSBuildNodeVisitor *visitor) const;
 
 private:
-    QScopedPointer<MSBuildImportGroupPrivate> d;
+    std::unique_ptr<MSBuildImportGroupPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditem.h b/src/plugins/generator/visualstudio/msbuild/msbuilditem.h
index ca411c715..ee4b53888 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuilditem.h
+++ b/src/plugins/generator/visualstudio/msbuild/msbuilditem.h
@@ -34,6 +34,8 @@
 #include <QtCore/qobject.h>
 #include "imsbuildnode.h"
 
+#include <memory>
+
 namespace qbs {
 
 class IMSBuildItemGroup;
@@ -64,7 +66,7 @@ public:
     void accept(IMSBuildNodeVisitor *visitor) const;
 
 private:
-    QScopedPointer<MSBuildItemPrivate> d;
+    std::unique_ptr<MSBuildItemPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp
index 7a9bd122b..c4e80ecc7 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp
+++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp
@@ -33,6 +33,8 @@
 #include "imsbuildnodevisitor.h"
 #include "msbuilditem.h"
 
+#include <memory>
+
 namespace qbs {
 
 class MSBuildItemGroupPrivate
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h
index 02ac6b082..74ce4168c 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h
+++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.h
@@ -34,6 +34,8 @@
 #include "imsbuildgroup.h"
 #include "imsbuildnode.h"
 
+#include <memory>
+
 namespace qbs {
 
 class MSBuildProject;
@@ -58,7 +60,7 @@ public:
     void accept(IMSBuildNodeVisitor *visitor) const;
 
 private:
-    QScopedPointer<MSBuildItemGroupPrivate> d;
+    std::unique_ptr<MSBuildItemGroupPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildproject.h b/src/plugins/generator/visualstudio/msbuild/msbuildproject.h
index fc1a0f1f4..00e28bcf8 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuildproject.h
+++ b/src/plugins/generator/visualstudio/msbuild/msbuildproject.h
@@ -34,6 +34,8 @@
 #include <QtCore/qobject.h>
 #include "imsbuildnode.h"
 
+#include <memory>
+
 namespace qbs {
 
 class MSBuildProjectPrivate;
@@ -60,7 +62,7 @@ public:
     void accept(IMSBuildNodeVisitor *visitor) const;
 
 private:
-    QScopedPointer<MSBuildProjectPrivate> d;
+    std::unique_ptr<MSBuildProjectPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h b/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h
index 33fa07b3e..6617a4a59 100644
--- a/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h
+++ b/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.h
@@ -60,7 +60,7 @@ public:
     void accept(IMSBuildNodeVisitor *visitor) const;
 
 private:
-    QScopedPointer<MSBuildPropertyGroupPrivate> d;
+    std::unique_ptr<MSBuildPropertyGroupPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuildtargetproject.h b/src/plugins/generator/visualstudio/msbuildtargetproject.h
index 13d890d72..bf7e9f65f 100644
--- a/src/plugins/generator/visualstudio/msbuildtargetproject.h
+++ b/src/plugins/generator/visualstudio/msbuildtargetproject.h
@@ -65,7 +65,7 @@ public:
     void appendPropertySheet(const QString &path, bool optional = false);
 
 private:
-    QScopedPointer<MSBuildTargetProjectPrivate> d;
+    std::unique_ptr<MSBuildTargetProjectPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h b/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h
index 17de66e73..fecb3f244 100644
--- a/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h
+++ b/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.h
@@ -32,10 +32,11 @@
 #define IVISUALSTUDIOSOLUTIONPROJECT_H
 
 #include <QtCore/qobject.h>
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/quuid.h>
 
+#include <memory>
+
 namespace qbs {
 
 class IVisualStudioSolutionProjectPrivate;
@@ -58,7 +59,7 @@ public:
     void setName(const QString &name);
 
 private:
-    QScopedPointer<IVisualStudioSolutionProjectPrivate> d;
+    std::unique_ptr<IVisualStudioSolutionProjectPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolution.h b/src/plugins/generator/visualstudio/solution/visualstudiosolution.h
index 16f06f9e9..072bdd8f1 100644
--- a/src/plugins/generator/visualstudio/solution/visualstudiosolution.h
+++ b/src/plugins/generator/visualstudio/solution/visualstudiosolution.h
@@ -32,7 +32,8 @@
 #define VISUALSTUDIOSOLUTION_H
 
 #include <QtCore/qobject.h>
-#include <QtCore/qscopedpointer.h>
+
+#include <memory>
 
 namespace qbs {
 
@@ -76,7 +77,7 @@ public:
 private:
     void addDefaultGlobalSections();
 
-    QScopedPointer<VisualStudioSolutionPrivate> d;
+    std::unique_ptr<VisualStudioSolutionPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h b/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h
index fafafa494..7d2677e97 100644
--- a/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h
+++ b/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.h
@@ -34,6 +34,8 @@
 #include <QtCore/qobject.h>
 #include "ivisualstudiosolutionproject.h"
 
+#include <memory>
+
 namespace qbs {
 
 class VisualStudioSolutionFileProjectPrivate;
@@ -53,7 +55,7 @@ public:
     QUuid projectTypeGuid() const override;
 
 private:
-    QScopedPointer<VisualStudioSolutionFileProjectPrivate> d;
+    std::unique_ptr<VisualStudioSolutionFileProjectPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h b/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h
index dd821fce0..6bcaa517e 100644
--- a/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h
+++ b/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.h
@@ -32,7 +32,8 @@
 #define VISUALSTUDIOSOLUTIONGLOBALSECTION_H
 
 #include <QtCore/qobject.h>
-#include <QtCore/qscopedpointer.h>
+
+#include <memory>
 
 namespace qbs {
 
@@ -56,7 +57,7 @@ public:
     void appendProperty(const QString &key, const QString &value);
 
 private:
-    QScopedPointer<VisualStudioSolutionGlobalSectionPrivate> d;
+    std::unique_ptr<VisualStudioSolutionGlobalSectionPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.h b/src/plugins/generator/visualstudio/visualstudiogenerator.h
index 8e120d5cc..898ae0b9c 100644
--- a/src/plugins/generator/visualstudio/visualstudiogenerator.h
+++ b/src/plugins/generator/visualstudio/visualstudiogenerator.h
@@ -72,7 +72,7 @@ private:
     void addPropertySheets(const GeneratableProject &project);
     void addPropertySheets(const std::shared_ptr<MSBuildTargetProject> &targetProject);
 
-    QScopedPointer<VisualStudioGeneratorPrivate> d;
+    std::unique_ptr<VisualStudioGeneratorPrivate> d;
 };
 
 } // namespace qbs
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp
index 2d652b9e2..a29b00e78 100644
--- a/src/plugins/scanner/cpp/cppscanner.cpp
+++ b/src/plugins/scanner/cpp/cppscanner.cpp
@@ -58,10 +58,10 @@ using namespace CPlusPlus;
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qstring.h>
 
 #include <cstring>
+#include <memory>
 
 struct ScanResult
 {
@@ -203,7 +203,7 @@ static void scanCppFile(void *opaq, CPlusPlus::Lexer &yylex, bool scanForFileTag
 
 static void *openScanner(const unsigned short *filePath, const char *fileTags, int flags)
 {
-    QScopedPointer<Opaq> opaque(new Opaq);
+    std::unique_ptr<Opaq> opaque(new Opaq);
     opaque->fileName = QString::fromUtf16(filePath);
     const int fileTagsLength = static_cast<int>(std::strlen(fileTags));
     const QList<QByteArray> &tagList = QByteArray::fromRawData(fileTags, fileTagsLength).split(',');
@@ -249,8 +249,8 @@ static void *openScanner(const unsigned short *filePath, const char *fileTags, i
 
     opaque->fileContent = reinterpret_cast<char *>(vmap);
     CPlusPlus::Lexer lex(opaque->fileContent, opaque->fileContent + mapl);
-    scanCppFile(opaque.data(), lex, flags & ScanForFileTagsFlag, flags & ScanForDependenciesFlag);
-    return opaque.take();
+    scanCppFile(opaque.get(), lex, flags & ScanForFileTagsFlag, flags & ScanForDependenciesFlag);
+    return opaque.release();
 }
 
 static void closeScanner(void *ptr)
diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp
index 408a65220..04de23fe6 100644
--- a/src/plugins/scanner/qt/qtscanner.cpp
+++ b/src/plugins/scanner/qt/qtscanner.cpp
@@ -60,10 +60,11 @@
 #include <QtCore/qfile.h>
 #endif
 
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qxmlstream.h>
 
+#include <memory>
+
 struct OpaqQrc
 {
 #ifdef Q_OS_UNIX
@@ -104,7 +105,7 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags
 {
     Q_UNUSED(flags);
     Q_UNUSED(fileTags);
-    QScopedPointer<OpaqQrc> opaque(new OpaqQrc);
+    std::unique_ptr<OpaqQrc> opaque(new OpaqQrc);
 
 #ifdef Q_OS_UNIX
     QString filePathS = QString::fromUtf16(filePath);
@@ -136,7 +137,7 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags
     opaque->map = reinterpret_cast<char *>(map);
     opaque->xml = new QXmlStreamReader(opaque->map);
 
-    return static_cast<void *>(opaque.take());
+    return static_cast<void *>(opaque.release());
 }
 
 static void closeScannerQrc(void *ptr)