From 28e67be84c418cb661e7c32f2326d0e665320a1e Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 30 Jan 2018 16:39:05 +0100
Subject: One central place to generate uids

---
 common/domain/applicationdomaintype.cpp | 5 +++--
 common/domain/applicationdomaintype.h   | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'common/domain')

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 5cc89b3..c1ac7e8 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -23,6 +23,7 @@
 #include "definitions.h"
 #include "propertyregistry.h"
 #include "storage.h" //for generateUid()
+#include "utils.h" //for generateUid()
 #include <QFile>
 
 QDebug Sink::ApplicationDomain::operator<< (QDebug d, const Sink::ApplicationDomain::Mail::Contact &c)
@@ -145,7 +146,7 @@ void copyBuffer(Sink::ApplicationDomain::BufferAdaptor &buffer, Sink::Applicatio
         const auto value = buffer.getProperty(property);
         if (copyBlobs && value.canConvert<BLOB>()) {
             const auto oldPath = value.value<BLOB>().value;
-            const auto newPath = Sink::temporaryFileLocation() + "/" + QUuid::createUuid().toString();
+            const auto newPath = Sink::temporaryFileLocation() + "/" + createUuid();
             if (!QFile::copy(oldPath, newPath)) {
                 SinkWarning() << "Failed to copy file from: " << oldPath << "to: " << newPath;
             }
@@ -257,7 +258,7 @@ QByteArray ApplicationDomainType::getBlobProperty(const QByteArray &key) const
 
 void ApplicationDomainType::setBlobProperty(const QByteArray &key, const QByteArray &value)
 {
-    const auto path = Sink::temporaryFileLocation() + "/" + QUuid::createUuid().toString();
+    const auto path = Sink::temporaryFileLocation() + "/" + createUuid();
     QFile file(path);
     if (!file.open(QIODevice::WriteOnly)) {
         SinkError() << "Failed to open the file for writing: " << file.errorString() << path << " For property " << key;
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index dc4cbe1..77754c1 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -25,7 +25,6 @@
 #include <QByteArray>
 #include <QDateTime>
 #include <QDebug>
-#include <QUuid>
 #include "bufferadaptor.h"
 
 #define SINK_ENTITY(TYPE, LOWERCASENAME) \
-- 
cgit v1.2.3