16 files changed, 35 insertions, 27 deletions
diff --git a/src/lib/corelib/loader/groupshandler.cpp b/src/lib/corelib/loader/groupshandler.cpp
index dd183eb16..04970a9a3 100644
--- a/src/lib/corelib/loader/groupshandler.cpp
+++ b/src/lib/corelib/loader/groupshandler.cpp
@@ -80,8 +80,8 @@ public:
 
 GroupsHandler::GroupsHandler(const SetupProjectParameters &parameters,
                              ModuleInstantiator &instantiator, Evaluator &evaluator, Logger &logger)
-    : d(new Private(parameters, instantiator, evaluator, logger)) {}
-GroupsHandler::~GroupsHandler() { delete d; }
+    : d(makePimpl<Private>(parameters, instantiator, evaluator, logger)) {}
+GroupsHandler::~GroupsHandler() = default;
 
 void GroupsHandler::setupGroups(Item *product, Item *productScope)
 {
diff --git a/src/lib/corelib/loader/groupshandler.h b/src/lib/corelib/loader/groupshandler.h
index 3f787903f..6680596f7 100644
--- a/src/lib/corelib/loader/groupshandler.h
+++ b/src/lib/corelib/loader/groupshandler.h
@@ -41,6 +41,7 @@
 
 #include <language/qualifiedid.h>
 #include <tools/set.h>
+#include <tools/pimpl.h>
 
 #include <unordered_map>
 #include <utility>
@@ -76,7 +77,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/localprofiles.cpp b/src/lib/corelib/loader/localprofiles.cpp
index 0b73a6ab0..fabe3fab9 100644
--- a/src/lib/corelib/loader/localprofiles.cpp
+++ b/src/lib/corelib/loader/localprofiles.cpp
@@ -69,8 +69,8 @@ public:
 
 LocalProfiles::LocalProfiles(const SetupProjectParameters &parameters, Evaluator &evaluator,
                              Logger &logger)
-    : d(new Private(parameters, evaluator, logger)) {}
-LocalProfiles::~LocalProfiles() { delete d; }
+    : d(makePimpl<Private>(parameters, evaluator, logger)) {}
+LocalProfiles::~LocalProfiles() = default;
 
 void LocalProfiles::collectProfilesFromItems(Item *productOrProject, Item *projectScope)
 {
diff --git a/src/lib/corelib/loader/localprofiles.h b/src/lib/corelib/loader/localprofiles.h
index 3e6b77f4d..b89b5de9c 100644
--- a/src/lib/corelib/loader/localprofiles.h
+++ b/src/lib/corelib/loader/localprofiles.h
@@ -39,6 +39,7 @@
 
 #pragma once
 
+#include <tools/pimpl.h>
 #include <QVariantMap>
 
 namespace qbs {
@@ -60,7 +61,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/moduleinstantiator.cpp b/src/lib/corelib/loader/moduleinstantiator.cpp
index 35f5332af..8e6e08f01 100644
--- a/src/lib/corelib/loader/moduleinstantiator.cpp
+++ b/src/lib/corelib/loader/moduleinstantiator.cpp
@@ -81,8 +81,8 @@ public:
 ModuleInstantiator::ModuleInstantiator(
     const SetupProjectParameters &parameters, ItemPool &itemPool,
     ModulePropertyMerger &propertyMerger, Logger &logger)
-    : d(new Private(parameters, itemPool, propertyMerger, logger)) {}
-ModuleInstantiator::~ModuleInstantiator() { delete d; }
+    : d(makePimpl<Private>(parameters, itemPool, propertyMerger, logger)) {}
+ModuleInstantiator::~ModuleInstantiator() = default;
 
 void ModuleInstantiator::instantiate(const Context &context)
 {
diff --git a/src/lib/corelib/loader/moduleinstantiator.h b/src/lib/corelib/loader/moduleinstantiator.h
index f235b83fa..9278c27ee 100644
--- a/src/lib/corelib/loader/moduleinstantiator.h
+++ b/src/lib/corelib/loader/moduleinstantiator.h
@@ -39,6 +39,7 @@
 
 #pragma once
 
+#include <tools/pimpl.h>
 #include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
@@ -93,7 +94,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/moduleloader.cpp b/src/lib/corelib/loader/moduleloader.cpp
index 2ad3d8e71..4be08616a 100644
--- a/src/lib/corelib/loader/moduleloader.cpp
+++ b/src/lib/corelib/loader/moduleloader.cpp
@@ -105,9 +105,9 @@ public:
 ModuleLoader::ModuleLoader(
     const SetupProjectParameters &setupParameters, ModuleProviderLoader &providerLoader,
     ItemReader &itemReader, Evaluator &evaluator, Logger &logger)
-    : d(new Private(setupParameters, providerLoader, itemReader, evaluator, logger)) { }
+    : d(makePimpl<Private>(setupParameters, providerLoader, itemReader, evaluator, logger)) { }
 
-ModuleLoader::~ModuleLoader() { delete d; }
+ModuleLoader::~ModuleLoader() = default;
 
 struct PrioritizedItem
 {
diff --git a/src/lib/corelib/loader/moduleloader.h b/src/lib/corelib/loader/moduleloader.h
index 6f55ee052..35c7102d7 100644
--- a/src/lib/corelib/loader/moduleloader.h
+++ b/src/lib/corelib/loader/moduleloader.h
@@ -39,8 +39,10 @@
 
 #pragma once
 
+
 #include <language/forward_decls.h>
 #include <language/item.h>
+#include <tools/pimpl.h>
 
 #include <QString>
 #include <QVariantMap>
@@ -91,7 +93,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/modulepropertymerger.cpp b/src/lib/corelib/loader/modulepropertymerger.cpp
index e3cf1a633..3bec5adc3 100644
--- a/src/lib/corelib/loader/modulepropertymerger.cpp
+++ b/src/lib/corelib/loader/modulepropertymerger.cpp
@@ -120,8 +120,8 @@ void ModulePropertyMerger::printProfilingInfo(int indent)
 
 ModulePropertyMerger::ModulePropertyMerger(
     const SetupProjectParameters &parameters, Evaluator &evaluator, Logger &logger)
-    : d(new Private(parameters, evaluator, logger)) { }
-ModulePropertyMerger::~ModulePropertyMerger() { delete d; }
+    : d(makePimpl<Private>(parameters, evaluator, logger)) { }
+ModulePropertyMerger::~ModulePropertyMerger() = default;
 
 int ModulePropertyMerger::Private::compareValuePriorities(
     const Item *productItem, const ValueConstPtr &v1, const ValueConstPtr &v2)
diff --git a/src/lib/corelib/loader/modulepropertymerger.h b/src/lib/corelib/loader/modulepropertymerger.h
index fc388cfbf..2175d212f 100644
--- a/src/lib/corelib/loader/modulepropertymerger.h
+++ b/src/lib/corelib/loader/modulepropertymerger.h
@@ -39,6 +39,8 @@
 
 #pragma once
 
+#include <tools/pimpl.h>
+
 #include <QtGlobal>
 
 namespace qbs {
@@ -92,7 +94,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/productitemmultiplexer.cpp b/src/lib/corelib/loader/productitemmultiplexer.cpp
index 5f8e9f472..aec0400d2 100644
--- a/src/lib/corelib/loader/productitemmultiplexer.cpp
+++ b/src/lib/corelib/loader/productitemmultiplexer.cpp
@@ -93,9 +93,9 @@ public:
 ProductItemMultiplexer::ProductItemMultiplexer(
     const SetupProjectParameters &parameters, Evaluator &evaluator, Logger &logger,
     const QbsItemRetriever &qbsItemRetriever)
-    : d(new Private(parameters, evaluator, logger, qbsItemRetriever)) {}
+    : d(makePimpl<Private>(parameters, evaluator, logger, qbsItemRetriever)) {}
 
-ProductItemMultiplexer::~ProductItemMultiplexer() { delete d; }
+ProductItemMultiplexer::~ProductItemMultiplexer() = default;
 
 QList<Item *> ProductItemMultiplexer::multiplex(
     const QString &productName,
diff --git a/src/lib/corelib/loader/productitemmultiplexer.h b/src/lib/corelib/loader/productitemmultiplexer.h
index d99267336..795b77b08 100644
--- a/src/lib/corelib/loader/productitemmultiplexer.h
+++ b/src/lib/corelib/loader/productitemmultiplexer.h
@@ -39,6 +39,8 @@
 
 #pragma once
 
+#include <tools/pimpl.h>
+
 #include <QList>
 #include <QVariantMap>
 
@@ -77,7 +79,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/projectresolver.cpp b/src/lib/corelib/loader/projectresolver.cpp
index 994436b61..97b701624 100644
--- a/src/lib/corelib/loader/projectresolver.cpp
+++ b/src/lib/corelib/loader/projectresolver.cpp
@@ -251,15 +251,12 @@ public:
 
 
 ProjectResolver::ProjectResolver(ScriptEngine *engine, Logger logger)
-    : d(new Private(engine, std::move(logger)))
+    : d(makePimpl<Private>(engine, std::move(logger)))
 {
     d->logger.storeWarnings();
 }
 
-ProjectResolver::~ProjectResolver()
-{
-    delete d;
-}
+ProjectResolver::~ProjectResolver() = default;
 
 void ProjectResolver::setProgressObserver(ProgressObserver *observer)
 {
diff --git a/src/lib/corelib/loader/projectresolver.h b/src/lib/corelib/loader/projectresolver.h
index 94a88c614..2b5a55066 100644
--- a/src/lib/corelib/loader/projectresolver.h
+++ b/src/lib/corelib/loader/projectresolver.h
@@ -42,6 +42,7 @@
 
 #include <language/forward_decls.h>
 #include <logging/logger.h>
+#include <tools/pimpl.h>
 #include <tools/qbs_export.h>
 
 #include <QHash>
@@ -74,7 +75,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/projecttreebuilder.cpp b/src/lib/corelib/loader/projecttreebuilder.cpp
index 59e2873e5..a13c3c2e7 100644
--- a/src/lib/corelib/loader/projecttreebuilder.cpp
+++ b/src/lib/corelib/loader/projecttreebuilder.cpp
@@ -328,8 +328,8 @@ private:
 
 ProjectTreeBuilder::ProjectTreeBuilder(const SetupProjectParameters &parameters, ItemPool &itemPool,
                                        Evaluator &evaluator, Logger &logger)
-    : d(new Private(parameters, itemPool, evaluator, logger)) {}
-ProjectTreeBuilder::~ProjectTreeBuilder() { delete d; }
+    : d(makePimpl<Private>(parameters, itemPool, evaluator, logger)) {}
+ProjectTreeBuilder::~ProjectTreeBuilder() = default;
 
 void ProjectTreeBuilder::setProgressObserver(ProgressObserver *progressObserver)
 {
diff --git a/src/lib/corelib/loader/projecttreebuilder.h b/src/lib/corelib/loader/projecttreebuilder.h
index 15a329e19..d70e9b2b0 100644
--- a/src/lib/corelib/loader/projecttreebuilder.h
+++ b/src/lib/corelib/loader/projecttreebuilder.h
@@ -44,6 +44,7 @@
 #include <language/forward_decls.h>
 #include <language/moduleproviderinfo.h>
 #include <language/qualifiedid.h>
+#include <tools/pimpl.h>
 
 #include <QString>
 #include <QVariant>
@@ -93,7 +94,7 @@ public:
 
 private:
     class Private;
-    Private * const d;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal