From 1536781bdab237e28d054dcad4f9418ec9289acd Mon Sep 17 00:00:00 2001 From: Albert S Date: Sun, 24 Apr 2022 12:27:06 +0200 Subject: [PATCH] gui: PreviewGeneratorMapFunctor: Use PreviewGenerator::get() --- gui/previewgeneratormapfunctor.cpp | 23 ++--------------------- gui/previewgeneratormapfunctor.h | 4 ---- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/gui/previewgeneratormapfunctor.cpp b/gui/previewgeneratormapfunctor.cpp index ef08e8d..02ecb3c 100644 --- a/gui/previewgeneratormapfunctor.cpp +++ b/gui/previewgeneratormapfunctor.cpp @@ -3,26 +3,6 @@ PreviewGeneratorMapFunctor::PreviewGeneratorMapFunctor() { - generator[GeneratorIndex::PDF] = new PreviewGeneratorPdf(); -} - -PreviewGenerator *PreviewGeneratorMapFunctor::getGenerator(QString filePath) -{ - /* Dirty, but that's all we have at this point */ - if(filePath.endsWith(".pdf")) - { - return generator[GeneratorIndex::PDF]; - } - return nullptr; -} - -PreviewGeneratorMapFunctor::~PreviewGeneratorMapFunctor() -{ - for(int i = GeneratorIndex::PDF; i < GeneratorIndex::LAST_DUMMY; i++) - { - // delete generator[i]; - generator[i] = nullptr; - } } void PreviewGeneratorMapFunctor::setRenderConfig(RenderConfig config) @@ -32,7 +12,8 @@ void PreviewGeneratorMapFunctor::setRenderConfig(RenderConfig config) QSharedPointer PreviewGeneratorMapFunctor::operator()(const QSharedPointer &renderResult) { - PreviewGenerator *previewGenerator = getGenerator(renderResult->getDocumentPath()); + QFileInfo info{renderResult->getDocumentPath()}; + PreviewGenerator *previewGenerator = PreviewGenerator::get(info); if(previewGenerator == nullptr) { return QSharedPointer(); diff --git a/gui/previewgeneratormapfunctor.h b/gui/previewgeneratormapfunctor.h index 9097b8c..b390df3 100644 --- a/gui/previewgeneratormapfunctor.h +++ b/gui/previewgeneratormapfunctor.h @@ -14,16 +14,12 @@ class PreviewGeneratorMapFunctor LAST_DUMMY }; RenderConfig renderConfig; - PreviewGenerator *generator[LAST_DUMMY]; - PreviewGenerator *getGenerator(QString filePath); public: typedef QSharedPointer result_type; PreviewGeneratorMapFunctor(); - ~PreviewGeneratorMapFunctor(); - void setRenderConfig(RenderConfig config); QSharedPointer operator()(const QSharedPointer &renderResult);