Two more version checks that are not needed now

remotes/origin/esari-master-patch-95617
Albert Astals Cid 3 years ago
parent 91afa74342
commit fc8059575e
  1. 4
      generators/poppler/generator_pdf.cpp
  2. 4
      part/part.cpp

@ -916,13 +916,9 @@ Okular::DocumentInfo PDFGenerator::generateDocumentInfo(const QSet<Okular::Docum
} }
if (keys.contains(Okular::DocumentInfo::CustomKeys)) { if (keys.contains(Okular::DocumentInfo::CustomKeys)) {
int major, minor; int major, minor;
#if POPPLER_VERSION_MACRO >= QT_VERSION_CHECK(21, 8, 0)
auto version = pdfdoc->getPdfVersion(); auto version = pdfdoc->getPdfVersion();
major = version.major; major = version.major;
minor = version.minor; minor = version.minor;
#else
pdfdoc->getPdfVersion(&major, &minor);
#endif
docInfo.set(QStringLiteral("format"), i18nc("PDF v. <version>", "PDF v. %1.%2", major, minor), i18n("Format")); docInfo.set(QStringLiteral("format"), i18nc("PDF v. <version>", "PDF v. %1.%2", major, minor), i18n("Format"));
docInfo.set(QStringLiteral("encryption"), pdfdoc->isEncrypted() ? i18n("Encrypted") : i18n("Unencrypted"), i18n("Security")); docInfo.set(QStringLiteral("encryption"), pdfdoc->isEncrypted() ? i18n("Encrypted") : i18n("Unencrypted"), i18n("Security"));
docInfo.set(QStringLiteral("optimization"), pdfdoc->isLinearized() ? i18n("Yes") : i18n("No"), i18n("Optimized")); docInfo.set(QStringLiteral("optimization"), pdfdoc->isLinearized() ? i18n("Yes") : i18n("No"), i18n("Optimized"));

@ -71,8 +71,6 @@
#ifdef WITH_KWALLET #ifdef WITH_KWALLET
#include <KWallet> #include <KWallet>
#endif #endif
#include "kconfigwidgets_version.h"
#include "kxmlgui_version.h" // TODO KF 5.79 Remove this include, because the relevant section below will also be removed.
#include <KXMLGUIClient> #include <KXMLGUIClient>
#include <KXMLGUIFactory> #include <KXMLGUIFactory>
@ -856,11 +854,9 @@ void Part::setupActions()
{ {
KActionCollection *ac = actionCollection(); KActionCollection *ac = actionCollection();
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 89, 0)
auto manager = new KColorSchemeManager(this); auto manager = new KColorSchemeManager(this);
KActionMenu *schemeMenu = manager->createSchemeSelectionMenu(this); KActionMenu *schemeMenu = manager->createSchemeSelectionMenu(this);
ac->addAction(QStringLiteral("colorscheme_menu"), schemeMenu->menu()->menuAction()); ac->addAction(QStringLiteral("colorscheme_menu"), schemeMenu->menu()->menuAction());
#endif
m_copy = KStandardAction::create(KStandardAction::Copy, m_pageView, SLOT(copyTextSelection()), ac); m_copy = KStandardAction::create(KStandardAction::Copy, m_pageView, SLOT(copyTextSelection()), ac);

Loading…
Cancel
Save