LIB: A less messy VivyDocumentStore

src/Lib/Document/VivyDocumentStore.cc

@@ -10,11 +10,12 @@ VivyDocumentStore::loadDocument(const QString &file)
 {
     const QFileInfo fileinfo(file);
     const QString baseName = fileinfo.baseName();
+    auto ret               = std::make_shared<VivyDocument>(file);
 
-    if (VivyDocument *ret = new VivyDocument(file)) {
+    if (ret) {
         qDebug() << "Register document " << baseName << ret->getDocumentCapabilitiesString();
         const Uuid uuid = ret->getUuid();
-        documents[uuid] = std::shared_ptr<VivyDocument>(ret);
+        documents[uuid] = ret;
         return documents[uuid];
     } else {
         qDebug() << "Failed to create document from " << file;
@@ -26,8 +27,9 @@ std::shared_ptr<VivyDocument>
 VivyDocumentStore::newDocument(VivyDocument::Options opt)
 {
     const QString newDocName = newDocumentBaseName + QString::number(newDocumentNumber++);
+    auto ret                 = std::make_shared<VivyDocument>(newDocName, opt);
 
-    if (auto ret = std::make_shared<VivyDocument>(newDocName, opt)) {
+    if (ret) {
         const Uuid uuid = ret->getUuid();
         documents[uuid] = ret;
         qDebug() << "Create new document " << newDocName << "with uuid" << uuid;