summaryrefslogtreecommitdiffstats
path: root/common/domain
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-02-01 13:41:18 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-02-01 13:41:18 +0100
commit0acdfd2ac2dd3ebfb05c96e065c896fb2ed4734f (patch)
treeb35044cfbb9270dcc899ea3195742c82f295fd9a /common/domain
parent49d8916d3c97c1e1d8b428f8ad27a75ae18d3cfa (diff)
downloadsink-0acdfd2ac2dd3ebfb05c96e065c896fb2ed4734f.tar.gz
sink-0acdfd2ac2dd3ebfb05c96e065c896fb2ed4734f.zip
We can't inhert the copy constructor.
An the compiler in fedora 26 also tells us that.
Diffstat (limited to 'common/domain')
-rw-r--r--common/domain/applicationdomaintype.cpp30
-rw-r--r--common/domain/applicationdomaintype.h6
2 files changed, 4 insertions, 32 deletions
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
202 return mIdentifier; 202 return mIdentifier;
203} 203}
204 204
205Entity::~Entity()
206{
207
208}
209
210Contact::~Contact()
211{
212
213}
214
215Event::~Event()
216{
217
218}
219
220Todo::~Todo()
221{
222
223}
224
225Mail::~Mail()
226{
227
228}
229
230Folder::~Folder()
231{
232
233}
234
235SinkResource::SinkResource(const QByteArray &identifier) 205SinkResource::SinkResource(const QByteArray &identifier)
236 : ApplicationDomainType("", identifier, 0, QSharedPointer<BufferAdaptor>(new MemoryBufferAdaptor())) 206 : ApplicationDomainType("", identifier, 0, QSharedPointer<BufferAdaptor>(new MemoryBufferAdaptor()))
237{ 207{
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 @@
31#define SINK_ENTITY(TYPE) \ 31#define SINK_ENTITY(TYPE) \
32 typedef QSharedPointer<TYPE> Ptr; \ 32 typedef QSharedPointer<TYPE> Ptr; \
33 using Entity::Entity; \ 33 using Entity::Entity; \
34 virtual ~TYPE(); \ 34 TYPE() = default; \
35 TYPE(const ApplicationDomainType &o) : Entity(o) {} \
36 virtual ~TYPE() = default; \
35 static TYPE create(const QByteArray &resource) { return createEntity<TYPE>(resource); }; \ 37 static TYPE create(const QByteArray &resource) { return createEntity<TYPE>(resource); }; \
36 38
37 39
@@ -325,7 +327,7 @@ struct SINK_EXPORT Entity : public ApplicationDomainType {
325 using ApplicationDomainType::ApplicationDomainType; 327 using ApplicationDomainType::ApplicationDomainType;
326 Entity() = default; 328 Entity() = default;
327 Entity(const ApplicationDomainType &other) : ApplicationDomainType(other) {} 329 Entity(const ApplicationDomainType &other) : ApplicationDomainType(other) {}
328 virtual ~Entity(); 330 virtual ~Entity() = default;
329}; 331};
330 332
331struct SINK_EXPORT Contact : public Entity { 333struct SINK_EXPORT Contact : public Entity {