From 0acdfd2ac2dd3ebfb05c96e065c896fb2ed4734f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 1 Feb 2017 13:41:18 +0100 Subject: We can't inhert the copy constructor. An the compiler in fedora 26 also tells us that. --- common/domain/applicationdomaintype.cpp | 30 ------------------------------ common/domain/applicationdomaintype.h | 6 ++++-- 2 files changed, 4 insertions(+), 32 deletions(-) (limited to 'common') diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp index 57d0f2d..29b50b9 100644 --- a/common/domain/applicationdomaintype.cpp +++ b/common/domain/applicationdomaintype.cpp @@ -202,36 +202,6 @@ QByteArray ApplicationDomainType::identifier() const return mIdentifier; } -Entity::~Entity() -{ - -} - -Contact::~Contact() -{ - -} - -Event::~Event() -{ - -} - -Todo::~Todo() -{ - -} - -Mail::~Mail() -{ - -} - -Folder::~Folder() -{ - -} - SinkResource::SinkResource(const QByteArray &identifier) : ApplicationDomainType("", identifier, 0, QSharedPointer(new MemoryBufferAdaptor())) { diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h index 8ebf6cb..9f2aad7 100644 --- a/common/domain/applicationdomaintype.h +++ b/common/domain/applicationdomaintype.h @@ -31,7 +31,9 @@ #define SINK_ENTITY(TYPE) \ typedef QSharedPointer Ptr; \ using Entity::Entity; \ - virtual ~TYPE(); \ + TYPE() = default; \ + TYPE(const ApplicationDomainType &o) : Entity(o) {} \ + virtual ~TYPE() = default; \ static TYPE create(const QByteArray &resource) { return createEntity(resource); }; \ @@ -325,7 +327,7 @@ struct SINK_EXPORT Entity : public ApplicationDomainType { using ApplicationDomainType::ApplicationDomainType; Entity() = default; Entity(const ApplicationDomainType &other) : ApplicationDomainType(other) {} - virtual ~Entity(); + virtual ~Entity() = default; }; struct SINK_EXPORT Contact : public Entity { -- cgit v1.2.3