diff options
83 files changed, 142 insertions, 384 deletions
diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp index 0aecc8773..8beeeb601 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -43,10 +43,7 @@ #include <QtCore/qfileinfo.h> -CommandLineParser::CommandLineParser() -{ - -} +CommandLineParser::CommandLineParser() = default; using qbs::Internal::Tr; diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp index 0c13662f0..a09f36c2c 100644 --- a/src/app/qbs/parser/commandlineoption.cpp +++ b/src/app/qbs/parser/commandlineoption.cpp @@ -47,9 +47,7 @@ namespace qbs { using namespace Internal; -CommandLineOption::~CommandLineOption() -{ -} +CommandLineOption::~CommandLineOption() = default; void CommandLineOption::parse(CommandType command, const QString &representation, QStringList &input) { @@ -546,9 +544,7 @@ QString LogTimeOption::longRepresentation() const } -SettingsDirOption::SettingsDirOption() -{ -} +SettingsDirOption::SettingsDirOption() = default; QString SettingsDirOption::description(CommandType command) const { @@ -627,9 +623,7 @@ QString RespectProjectJobLimitsOption::longRepresentation() const return QStringLiteral("--enforce-project-job-limits"); } -CommandEchoModeOption::CommandEchoModeOption() -{ -} +CommandEchoModeOption::CommandEchoModeOption() = default; QString CommandEchoModeOption::description(CommandType command) const { diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp index c7185a725..799bf5dcf 100644 --- a/src/app/qbs/parser/parsercommand.cpp +++ b/src/app/qbs/parser/parsercommand.cpp @@ -53,9 +53,7 @@ namespace qbs { using namespace Internal; -Command::~Command() -{ -} +Command::~Command() = default; void Command::parse(QStringList &input) { diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index c74c3d8a4..3b68e01b5 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -225,9 +225,7 @@ InternalSetupProjectJob::InternalSetupProjectJob(const Logger &logger) { } -InternalSetupProjectJob::~InternalSetupProjectJob() -{ -} +InternalSetupProjectJob::~InternalSetupProjectJob() = default; void InternalSetupProjectJob::init(const TopLevelProjectPtr &existingProject, const SetupProjectParameters ¶meters) @@ -350,9 +348,7 @@ BuildGraphTouchingJob::BuildGraphTouchingJob(const Logger &logger, QObject *pare { } -BuildGraphTouchingJob::~BuildGraphTouchingJob() -{ -} +BuildGraphTouchingJob::~BuildGraphTouchingJob() = default; void BuildGraphTouchingJob::setup(const TopLevelProjectPtr &project, const QList<ResolvedProductPtr> &products, bool dryRun) @@ -443,9 +439,7 @@ InternalInstallJob::InternalInstallJob(const Logger &logger) { } -InternalInstallJob::~InternalInstallJob() -{ -} +InternalInstallJob::~InternalInstallJob() = default; void InternalInstallJob::init(const TopLevelProjectPtr &project, const std::vector<ResolvedProductPtr> &products, const InstallOptions &options) diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp index d0fe7296e..bff79bdfa 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -931,13 +931,9 @@ Project::Project(const TopLevelProjectPtr &internalProject, const Logger &logger { } -Project::Project(const Project &other) : d(other.d) -{ -} +Project::Project(const Project &other) = default; -Project::~Project() -{ -} +Project::~Project() = default; /*! * \brief Returns true if and only if this object was retrieved from a successful \c SetupProjectJob. @@ -957,11 +953,7 @@ QString Project::profile() const return d->internalProject->profile(); } -Project &Project::operator=(const Project &other) -{ - d = other.d; - return *this; -} +Project &Project::operator=(const Project &other) = default; /*! * \brief Sets up a \c Project from a source file, possibly re-using previously stored information. @@ -996,10 +988,7 @@ SetupProjectJob *Project::setupProject(const SetupProjectParameters ¶meters, return job; } -Project::Project() -{ -} - +Project::Project() = default; /*! * \brief Retrieves information for this project. diff --git a/src/lib/corelib/api/rulecommand.cpp b/src/lib/corelib/api/rulecommand.cpp index bc12140f3..e01cde7cc 100644 --- a/src/lib/corelib/api/rulecommand.cpp +++ b/src/lib/corelib/api/rulecommand.cpp @@ -65,17 +65,11 @@ RuleCommand::RuleCommand() : d(new Internal::RuleCommandPrivate) { } -RuleCommand::RuleCommand(const RuleCommand &other) : d(other.d) {} +RuleCommand::RuleCommand(const RuleCommand &other) = default; -RuleCommand::~RuleCommand() -{ -} +RuleCommand::~RuleCommand() = default; -RuleCommand& RuleCommand::operator=(const RuleCommand &other) -{ - d = other.d; - return *this; -} +RuleCommand& RuleCommand::operator=(const RuleCommand &other) = default; /*! * Returns the type of this object. If the value is \c InvalidType, the object is invalid. diff --git a/src/lib/corelib/api/transformerdata.cpp b/src/lib/corelib/api/transformerdata.cpp index b4ee61d0c..9724e641b 100644 --- a/src/lib/corelib/api/transformerdata.cpp +++ b/src/lib/corelib/api/transformerdata.cpp @@ -44,14 +44,10 @@ namespace qbs { TransformerData::TransformerData() : d(new Internal::TransformerDataPrivate) { } -TransformerData::TransformerData(const TransformerData &other) : d(other.d) {} -TransformerData::~TransformerData() { } +TransformerData::TransformerData(const TransformerData &other) = default; +TransformerData::~TransformerData() = default; -TransformerData& TransformerData::operator=(const TransformerData &other) -{ - d = other.d; - return *this; -} +TransformerData& TransformerData::operator=(const TransformerData &other) = default; QList<ArtifactData> TransformerData::inputs() const { return d->inputs; } QList<ArtifactData> TransformerData::outputs() const { return d->outputs; } diff --git a/src/lib/corelib/buildgraph/buildgraphloader.h b/src/lib/corelib/buildgraph/buildgraphloader.h index 9363b8358..a89272958 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.h +++ b/src/lib/corelib/buildgraph/buildgraphloader.h @@ -121,7 +121,7 @@ private: bool checkConfigCompatibility(); struct ChildrenInfo { - ChildrenInfo() {} + ChildrenInfo() = default; ChildrenInfo(const ArtifactSet &c1, const ArtifactSet &c2) : children(c1), childrenAddedByScanner(c2) {} ArtifactSet children; diff --git a/src/lib/corelib/buildgraph/depscanner.h b/src/lib/corelib/buildgraph/depscanner.h index ffc0b83de..6b18004f9 100644 --- a/src/lib/corelib/buildgraph/depscanner.h +++ b/src/lib/corelib/buildgraph/depscanner.h @@ -61,7 +61,7 @@ class ScriptEngine; class DependencyScanner { public: - virtual ~DependencyScanner() {} + virtual ~DependencyScanner() = default; QString id() const; diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp index 79f17377d..bc96cbb6e 100644 --- a/src/lib/corelib/buildgraph/executorjob.cpp +++ b/src/lib/corelib/buildgraph/executorjob.cpp @@ -71,9 +71,7 @@ ExecutorJob::ExecutorJob(const Logger &logger, QObject *parent) reset(); } -ExecutorJob::~ExecutorJob() -{ -} +ExecutorJob::~ExecutorJob() = default; void ExecutorJob::setMainThreadScriptEngine(ScriptEngine *engine) { diff --git a/src/lib/corelib/buildgraph/filedependency.cpp b/src/lib/corelib/buildgraph/filedependency.cpp index 9420fa96b..cbee758c7 100644 --- a/src/lib/corelib/buildgraph/filedependency.cpp +++ b/src/lib/corelib/buildgraph/filedependency.cpp @@ -44,13 +44,9 @@ namespace qbs { namespace Internal { -FileResourceBase::FileResourceBase() -{ -} +FileResourceBase::FileResourceBase() = default; -FileResourceBase::~FileResourceBase() -{ -} +FileResourceBase::~FileResourceBase() = default; void FileResourceBase::setTimestamp(const FileTime &t) @@ -86,13 +82,9 @@ void FileResourceBase::store(PersistentPool &pool) } -FileDependency::FileDependency() -{ -} +FileDependency::FileDependency() = default; -FileDependency::~FileDependency() -{ -} +FileDependency::~FileDependency() = default; } // namespace Internal } // namespace qbs diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index 81cbe2178..ae7d456cf 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -379,9 +379,7 @@ InputArtifactScannerContext::DependencyScannerCacheItem::DependencyScannerCacheI { } -InputArtifactScannerContext::DependencyScannerCacheItem::~DependencyScannerCacheItem() -{ -} +InputArtifactScannerContext::DependencyScannerCacheItem::~DependencyScannerCacheItem() = default; } // namespace Internal } // namespace qbs diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp index 31ff6be4b..c09c31c2c 100644 --- a/src/lib/corelib/buildgraph/rulecommands.cpp +++ b/src/lib/corelib/buildgraph/rulecommands.cpp @@ -94,9 +94,7 @@ AbstractCommand::AbstractCommand() { } -AbstractCommand::~AbstractCommand() -{ -} +AbstractCommand::~AbstractCommand() = default; bool AbstractCommand::equals(const AbstractCommand *other) const { @@ -399,9 +397,7 @@ void JavaScriptCommand::setupForJavaScript(QScriptValue targetObject) targetObject.setProperty(StringConstants::javaScriptCommandType(), ctor); } -JavaScriptCommand::JavaScriptCommand() -{ -} +JavaScriptCommand::JavaScriptCommand() = default; bool JavaScriptCommand::equals(const AbstractCommand *otherAbstractCommand) const { diff --git a/src/lib/corelib/buildgraph/rulegraph.cpp b/src/lib/corelib/buildgraph/rulegraph.cpp index 23227ca09..e01a8bda8 100644 --- a/src/lib/corelib/buildgraph/rulegraph.cpp +++ b/src/lib/corelib/buildgraph/rulegraph.cpp @@ -46,9 +46,7 @@ namespace qbs { namespace Internal { -RuleGraph::RuleGraph() -{ -} +RuleGraph::RuleGraph() = default; void RuleGraph::build(const std::vector<RulePtr> &rules, const FileTags &productFileTags) { diff --git a/src/lib/corelib/buildgraph/rulenode.cpp b/src/lib/corelib/buildgraph/rulenode.cpp index bf25b1da8..7f77f1303 100644 --- a/src/lib/corelib/buildgraph/rulenode.cpp +++ b/src/lib/corelib/buildgraph/rulenode.cpp @@ -56,13 +56,9 @@ namespace qbs { namespace Internal { -RuleNode::RuleNode() -{ -} +RuleNode::RuleNode() = default; -RuleNode::~RuleNode() -{ -} +RuleNode::~RuleNode() = default; void RuleNode::accept(BuildGraphVisitor *visitor) { diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index cc0b4c923..5e27c3e74 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -62,9 +62,7 @@ Transformer::Transformer() : alwaysRun(false) { } -Transformer::~Transformer() -{ -} +Transformer::~Transformer() = default; static QScriptValue js_baseName(QScriptContext *ctx, QScriptEngine *engine, const Artifact *artifact) diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h index da65815ad..fd9bdde31 100644 --- a/src/lib/corelib/generators/generatordata.h +++ b/src/lib/corelib/generators/generatordata.h @@ -99,7 +99,7 @@ template <typename U> struct IMultiplexableContainer { } protected: - IMultiplexableContainer() { } + IMultiplexableContainer() = default; }; struct QBS_EXPORT GeneratableProductData : public IMultiplexableContainer<ProductData> { @@ -114,7 +114,7 @@ struct QBS_EXPORT GeneratableProjectData : public IMultiplexableContainer<Projec struct Id { private: friend struct GeneratableProjectData; - Id() { } + Id() = default; QString value; public: diff --git a/src/lib/corelib/generators/igeneratableprojectvisitor.h b/src/lib/corelib/generators/igeneratableprojectvisitor.h index c3bd28580..dbf73b4e0 100644 --- a/src/lib/corelib/generators/igeneratableprojectvisitor.h +++ b/src/lib/corelib/generators/igeneratableprojectvisitor.h @@ -46,7 +46,7 @@ namespace qbs { class IGeneratableProjectVisitor { public: - virtual ~IGeneratableProjectVisitor() { } + virtual ~IGeneratableProjectVisitor() = default; // Collapsed configurations virtual void visitProject(const GeneratableProject &project) { diff --git a/src/lib/corelib/generators/ixmlnodevisitor.h b/src/lib/corelib/generators/ixmlnodevisitor.h index d3d118975..278f4cf2e 100644 --- a/src/lib/corelib/generators/ixmlnodevisitor.h +++ b/src/lib/corelib/generators/ixmlnodevisitor.h @@ -47,7 +47,7 @@ class Workspace; class QBS_EXPORT INodeVisitor { public: - virtual ~INodeVisitor() {} + virtual ~INodeVisitor() = default; virtual void visitWorkspaceStart(const Workspace *workspace) { Q_UNUSED(workspace) } virtual void visitWorkspaceEnd(const Workspace *workspace) { Q_UNUSED(workspace) } diff --git a/src/lib/corelib/language/artifactproperties.cpp b/src/lib/corelib/language/artifactproperties.cpp index dd61bf1a2..e5b11f4d7 100644 --- a/src/lib/corelib/language/artifactproperties.cpp +++ b/src/lib/corelib/language/artifactproperties.cpp @@ -48,9 +48,7 @@ ArtifactPropertiesPtr ArtifactProperties::create() return ArtifactPropertiesPtr(new ArtifactProperties); } -ArtifactProperties::ArtifactProperties() -{ -} +ArtifactProperties::ArtifactProperties() = default; FileTags ArtifactProperties::extraFileTags() const { diff --git a/src/lib/corelib/language/deprecationinfo.h b/src/lib/corelib/language/deprecationinfo.h index 502715b84..220f99ad3 100644 --- a/src/lib/corelib/language/deprecationinfo.h +++ b/src/lib/corelib/language/deprecationinfo.h @@ -54,7 +54,7 @@ public: : m_removalVersion(removalVersion) , m_additionalUserInfo(additionalUserInfo) {} - DeprecationInfo() {} + DeprecationInfo() = default; bool isValid() const { return m_removalVersion.isValid(); } Version removalVersion() const { return m_removalVersion; } diff --git a/src/lib/corelib/language/identifiersearch.cpp b/src/lib/corelib/language/identifiersearch.cpp index 973aae6a8..49ceab36c 100644 --- a/src/lib/corelib/language/identifiersearch.cpp +++ b/src/lib/corelib/language/identifiersearch.cpp @@ -43,9 +43,7 @@ namespace qbs { namespace Internal { -IdentifierSearch::IdentifierSearch() -{ -} +IdentifierSearch::IdentifierSearch() = default; void IdentifierSearch::start(QbsQmlJS::AST::Node *node) { diff --git a/src/lib/corelib/language/itempool.cpp b/src/lib/corelib/language/itempool.cpp index 3da8b947b..ccd22fe2e 100644 --- a/src/lib/corelib/language/itempool.cpp +++ b/src/lib/corelib/language/itempool.cpp @@ -43,9 +43,7 @@ namespace qbs { namespace Internal { -ItemPool::ItemPool() -{ -} +ItemPool::ItemPool() = default; ItemPool::~ItemPool() { diff --git a/src/lib/corelib/language/itemreadervisitorstate.cpp b/src/lib/corelib/language/itemreadervisitorstate.cpp index ca6ba2e12..20ddb5cfb 100644 --- a/src/lib/corelib/language/itemreadervisitorstate.cpp +++ b/src/lib/corelib/language/itemreadervisitorstate.cpp @@ -81,10 +81,7 @@ public: { } - ASTCacheValue(const ASTCacheValue &other) - : d(other.d) - { - } + ASTCacheValue(const ASTCacheValue &other) = default; void setProcessingFlag(bool b) { d->processing = b; } bool isProcessing() const { return d->processing; } diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 40549b836..53715fd57 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -188,15 +188,9 @@ void ResolvedGroup::store(PersistentPool &pool) * \sa Rule */ -ScriptFunction::ScriptFunction() -{ - -} - -ScriptFunction::~ScriptFunction() -{ +ScriptFunction::ScriptFunction() = default; -} +ScriptFunction::~ScriptFunction() = default; /*! * \variable ScriptFunction::script @@ -312,9 +306,7 @@ ResolvedProduct::ResolvedProduct() { } -ResolvedProduct::~ResolvedProduct() -{ -} +ResolvedProduct::~ResolvedProduct() = default; void ResolvedProduct::accept(BuildGraphVisitor *visitor) const { @@ -524,9 +516,7 @@ ResolvedProject::ResolvedProject() : enabled(true), m_topLevelProject(nullptr) { } -ResolvedProject::~ResolvedProject() -{ -} +ResolvedProject::~ResolvedProject() = default; void ResolvedProject::accept(BuildGraphVisitor *visitor) const { diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index 65879dd56..2d934edc2 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -99,7 +99,7 @@ public: private: FileTagger(const QStringList &patterns, FileTags fileTags, int priority); - FileTagger() {} + FileTagger() = default; void setPatterns(const QStringList &patterns); @@ -139,7 +139,7 @@ public: } private: - Probe() {} + Probe() = default; Probe(const QString &globalId, const CodeLocation &location, bool condition, @@ -378,7 +378,7 @@ public: } private: - ResolvedModule() {} + ResolvedModule() = default; }; bool operator==(const ResolvedModule &m1, const ResolvedModule &m2); inline bool operator!=(const ResolvedModule &m1, const ResolvedModule &m2) { return !(m1 == m2); } diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index 85a2467f2..2a7a89727 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -218,7 +218,7 @@ private: { Q_DISABLE_COPY(TopLevelProjectContext) public: - TopLevelProjectContext() {} + TopLevelProjectContext() = default; ~TopLevelProjectContext() { qDeleteAll(projects); } std::vector<ProjectContext *> projects; diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 049472310..868ad32af 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -126,9 +126,7 @@ ProjectResolver::ProjectResolver(Evaluator *evaluator, ModuleLoaderResult loadRe QBS_CHECK(FileInfo::isAbsolute(m_setupParams.buildRoot())); } -ProjectResolver::~ProjectResolver() -{ -} +ProjectResolver::~ProjectResolver() = default; void ProjectResolver::setProgressObserver(ProgressObserver *observer) { diff --git a/src/lib/corelib/language/propertydeclaration.cpp b/src/lib/corelib/language/propertydeclaration.cpp index 5ea6a3d88..abe6a1626 100644 --- a/src/lib/corelib/language/propertydeclaration.cpp +++ b/src/lib/corelib/language/propertydeclaration.cpp @@ -84,20 +84,11 @@ PropertyDeclaration::PropertyDeclaration(const QString &name, Type type, d->flags = flags; } -PropertyDeclaration::PropertyDeclaration(const PropertyDeclaration &other) - : d(other.d) -{ -} +PropertyDeclaration::PropertyDeclaration(const PropertyDeclaration &other) = default; -PropertyDeclaration::~PropertyDeclaration() -{ -} +PropertyDeclaration::~PropertyDeclaration() = default; -PropertyDeclaration &PropertyDeclaration::operator=(const PropertyDeclaration &other) -{ - d = other.d; - return *this; -} +PropertyDeclaration &PropertyDeclaration::operator=(const PropertyDeclaration &other) = default; bool PropertyDeclaration::isValid() const { diff --git a/src/lib/corelib/language/propertymapinternal.cpp b/src/lib/corelib/language/propertymapinternal.cpp index 2a35e2a6a..fe0f672c5 100644 --- a/src/lib/corelib/language/propertymapinternal.cpp +++ b/src/lib/corelib/language/propertymapinternal.cpp @@ -58,13 +58,9 @@ namespace Internal { * \sa ResolvedProduct * \sa SourceArtifact */ -PropertyMapInternal::PropertyMapInternal() -{ -} +PropertyMapInternal::PropertyMapInternal() = default; -PropertyMapInternal::PropertyMapInternal(const PropertyMapInternal &other) : m_value(other.m_value) -{ -} +PropertyMapInternal::PropertyMapInternal(const PropertyMapInternal &other) = default; QVariant PropertyMapInternal::moduleProperty(const QString &moduleName, const QString &key, bool *isPresent) const diff --git a/src/lib/corelib/language/qualifiedid.cpp b/src/lib/corelib/language/qualifiedid.cpp index 5cc315bb1..9eb0e9463 100644 --- a/src/lib/corelib/language/qualifiedid.cpp +++ b/src/lib/corelib/language/qualifiedid.cpp @@ -44,9 +44,7 @@ namespace qbs { namespace Internal { -QualifiedId::QualifiedId() -{ -} +QualifiedId::QualifiedId() = default; QualifiedId::QualifiedId(const QString &singlePartName) : QStringList(singlePartName) diff --git a/src/lib/corelib/language/resolvedfilecontext.h b/src/lib/corelib/language/resolvedfilecontext.h index 81a3f7472..d783cf725 100644 --- a/src/lib/corelib/language/resolvedfilecontext.h +++ b/src/lib/corelib/language/resolvedfilecontext.h @@ -65,7 +65,7 @@ public: pool.serializationOp<opType>(m_filePath, m_jsExtensions, m_searchPaths, m_jsImports); } private: - ResolvedFileContext() {} + ResolvedFileContext() = default; ResolvedFileContext(const FileContextBase &ctx); }; diff --git a/src/lib/corelib/language/value.cpp b/src/lib/corelib/language/value.cpp index 656f38874..f8cd3ad26 100644 --- a/src/lib/corelib/language/value.cpp +++ b/src/lib/corelib/language/value.cpp @@ -61,9 +61,7 @@ Value::Value(const Value &other) { } -Value::~Value() -{ -} +Value::~Value() = default; Item *Value::definingItem() const { @@ -115,9 +113,7 @@ JSSourceValuePtr JSSourceValue::create(bool createdByPropertiesBlock) return JSSourceValuePtr(new JSSourceValue(createdByPropertiesBlock)); } -JSSourceValue::~JSSourceValue() -{ -} +JSSourceValue::~JSSourceValue() = default; ValuePtr JSSourceValue::clone() const { diff --git a/src/lib/corelib/language/value.h b/src/lib/corelib/language/value.h index f27406f2d..a48e974d3 100644 --- a/src/lib/corelib/language/value.h +++ b/src/lib/corelib/language/value.h @@ -156,7 +156,7 @@ public: CodeLocation location; }; - Alternative() { } + Alternative() = default; Alternative(const PropertyData &c, const PropertyData &o, const JSSourceValuePtr &v) : condition(c), overrideListProperties(o), value(v) {} Alternative clone() const diff --git a/src/lib/corelib/parser/qmljsast_p.h b/src/lib/corelib/parser/qmljsast_p.h index 8c6f32140..abc5d5514 100644 --- a/src/lib/corelib/parser/qmljsast_p.h +++ b/src/lib/corelib/parser/qmljsast_p.h @@ -221,7 +221,7 @@ public: // NOTE: node destructors are never called, // instead we block free the memory // (see the NodePool class) - virtual ~Node() {} + virtual ~Node() = default; virtual ExpressionNode *expressionCast(); virtual BinaryExpression *binaryExpressionCast(); @@ -245,7 +245,7 @@ public: class QML_PARSER_EXPORT ExpressionNode: public Node { public: - ExpressionNode() {} + ExpressionNode() = default; ExpressionNode *expressionCast() override; }; @@ -253,7 +253,7 @@ public: class QML_PARSER_EXPORT Statement: public Node { public: - Statement() {} + Statement() = default; Statement *statementCast() override; }; diff --git a/src/lib/corelib/parser/qmljsastvisitor.cpp b/src/lib/corelib/parser/qmljsastvisitor.cpp index fcb84ec7e..f034a147e 100644 --- a/src/lib/corelib/parser/qmljsastvisitor.cpp +++ b/src/lib/corelib/parser/qmljsastvisitor.cpp @@ -42,13 +42,9 @@ namespace QbsQmlJS { namespace AST { -Visitor::Visitor() -{ -} +Visitor::Visitor() = default; -Visitor::~Visitor() -{ -} +Visitor::~Visitor() = default; } // namespace AST } // namespace QbsQmlJS diff --git a/src/lib/corelib/parser/qmljsengine_p.cpp b/src/lib/corelib/parser/qmljsengine_p.cpp index 211743190..750a57d1f 100644 --- a/src/lib/corelib/parser/qmljsengine_p.cpp +++ b/src/lib/corelib/parser/qmljsengine_p.cpp @@ -121,8 +121,7 @@ Engine::Engine() : _lexer(nullptr), _directives(nullptr) { } -Engine::~Engine() -{ } +Engine::~Engine() = default; void Engine::setCode(const QString &code) { _code = code; } diff --git a/src/lib/corelib/parser/qmljslexer_p.h b/src/lib/corelib/parser/qmljslexer_p.h index e9dff1dd4..cf41fb255 100644 --- a/src/lib/corelib/parser/qmljslexer_p.h +++ b/src/lib/corelib/parser/qmljslexer_p.h @@ -62,7 +62,7 @@ class Engine; class QML_PARSER_EXPORT Directives { public: - virtual ~Directives() {} + virtual ~Directives() = default; virtual void pragmaLibrary() { diff --git a/src/lib/corelib/parser/qmljsmemorypool_p.h b/src/lib/corelib/parser/qmljsmemorypool_p.h index 897348712..f7de7bbfb 100644 --- a/src/lib/corelib/parser/qmljsmemorypool_p.h +++ b/src/lib/corelib/parser/qmljsmemorypool_p.h @@ -154,8 +154,8 @@ class QML_PARSER_EXPORT Managed void operator = (const Managed &other); public: - Managed() {} - ~Managed() {} + Managed() = default; + ~Managed() = default; void *operator new(size_t size, MemoryPool *pool) { return pool->allocate(size); } void operator delete(void *) {} 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) diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp index bc13ec480..93be2804b 100644 --- a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp +++ b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp @@ -58,9 +58,7 @@ using namespace Internal; const QString ClangCompilationDatabaseGenerator::DefaultDatabaseFileName = QStringLiteral("compile_commands.json"); -ClangCompilationDatabaseGenerator::ClangCompilationDatabaseGenerator() -{ -} +ClangCompilationDatabaseGenerator::ClangCompilationDatabaseGenerator() = default; QString ClangCompilationDatabaseGenerator::generatorName() const { diff --git a/src/plugins/generator/visualstudio/io/visualstudiosolutionwriter.cpp b/src/plugins/generator/visualstudio/io/visualstudiosolutionwriter.cpp index e980249d6..625489ac6 100644 --- a/src/plugins/generator/visualstudio/io/visualstudiosolutionwriter.cpp +++ b/src/plugins/generator/visualstudio/io/visualstudiosolutionwriter.cpp @@ -64,9 +64,7 @@ VisualStudioSolutionWriter::VisualStudioSolutionWriter(std::ostream *device) d->device = device; } -VisualStudioSolutionWriter::~VisualStudioSolutionWriter() -{ -} +VisualStudioSolutionWriter::~VisualStudioSolutionWriter() = default; std::string VisualStudioSolutionWriter::projectBaseDirectory() const { diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.cpp b/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.cpp index c51f0e517..81078ecb9 100644 --- a/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.cpp +++ b/src/plugins/generator/visualstudio/msbuild/imsbuildgroup.cpp @@ -45,9 +45,7 @@ IMSBuildGroup::IMSBuildGroup(MSBuildProject *parent) { } -IMSBuildGroup::~IMSBuildGroup() -{ -} +IMSBuildGroup::~IMSBuildGroup() = default; QString IMSBuildGroup::condition() const { diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildnode.cpp b/src/plugins/generator/visualstudio/msbuild/imsbuildnode.cpp index 4c70405c2..f563f7b07 100644 --- a/src/plugins/generator/visualstudio/msbuild/imsbuildnode.cpp +++ b/src/plugins/generator/visualstudio/msbuild/imsbuildnode.cpp @@ -32,8 +32,6 @@ namespace qbs { -IMSBuildNode::~IMSBuildNode() -{ -} +IMSBuildNode::~IMSBuildNode() = default; } // namespace qbs diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildnodevisitor.h b/src/plugins/generator/visualstudio/msbuild/imsbuildnodevisitor.h index fe75c23f9..84239d648 100644 --- a/src/plugins/generator/visualstudio/msbuild/imsbuildnodevisitor.h +++ b/src/plugins/generator/visualstudio/msbuild/imsbuildnodevisitor.h @@ -46,7 +46,7 @@ class MSBuildPropertyGroup; class IMSBuildNodeVisitor { public: - virtual ~IMSBuildNodeVisitor() {} + virtual ~IMSBuildNodeVisitor() = default; virtual void visitStart(const MSBuildImport *import) = 0; virtual void visitEnd(const MSBuildImport *import) = 0; diff --git a/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.cpp b/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.cpp index 6e54f1e43..be18f1a5b 100644 --- a/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.cpp +++ b/src/plugins/generator/visualstudio/msbuild/imsbuildproperty.cpp @@ -46,9 +46,7 @@ IMSBuildProperty::IMSBuildProperty(QObject *parent) { } -IMSBuildProperty::~IMSBuildProperty() -{ -} +IMSBuildProperty::~IMSBuildProperty() = default; QString IMSBuildProperty::condition() const { diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp index 26c08cacb..4ad7c725a 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfileitem.cpp @@ -46,9 +46,7 @@ MSBuildFileItem::MSBuildFileItem(const QString &name, IMSBuildItemGroup *parent) d->filter.reset(new MSBuildItemMetadata(QStringLiteral("Filter"), QVariant())); } -MSBuildFileItem::~MSBuildFileItem() -{ -} +MSBuildFileItem::~MSBuildFileItem() = default; QString MSBuildFileItem::filePath() const { diff --git a/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.cpp b/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.cpp index f7c506651..0b9c2c86a 100644 --- a/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.cpp +++ b/src/plugins/generator/visualstudio/msbuild/items/msbuildfilter.cpp @@ -68,9 +68,7 @@ MSBuildFilter::MSBuildFilter(const QString &name, setExtensions(extensions); } -MSBuildFilter::~MSBuildFilter() -{ -} +MSBuildFilter::~MSBuildFilter() = default; QUuid MSBuildFilter::identifier() const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildimport.cpp b/src/plugins/generator/visualstudio/msbuild/msbuildimport.cpp index a0c693aff..000af4496 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildimport.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuildimport.cpp @@ -55,9 +55,7 @@ MSBuildImport::MSBuildImport(MSBuildImportGroup *parent) { } -MSBuildImport::~MSBuildImport() -{ -} +MSBuildImport::~MSBuildImport() = default; QString MSBuildImport::project() const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.cpp b/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.cpp index 73e1922db..d84d81783 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuildimportgroup.cpp @@ -47,9 +47,7 @@ MSBuildImportGroup::MSBuildImportGroup(MSBuildProject *parent) { } -MSBuildImportGroup::~MSBuildImportGroup() -{ -} +MSBuildImportGroup::~MSBuildImportGroup() = default; QString MSBuildImportGroup::label() const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditem.cpp b/src/plugins/generator/visualstudio/msbuild/msbuilditem.cpp index b11b62295..ed181a453 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditem.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditem.cpp @@ -51,9 +51,7 @@ MSBuildItem::MSBuildItem(const QString &name, IMSBuildItemGroup *parent) setName(name); } -MSBuildItem::~MSBuildItem() -{ -} +MSBuildItem::~MSBuildItem() = default; QString MSBuildItem::name() const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.cpp b/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.cpp index 5228e850e..1479577c5 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemdefinitiongroup.cpp @@ -40,9 +40,7 @@ MSBuildItemDefinitionGroup::MSBuildItemDefinitionGroup(MSBuildProject *parent) { } -MSBuildItemDefinitionGroup::~MSBuildItemDefinitionGroup() -{ -} +MSBuildItemDefinitionGroup::~MSBuildItemDefinitionGroup() = default; void MSBuildItemDefinitionGroup::accept(IMSBuildNodeVisitor *visitor) const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp index c4e80ecc7..48f919709 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuilditemgroup.cpp @@ -49,9 +49,7 @@ MSBuildItemGroup::MSBuildItemGroup(MSBuildProject *parent) { } -MSBuildItemGroup::~MSBuildItemGroup() -{ -} +MSBuildItemGroup::~MSBuildItemGroup() = default; QString MSBuildItemGroup::label() const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildproject.cpp b/src/plugins/generator/visualstudio/msbuild/msbuildproject.cpp index c872622b9..11b5b81ea 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildproject.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuildproject.cpp @@ -52,9 +52,7 @@ MSBuildProject::MSBuildProject(QObject *parent) { } -MSBuildProject::~MSBuildProject() -{ -} +MSBuildProject::~MSBuildProject() = default; QString MSBuildProject::defaultTargets() const { diff --git a/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.cpp b/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.cpp index 4f9c72939..5acb73dad 100644 --- a/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.cpp +++ b/src/plugins/generator/visualstudio/msbuild/msbuildpropertygroup.cpp @@ -48,9 +48,7 @@ MSBuildPropertyGroup::MSBuildPropertyGroup(MSBuildProject *parent) { } -MSBuildPropertyGroup::~MSBuildPropertyGroup() -{ -} +MSBuildPropertyGroup::~MSBuildPropertyGroup() = default; QString MSBuildPropertyGroup::label() const { diff --git a/src/plugins/generator/visualstudio/msbuildtargetproject.cpp b/src/plugins/generator/visualstudio/msbuildtargetproject.cpp index 154f8dccc..bcd654061 100644 --- a/src/plugins/generator/visualstudio/msbuildtargetproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildtargetproject.cpp @@ -83,9 +83,7 @@ MSBuildTargetProject::MSBuildTargetProject(const GeneratableProject &project, propertySheetsImportGroup(); } -MSBuildTargetProject::~MSBuildTargetProject() -{ -} +MSBuildTargetProject::~MSBuildTargetProject() = default; const Internal::VisualStudioVersionInfo &MSBuildTargetProject::versionInfo() const { diff --git a/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.cpp b/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.cpp index f3a6a0cbd..4623b5d4d 100644 --- a/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.cpp +++ b/src/plugins/generator/visualstudio/solution/ivisualstudiosolutionproject.cpp @@ -46,9 +46,7 @@ IVisualStudioSolutionProject::IVisualStudioSolutionProject(QObject *parent) { } -IVisualStudioSolutionProject::~IVisualStudioSolutionProject() -{ -} +IVisualStudioSolutionProject::~IVisualStudioSolutionProject() = default; QUuid IVisualStudioSolutionProject::guid() const { diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp b/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp index c09ef1f4f..89b266647 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp @@ -57,9 +57,7 @@ VisualStudioSolution::VisualStudioSolution(const Internal::VisualStudioVersionIn { } -VisualStudioSolution::~VisualStudioSolution() -{ -} +VisualStudioSolution::~VisualStudioSolution() = default; Internal::VisualStudioVersionInfo VisualStudioSolution::versionInfo() const { diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.cpp b/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.cpp index d66f47cf7..ab5db088d 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.cpp +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolutionfileproject.cpp @@ -48,9 +48,7 @@ VisualStudioSolutionFileProject::VisualStudioSolutionFileProject(const QString & setFilePath(filePath); } -VisualStudioSolutionFileProject::~VisualStudioSolutionFileProject() -{ -} +VisualStudioSolutionFileProject::~VisualStudioSolutionFileProject() = default; QString VisualStudioSolutionFileProject::name() const { diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.cpp b/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.cpp index 1e4f5fd01..b882991d4 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.cpp +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolutionglobalsection.cpp @@ -51,9 +51,7 @@ VisualStudioSolutionGlobalSection::VisualStudioSolutionGlobalSection(const QStri setName(name); } -VisualStudioSolutionGlobalSection::~VisualStudioSolutionGlobalSection() -{ -} +VisualStudioSolutionGlobalSection::~VisualStudioSolutionGlobalSection() = default; QString VisualStudioSolutionGlobalSection::name() const { diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp index ace55b6e6..2ce54e73e 100644 --- a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp +++ b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp @@ -158,9 +158,7 @@ VisualStudioGenerator::VisualStudioGenerator(const VisualStudioVersionInfo &vers Q_ASSERT(d->versionInfo.usesSolutions()); } -VisualStudioGenerator::~VisualStudioGenerator() -{ -} +VisualStudioGenerator::~VisualStudioGenerator() = default; QString VisualStudioGenerator::generatorName() const { diff --git a/src/plugins/scanner/cpp/Lexer.cpp b/src/plugins/scanner/cpp/Lexer.cpp index 4e06f93b4..272d32d09 100644 --- a/src/plugins/scanner/cpp/Lexer.cpp +++ b/src/plugins/scanner/cpp/Lexer.cpp @@ -70,8 +70,7 @@ Lexer::Lexer(const char *firstChar, const char *lastChar) setSource(firstChar, lastChar); } -Lexer::~Lexer() -{ } +Lexer::~Lexer() = default; void Lexer::setSource(const char *firstChar, const char *lastChar) { diff --git a/src/plugins/scanner/cpp/Token.cpp b/src/plugins/scanner/cpp/Token.cpp index f8b017fdb..603918f63 100644 --- a/src/plugins/scanner/cpp/Token.cpp +++ b/src/plugins/scanner/cpp/Token.cpp @@ -118,9 +118,7 @@ Token::Token() : { } -Token::~Token() -{ -} +Token::~Token() = default; void Token::reset() { diff --git a/tests/benchmarker/commandlineparser.cpp b/tests/benchmarker/commandlineparser.cpp index 4e5052453..e725ad0a0 100644 --- a/tests/benchmarker/commandlineparser.cpp +++ b/tests/benchmarker/commandlineparser.cpp @@ -41,9 +41,7 @@ static QString ruleExecutionActivity() { return "rule-execution"; } static QString nullBuildActivity() { return "null-build"; } static QString allActivities() { return "all"; } -CommandLineParser::CommandLineParser() -{ -} +CommandLineParser::CommandLineParser() = default; void CommandLineParser::parse() { diff --git a/tests/benchmarker/exception.h b/tests/benchmarker/exception.h index b4df36974..216189b70 100644 --- a/tests/benchmarker/exception.h +++ b/tests/benchmarker/exception.h @@ -36,7 +36,7 @@ namespace qbsBenchmarker { class Exception : public QException { public: explicit Exception(const QString &description) : m_description(description) {} - ~Exception() throw() override { } + ~Exception() throw() override = default; QString description() const { return m_description; } diff --git a/tests/fuzzy-test/commandlineparser.cpp b/tests/fuzzy-test/commandlineparser.cpp index 18515604b..23be7b0ad 100644 --- a/tests/fuzzy-test/commandlineparser.cpp +++ b/tests/fuzzy-test/commandlineparser.cpp @@ -37,9 +37,7 @@ static QString maxDurationoption() { return "--max-duration"; } static QString jobCountOption() { return "--jobs"; } static QString logOption() { return "--log"; } -CommandLineParser::CommandLineParser() -{ -} +CommandLineParser::CommandLineParser() = default; void CommandLineParser::parse(const QStringList &commandLine) { diff --git a/tests/fuzzy-test/commandlineparser.h b/tests/fuzzy-test/commandlineparser.h index a000a515d..6dcbf84bc 100644 --- a/tests/fuzzy-test/commandlineparser.h +++ b/tests/fuzzy-test/commandlineparser.h @@ -36,7 +36,7 @@ class ParseException : public std::exception { public: ParseException(const QString &error) : errorMessage(error) { } - ~ParseException() throw() override {} + ~ParseException() throw() override = default; QString errorMessage; diff --git a/tests/fuzzy-test/fuzzytester.h b/tests/fuzzy-test/fuzzytester.h index 2d75bb1af..bc1fc5f18 100644 --- a/tests/fuzzy-test/fuzzytester.h +++ b/tests/fuzzy-test/fuzzytester.h @@ -36,7 +36,7 @@ class TestError { public: TestError(const QString &errorMessage) : errorMessage(errorMessage) {} - ~TestError() throw() {} + ~TestError() throw() = default; QString errorMessage; |