Adapt to removal of Singleton

This commit is contained in:
Alexander Bock
2018-11-05 14:17:42 -05:00
parent a130b0b7a0
commit cf593bd060
13 changed files with 98 additions and 23 deletions

View File

@@ -26,7 +26,6 @@
#define __OPENSPACE_CORE___DOCUMENTATIONENGINE___H__
#include <openspace/documentation/documentationgenerator.h>
#include <ghoul/designpattern/singleton.h>
#include <openspace/documentation/documentation.h>
#include <ghoul/misc/exception.h>
@@ -38,9 +37,7 @@ namespace openspace::documentation {
* produced in the application an write them out as a documentation file for human
* consumption.
*/
class DocumentationEngine : public ghoul::Singleton<DocumentationEngine>
, public DocumentationGenerator
{
class DocumentationEngine : public DocumentationGenerator {
public:
/**
* This exception is thrown by the addDocumentation method if a provided Documentation
@@ -80,6 +77,10 @@ public:
*/
std::vector<Documentation> documentations() const;
static void initialize();
static void deinitialize();
static bool isInitialized();
/**
* Returns a static reference to the main singleton DocumentationEngine.
*