16 files changed, 45 insertions, 133 deletions
diff --git a/src/lib/corelib/tools/buildoptions.cpp b/src/lib/corelib/tools/buildoptions.cpp
index 75417ab0b..e4e9ba17f 100644
--- a/src/lib/corelib/tools/buildoptions.cpp
+++ b/src/lib/corelib/tools/buildoptions.cpp
@@ -91,19 +91,11 @@ BuildOptions::BuildOptions() : d(new Internal::BuildOptionsPrivate)
 {
 }
 
-BuildOptions::BuildOptions(const BuildOptions &other) : d(other.d)
-{
-}
+BuildOptions::BuildOptions(const BuildOptions &other) = default;
 
-BuildOptions &BuildOptions::operator=(const BuildOptions &other)
-{
-    d = other.d;
-    return *this;
-}
+BuildOptions &BuildOptions::operator=(const BuildOptions &other) = default;
 
-BuildOptions::~BuildOptions()
-{
-}
+BuildOptions::~BuildOptions() = default;
 
 /*!
  * \brief If non-empty, qbs pretends that only these files have changed.
diff --git a/src/lib/corelib/tools/cleanoptions.cpp b/src/lib/corelib/tools/cleanoptions.cpp
index b888fb1e8..cef77468e 100644
--- a/src/lib/corelib/tools/cleanoptions.cpp
+++ b/src/lib/corelib/tools/cleanoptions.cpp
@@ -79,23 +79,15 @@ CleanOptions::CleanOptions() : d(new Internal::CleanOptionsPrivate)
 {
 }
 
-CleanOptions::CleanOptions(const CleanOptions &other) : d(other.d)
-{
-}
+CleanOptions::CleanOptions(const CleanOptions &other) = default;
 
 CleanOptions::CleanOptions(CleanOptions &&other) Q_DECL_NOEXCEPT = default;
 
-CleanOptions &CleanOptions::operator=(const CleanOptions &other)
-{
-    d = other.d;
-    return *this;
-}
+CleanOptions &CleanOptions::operator=(const CleanOptions &other) = default;
 
 CleanOptions &CleanOptions::operator=(CleanOptions &&other) Q_DECL_NOEXCEPT = default;
 
-CleanOptions::~CleanOptions()
-{
-}
+CleanOptions::~CleanOptions() = default;
 
 /*!
  * \brief Returns true iff qbs will not actually remove any files, but just show what would happen.
diff --git a/src/lib/corelib/tools/codelocation.cpp b/src/lib/corelib/tools/codelocation.cpp
index 5eff378e1..542408795 100644
--- a/src/lib/corelib/tools/codelocation.cpp
+++ b/src/lib/corelib/tools/codelocation.cpp
@@ -75,9 +75,7 @@ public:
     int column = 0;
 };
 
-CodeLocation::CodeLocation()
-{
-}
+CodeLocation::CodeLocation() = default;
 
 CodeLocation::CodeLocation(const QString &aFilePath, int aLine, int aColumn, bool checkPath)
     : d(new CodeLocationPrivate)
@@ -88,19 +86,11 @@ CodeLocation::CodeLocation(const QString &aFilePath, int aLine, int aColumn, boo
     d->column = aColumn;
 }
 
-CodeLocation::CodeLocation(const CodeLocation &other) : d(other.d)
-{
-}
+CodeLocation::CodeLocation(const CodeLocation &other) = default;
 
-CodeLocation &CodeLocation::operator=(const CodeLocation &other)
-{
-    d = other.d;
-    return *this;
-}
+CodeLocation &CodeLocation::operator=(const CodeLocation &other) = default;
 
-CodeLocation::~CodeLocation()
-{
-}
+CodeLocation::~CodeLocation() = default;
 
 QString CodeLocation::filePath() const
 {
diff --git a/src/lib/corelib/tools/error.cpp b/src/lib/corelib/tools/error.cpp
index fc0b9377e..d9c2951c4 100644
--- a/src/lib/corelib/tools/error.cpp
+++ b/src/lib/corelib/tools/error.cpp
@@ -98,19 +98,11 @@ ErrorItem::ErrorItem(const QString &description, const CodeLocation &codeLocatio
     d->isBacktraceItem = isBacktraceItem;
 }
 
-ErrorItem::ErrorItem(const ErrorItem &rhs) : d(rhs.d)
-{
-}
+ErrorItem::ErrorItem(const ErrorItem &rhs) = default;
 
-ErrorItem &ErrorItem::operator=(const ErrorItem &other)
-{
-    d = other.d;
-    return *this;
-}
+ErrorItem &ErrorItem::operator=(const ErrorItem &other) = default;
 
-ErrorItem::~ErrorItem()
-{
-}
+ErrorItem::~ErrorItem() = default;
 
 QString ErrorItem::description() const
 {
@@ -194,9 +186,7 @@ ErrorInfo::ErrorInfo() : d(new ErrorInfoPrivate)
 {
 }
 
-ErrorInfo::ErrorInfo(const ErrorInfo &rhs) : d(rhs.d)
-{
-}
+ErrorInfo::ErrorInfo(const ErrorInfo &rhs) = default;
 
 ErrorInfo::ErrorInfo(const QString &description, const CodeLocation &location, bool internalError)
     : d(new ErrorInfoPrivate)
@@ -224,15 +214,9 @@ ErrorInfo::ErrorInfo(const QString &description, const QStringList &backtrace)
 }
 
 
-ErrorInfo &ErrorInfo::operator =(const ErrorInfo &other)
-{
-    d = other.d;
-    return *this;
-}
+ErrorInfo &ErrorInfo::operator =(const ErrorInfo &other) = default;
 
-ErrorInfo::~ErrorInfo()
-{
-}
+ErrorInfo::~ErrorInfo() = default;
 
 void ErrorInfo::appendBacktrace(const QString &description, const CodeLocation &location)
 {
diff --git a/src/lib/corelib/tools/generateoptions.cpp b/src/lib/corelib/tools/generateoptions.cpp
index 019e2eb48..596e0acb9 100644
--- a/src/lib/corelib/tools/generateoptions.cpp
+++ b/src/lib/corelib/tools/generateoptions.cpp
@@ -68,19 +68,11 @@ GenerateOptions::GenerateOptions() : d(new Internal::GenerateOptionsPrivate)
 {
 }
 
-GenerateOptions::GenerateOptions(const GenerateOptions &other) : d(other.d)
-{
-}
+GenerateOptions::GenerateOptions(const GenerateOptions &other) = default;
 
-GenerateOptions &GenerateOptions::operator=(const GenerateOptions &other)
-{
-    d = other.d;
-    return *this;
-}
+GenerateOptions &GenerateOptions::operator=(const GenerateOptions &other) = default;
 
-GenerateOptions::~GenerateOptions()
-{
-}
+GenerateOptions::~GenerateOptions() = default;
 
 /*!
  * Returns the name of the generator used to create the external build system files.
diff --git a/src/lib/corelib/tools/installoptions.cpp b/src/lib/corelib/tools/installoptions.cpp
index 93fd54efe..5e112e6de 100644
--- a/src/lib/corelib/tools/installoptions.cpp
+++ b/src/lib/corelib/tools/installoptions.cpp
@@ -92,23 +92,15 @@ InstallOptions::InstallOptions() : d(new Internal::InstallOptionsPrivate)
 {
 }
 
-InstallOptions::InstallOptions(const InstallOptions &other) : d(other.d)
-{
-}
+InstallOptions::InstallOptions(const InstallOptions &other) = default;
 
 InstallOptions::InstallOptions(InstallOptions &&other) Q_DECL_NOEXCEPT = default;
 
-InstallOptions &InstallOptions::operator=(const InstallOptions &other)
-{
-    d = other.d;
-    return *this;
-}
+InstallOptions &InstallOptions::operator=(const InstallOptions &other) = default;
 
 InstallOptions &InstallOptions::operator=(InstallOptions &&other) Q_DECL_NOEXCEPT = default;
 
-InstallOptions::~InstallOptions()
-{
-}
+InstallOptions::~InstallOptions() = default;
 
 /*!
  * \brief The default install root, relative to the build directory.
diff --git a/src/lib/corelib/tools/joblimits.cpp b/src/lib/corelib/tools/joblimits.cpp
index 1a3e3a498..54c8c98ba 100644
--- a/src/lib/corelib/tools/joblimits.cpp
+++ b/src/lib/corelib/tools/joblimits.cpp
@@ -87,13 +87,9 @@ JobLimit::JobLimit() : JobLimit(QString(), -1)
 JobLimit::JobLimit(const QString &pool, int limit) : d(new Internal::JobLimitPrivate(pool, limit))
 {
 }
-JobLimit::JobLimit(const JobLimit &other) : d(other.d) { }
-JobLimit &JobLimit::operator=(const JobLimit &other)
-{
-    d = other.d;
-    return *this;
-}
-JobLimit::~JobLimit() {}
+JobLimit::JobLimit(const JobLimit &other) = default;
+JobLimit &JobLimit::operator=(const JobLimit &other) = default;
+JobLimit::~JobLimit() = default;
 QString JobLimit::pool() const { return d->jobLimit.first; }
 int JobLimit::limit() const { return d->jobLimit.second; }
 
@@ -108,13 +104,9 @@ void JobLimit::store(Internal::PersistentPool &pool)
 }
 
 JobLimits::JobLimits() : d(new Internal::JobLimitsPrivate) { }
-JobLimits::JobLimits(const JobLimits &other) : d(other.d) { }
-JobLimits &JobLimits::operator=(const JobLimits &other)
-{
-    d = other.d;
-    return *this;
-}
-JobLimits::~JobLimits() {}
+JobLimits::JobLimits(const JobLimits &other) = default;
+JobLimits &JobLimits::operator=(const JobLimits &other) = default;
+JobLimits::~JobLimits() = default;
 
 void JobLimits::setJobLimit(const JobLimit &limit)
 {
diff --git a/src/lib/corelib/tools/launcherpackets.cpp b/src/lib/corelib/tools/launcherpackets.cpp
index aaa931a49..9c7946d73 100644
--- a/src/lib/corelib/tools/launcherpackets.cpp
+++ b/src/lib/corelib/tools/launcherpackets.cpp
@@ -45,7 +45,7 @@
 namespace qbs {
 namespace Internal {
 
-LauncherPacket::~LauncherPacket() { }
+LauncherPacket::~LauncherPacket() = default;
 
 QByteArray LauncherPacket::serialize() const
 {
diff --git a/src/lib/corelib/tools/msvcinfo.h b/src/lib/corelib/tools/msvcinfo.h
index b5cf04e84..171afeb29 100644
--- a/src/lib/corelib/tools/msvcinfo.h
+++ b/src/lib/corelib/tools/msvcinfo.h
@@ -75,7 +75,7 @@ public:
     QString architecture;
     QProcessEnvironment environment;
 
-    MSVC() { }
+    MSVC() = default;
 
     MSVC(const QString &clPath, QString arch):
         architecture(std::move(arch))
diff --git a/src/lib/corelib/tools/processresult.cpp b/src/lib/corelib/tools/processresult.cpp
index 3fb2f8dbc..d5591a7ed 100644
--- a/src/lib/corelib/tools/processresult.cpp
+++ b/src/lib/corelib/tools/processresult.cpp
@@ -53,19 +53,11 @@ ProcessResult::ProcessResult() : d(new Internal::ProcessResultPrivate)
 {
 }
 
-ProcessResult::ProcessResult(const ProcessResult &other) : d(other.d)
-{
-}
+ProcessResult::ProcessResult(const ProcessResult &other) = default;
 
-ProcessResult &ProcessResult::operator=(const ProcessResult &other)
-{
-    d = other.d;
-    return *this;
-}
+ProcessResult &ProcessResult::operator=(const ProcessResult &other) = default;
 
-ProcessResult::~ProcessResult()
-{
-}
+ProcessResult::~ProcessResult() = default;
 
 /*!
  * \brief Returns true iff the command finished successfully.
diff --git a/src/lib/corelib/tools/progressobserver.h b/src/lib/corelib/tools/progressobserver.h
index 72b9694ba..fc49d9eed 100644
--- a/src/lib/corelib/tools/progressobserver.h
+++ b/src/lib/corelib/tools/progressobserver.h
@@ -51,7 +51,7 @@ namespace Internal {
 class ProgressObserver
 {
 public:
-    virtual ~ProgressObserver() { }
+    virtual ~ProgressObserver() = default;
 
     virtual void initialize(const QString &task, int maximum) = 0;
     virtual void setProgressValue(int value) = 0;
diff --git a/src/lib/corelib/tools/projectgeneratormanager.cpp b/src/lib/corelib/tools/projectgeneratormanager.cpp
index 3991adfb9..53d72bcd1 100644
--- a/src/lib/corelib/tools/projectgeneratormanager.cpp
+++ b/src/lib/corelib/tools/projectgeneratormanager.cpp
@@ -52,9 +52,7 @@ namespace qbs {
 
 using namespace Internal;
 
-ProjectGeneratorManager::~ProjectGeneratorManager()
-{
-}
+ProjectGeneratorManager::~ProjectGeneratorManager() = default;
 
 ProjectGeneratorManager *ProjectGeneratorManager::instance()
 {
@@ -62,9 +60,7 @@ ProjectGeneratorManager *ProjectGeneratorManager::instance()
     return &generatorPlugin;
 }
 
-ProjectGeneratorManager::ProjectGeneratorManager()
-{
-}
+ProjectGeneratorManager::ProjectGeneratorManager() = default;
 
 QStringList ProjectGeneratorManager::loadedGeneratorNames()
 {
diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index d6b564832..378f0e11b 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -51,9 +51,7 @@ public:
     std::map<FileTag, std::vector<ScannerPlugin* >> scannerPlugins;
 };
 
-ScannerPluginManager::~ScannerPluginManager()
-{
-}
+ScannerPluginManager::~ScannerPluginManager() = default;
 
 ScannerPluginManager *ScannerPluginManager::instance()
 {
diff --git a/src/lib/corelib/tools/set.h b/src/lib/corelib/tools/set.h
index eb3bf6632..d2af77d73 100644
--- a/src/lib/corelib/tools/set.h
+++ b/src/lib/corelib/tools/set.h
@@ -98,7 +98,7 @@ public:
     const_iterator constBegin() const { return m_data.cbegin(); }
     const_iterator constEnd() const { return m_data.cend(); }
 
-    Set() { }
+    Set() = default;
     Set(const std::initializer_list<T> &list);
 
     Set &unite(const Set &other);
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index 41af7b926..996f6b273 100644
--- a/src/lib/corelib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
@@ -107,21 +107,15 @@ SetupProjectParameters::SetupProjectParameters() : d(new Internal::SetupProjectP
 {
 }
 
-SetupProjectParameters::SetupProjectParameters(const SetupProjectParameters &other) : d(other.d)
-{
-}
+SetupProjectParameters::SetupProjectParameters(const SetupProjectParameters &other) = default;
 
-SetupProjectParameters::SetupProjectParameters(SetupProjectParameters &&other) Q_DECL_NOEXCEPT = default;
+SetupProjectParameters::SetupProjectParameters(
+        SetupProjectParameters &&other) Q_DECL_NOEXCEPT = default;
 
-SetupProjectParameters::~SetupProjectParameters()
-{
-}
+SetupProjectParameters::~SetupProjectParameters() = default;
 
-SetupProjectParameters &SetupProjectParameters::operator=(const SetupProjectParameters &other)
-{
-    d = other.d;
-    return *this;
-}
+SetupProjectParameters &SetupProjectParameters::operator=(
+        const SetupProjectParameters &other) = default;
 
 namespace Internal {
 template<> ErrorHandlingMode fromJson(const QJsonValue &v)
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp
index d4f8844fa..02e5ef495 100644
--- a/src/lib/corelib/tools/visualstudioversioninfo.cpp
+++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp
@@ -46,9 +46,7 @@
 namespace qbs {
 namespace Internal {
 
-VisualStudioVersionInfo::VisualStudioVersionInfo()
-{
-}
+VisualStudioVersionInfo::VisualStudioVersionInfo() = default;
 
 VisualStudioVersionInfo::VisualStudioVersionInfo(const Version &version)
     : m_version(version)