From 8a1bef81f89f991b93410921cdd0d0bbed7d4c2d Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 13 Sep 2020 01:21:11 +0200
Subject: [PATCH] Remove poppler 0.80 ifdefs since we require 0.86 now

---
 generators/poppler/CMakeLists.txt                | 11 -----------
 generators/poppler/config-okular-poppler.h.cmake |  3 ---
 generators/poppler/formfields.cpp                |  4 ----
 generators/poppler/generator_pdf.cpp             |  2 --
 4 files changed, 20 deletions(-)

diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
index 9a1cc6496..a0f295418 100644
--- a/generators/poppler/CMakeLists.txt
+++ b/generators/poppler/CMakeLists.txt
@@ -5,17 +5,6 @@ add_subdirectory( conf )
 
 set(CMAKE_REQUIRED_LIBRARIES Poppler::Qt5 Qt5::Core Qt5::Gui)
 
-check_cxx_source_compiles("
-#include <poppler-qt5.h>
-int main()
-{
-    Poppler::FontInfo info;
-    QString substituteName = info.substituteName();
-    (void)substituteName;
-    return 0;
-}
-" HAVE_POPPLER_0_80)
-
 check_cxx_source_compiles("
 #include <poppler-form.h>
 int main()
diff --git a/generators/poppler/config-okular-poppler.h.cmake b/generators/poppler/config-okular-poppler.h.cmake
index b44fe0d0d..0aa62f078 100644
--- a/generators/poppler/config-okular-poppler.h.cmake
+++ b/generators/poppler/config-okular-poppler.h.cmake
@@ -1,6 +1,3 @@
-/* Defined if we have the 0.80 version of the Poppler library */
-#cmakedefine HAVE_POPPLER_0_80 1
-
 /* Defined if we have the 0.87 version of the Poppler library */
 #cmakedefine HAVE_POPPLER_0_87 1
 
diff --git a/generators/poppler/formfields.cpp b/generators/poppler/formfields.cpp
index 5ceae5135..456e5e30a 100644
--- a/generators/poppler/formfields.cpp
+++ b/generators/poppler/formfields.cpp
@@ -235,11 +235,7 @@ void PopplerFormFieldText::setText(const QString &text)
 
 void PopplerFormFieldText::setAppearanceText(const QString &text)
 {
-#ifdef HAVE_POPPLER_0_80
     m_field->setAppearanceText(text);
-#else
-    Q_UNUSED(text);
-#endif
 }
 
 bool PopplerFormFieldText::isPassword() const
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 357c690a1..b990c11a7 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -933,9 +933,7 @@ Okular::FontInfo::List PDFGenerator::fontsForPage(int page)
     for (const Poppler::FontInfo &font : qAsConst(fonts)) {
         Okular::FontInfo of;
         of.setName(font.name());
-#ifdef HAVE_POPPLER_0_80
         of.setSubstituteName(font.substituteName());
-#endif
         of.setType(convertPopplerFontInfoTypeToOkularFontInfoType(font.type()));
         of.setEmbedType(embedTypeForPopplerFontInfo(font));
         of.setFile(font.file());