Avoid extra dependency in public header.

2 files changed, 10 insertions, 3 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index e219608..a57a50b 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -21,6 +21,7 @@
 #include "log.h"
 #include "../bufferadaptor.h"
 #include "definitions.h"
+#include "storage.h" //for generateUid()
 #include <QFile>
 
 namespace Sink {
@@ -66,6 +67,11 @@ ApplicationDomainType::~ApplicationDomainType()
 {
 }
 
+QByteArray ApplicationDomainType::generateUid()
+{
+    return Sink::Storage::generateUid();
+}
+
 bool ApplicationDomainType::hasProperty(const QByteArray &key) const
 {
     Q_ASSERT(mAdaptor);
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index a41882d..b011eb5 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -27,7 +27,6 @@
 #include <QDebug>
 #include <QUuid>
 #include "bufferadaptor.h"
-#include "storage.h" //for generateUid()
 
 #define SINK_ENTITY(TYPE) \
     typedef QSharedPointer<TYPE> Ptr; \
@@ -102,11 +101,13 @@ public:
         return QSharedPointer<DomainType>::create(domainType.mResourceInstanceIdentifier, QByteArray(domainType.mIdentifier.constData(), domainType.mIdentifier.size()), domainType.mRevision, memoryAdaptor);
     }
 
+    static QByteArray generateUid();
+
     template <class DomainType>
     static DomainType createEntity()
     {
         DomainType object;
-        object.mIdentifier = Sink::Storage::generateUid();
+        object.mIdentifier = generateUid();
         return object;
     }
 
@@ -114,7 +115,7 @@ public:
     static DomainType createEntity(const QByteArray &resourceInstanceIdentifier)
     {
         DomainType object(resourceInstanceIdentifier);
-        object.mIdentifier = Sink::Storage::generateUid();
+        object.mIdentifier = generateUid();
         return object;
     }