Adapt to new interfaces

include/openspace/util/task.h

@@ -39,7 +39,7 @@ public:
     virtual void perform(const ProgressCallback& onProgress) = 0;
     virtual std::string description() = 0;
     static std::unique_ptr<Task> createFromDictionary(const ghoul::Dictionary& dictionary);
-    static openspace::Documentation documentation();
+    static documentation::Documentation documentation();
 };
 
 }

modules/kameleonvolume/kameleonvolumemodule.cpp

@@ -50,9 +50,9 @@ void KameleonVolumeModule::internalInitialize() {
   
 }
 
-std::vector<Documentation> KameleonVolumeModule::documentations() const
+std::vector<documentation::Documentation> KameleonVolumeModule::documentations() const
 {
-    return std::vector<Documentation>{KameleonMetadataToJsonTask::documentation()};
+    return std::vector<documentation::Documentation>{KameleonMetadataToJsonTask::documentation()};
 }
 
 } // namespace openspace

modules/kameleonvolume/kameleonvolumemodule.h

@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_KAMELEONVOLUME___BASEMODULE___H__
 
 #include <openspace/util/openspacemodule.h>
+#include <openspace/documentation/documentation.h>
 
 namespace openspace {
 
@@ -34,7 +35,7 @@ public:
     KameleonVolumeModule();
     virtual ~KameleonVolumeModule() = default;
     void internalInitialize() override;
-    std::vector<Documentation> documentations() const override;
+    std::vector<documentation::Documentation> documentations() const override;
 };
 
 } // namespace openspace

modules/kameleonvolume/tasks/kameleondocumentationtask.cpp

@@ -131,8 +131,7 @@ void KameleonDocumentationTask::perform(const Task::ProgressCallback & progressC
     progressCallback(1.0f);
 }
 
-Documentation KameleonDocumentationTask::documentation()
-{
+documentation::Documentation KameleonDocumentationTask::documentation() {
     using namespace documentation;
     return {
         "KameleonDocumentationTask",

modules/kameleonvolume/tasks/kameleondocumentationtask.h

@@ -34,7 +34,7 @@ public:
     KameleonDocumentationTask(const ghoul::Dictionary& dictionary);
     std::string description() override;
     void perform(const Task::ProgressCallback& progressCallback) override;
-    static Documentation documentation();
+    static documentation::Documentation documentation();
 private:
     std::string _inputPath;
     std::string _outputPath;

modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp

@@ -63,7 +63,7 @@ void KameleonMetadataToJsonTask::perform(const Task::ProgressCallback & progress
     progressCallback(1.0f);
 }
 
-Documentation KameleonMetadataToJsonTask::documentation()
+documentation::Documentation KameleonMetadataToJsonTask::documentation()
 {
     using namespace documentation;
     return {

modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h

@@ -34,7 +34,7 @@ public:
     KameleonMetadataToJsonTask(const ghoul::Dictionary& dictionary);
     std::string description() override;
     void perform(const Task::ProgressCallback& progressCallback) override;
-    static Documentation documentation();
+    static documentation::Documentation documentation();
 private:
     std::string _inputPath;
     std::string _outputPath;

src/util/task.cpp

@@ -34,7 +34,7 @@ namespace {
 
 namespace openspace {
 
-Documentation Task::documentation() {
+documentation::Documentation Task::documentation() {
     using namespace openspace::documentation;
     return{
         "Renderable",
@@ -54,17 +54,17 @@ Documentation Task::documentation() {
 }
 
 std::unique_ptr<Task> Task::createFromDictionary(const ghoul::Dictionary& dictionary) {
-    openspace::documentation::testSpecificationAndThrow(Documentation(), dictionary, "Task");
+    openspace::documentation::testSpecificationAndThrow(documentation::Documentation(), dictionary, "Task");
     std::string taskType = dictionary.value<std::string>("Type");
     auto factory = FactoryManager::ref().factory<Task>();
-    Task *task = factory->create(taskType, dictionary);
+    std::unique_ptr<Task> task = factory->create(taskType, dictionary);
 
     if (task == nullptr) {
         LERROR("Failed to create a Task object of type '" << taskType << "'");
         return nullptr;
     }
 
-    return std::unique_ptr<Task>(task);
+    return std::move(task);
 }
 
 }