From ea5bf621893b6059e20f3baa962b912dccd13e0c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Thu, 17 Sep 2020 00:12:04 +0200
Subject: [PATCH] We require KF 5.68 now, so cleanup some ifdefs

---
 ui/bookmarklist.cpp   |  2 --
 ui/layers.cpp         |  2 --
 ui/searchlineedit.cpp | 24 +++---------------------
 ui/searchlineedit.h   |  8 --------
 ui/side_reviews.cpp   |  2 --
 ui/signaturepanel.cpp |  2 --
 ui/thumbnaillist.cpp  |  2 --
 ui/toc.cpp            |  2 --
 8 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/ui/bookmarklist.cpp b/ui/bookmarklist.cpp
index 90c1caac2..87e00bba6 100644
--- a/ui/bookmarklist.cpp
+++ b/ui/bookmarklist.cpp
@@ -127,9 +127,7 @@ BookmarkList::BookmarkList(Okular::Document *document, QWidget *parent)
     mainlay->setSpacing(6);
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 53, 0)
     titleWidget->setLevel(2);
-#endif
     titleWidget->setText(i18n("Bookmarks"));
     mainlay->addWidget(titleWidget);
     mainlay->setAlignment(titleWidget, Qt::AlignHCenter);
diff --git a/ui/layers.cpp b/ui/layers.cpp
index bb23bf330..7c287e407 100644
--- a/ui/layers.cpp
+++ b/ui/layers.cpp
@@ -34,9 +34,7 @@ Layers::Layers(QWidget *parent, Okular::Document *document)
     m_document->addObserver(this);
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 53, 0)
     titleWidget->setLevel(2);
-#endif
     titleWidget->setText(i18n("Layers"));
     mainlay->addWidget(titleWidget);
     mainlay->setAlignment(titleWidget, Qt::AlignHCenter);
diff --git a/ui/searchlineedit.cpp b/ui/searchlineedit.cpp
index af5f18f57..782d3de40 100644
--- a/ui/searchlineedit.cpp
+++ b/ui/searchlineedit.cpp
@@ -14,19 +14,14 @@
 #include "core/document.h"
 
 // qt/kde includes
-#include <QApplication>
-#include <QLayout>
-#include <QTimer>
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 61, 0)
 #include <KBusyIndicatorWidget>
-#else
-#include <KPixmapSequence>
-#include <KPixmapSequenceWidget>
-#endif
 #include <KColorScheme>
 #include <KIconLoader>
 #include <KLocalizedString>
 #include <KMessageBox>
+#include <QApplication>
+#include <QLayout>
+#include <QTimer>
 
 SearchLineEdit::SearchLineEdit(QWidget *parent, Okular::Document *document)
     : KLineEdit(parent)
@@ -278,11 +273,7 @@ SearchLineWidget::SearchLineWidget(QWidget *parent, Okular::Document *document)
     m_edit = new SearchLineEdit(this, document);
     layout->addWidget(m_edit);
 
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 61, 0)
     m_anim = new KBusyIndicatorWidget(this);
-#else
-    m_anim = new KPixmapSequenceWidget(this);
-#endif
     m_anim->setFixedSize(22, 22);
     layout->addWidget(m_anim);
     m_anim->hide();
@@ -313,15 +304,6 @@ void SearchLineWidget::slotSearchStopped()
 
 void SearchLineWidget::slotTimedout()
 {
-#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 61, 0)
-    if (m_anim->sequence().isEmpty()) {
-        const KPixmapSequence seq = KIconLoader::global()->loadPixmapSequence(QStringLiteral("process-working"), 22);
-        if (seq.frameCount() > 0) {
-            m_anim->setInterval(1000 / seq.frameCount());
-            m_anim->setSequence(seq);
-        }
-    }
-#endif
     m_anim->show();
 }
 
diff --git a/ui/searchlineedit.h b/ui/searchlineedit.h
index b1db1315e..62b55bd71 100644
--- a/ui/searchlineedit.h
+++ b/ui/searchlineedit.h
@@ -16,11 +16,7 @@
 #include <KLineEdit>
 
 #include <kwidgetsaddons_version.h>
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 61, 0)
 class KBusyIndicatorWidget;
-#else
-class KPixmapSequenceWidget;
-#endif
 class QTimer;
 
 /**
@@ -94,11 +90,7 @@ private Q_SLOTS:
 
 private:
     SearchLineEdit *m_edit;
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 61, 0)
     KBusyIndicatorWidget *m_anim;
-#else
-    KPixmapSequenceWidget *m_anim;
-#endif
     QTimer *m_timer;
 };
 
diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp
index 82e986031..66a0c1b7e 100644
--- a/ui/side_reviews.cpp
+++ b/ui/side_reviews.cpp
@@ -97,9 +97,7 @@ Reviews::Reviews(QWidget *parent, Okular::Document *document)
     vLayout->setSpacing(6);
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 53, 0)
     titleWidget->setLevel(2);
-#endif
     titleWidget->setText(i18n("Reviews"));
 
     m_view = new TreeView(m_document, this);
diff --git a/ui/signaturepanel.cpp b/ui/signaturepanel.cpp
index 3ebe97682..ee334162e 100644
--- a/ui/signaturepanel.cpp
+++ b/ui/signaturepanel.cpp
@@ -46,9 +46,7 @@ SignaturePanel::SignaturePanel(Okular::Document *document, QWidget *parent)
     Q_D(SignaturePanel);
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 53, 0)
     titleWidget->setLevel(2);
-#endif
     titleWidget->setText(i18n("Signatures"));
 
     d->m_view = new QTreeView(this);
diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp
index 1726973b5..7a259d1bb 100644
--- a/ui/thumbnaillist.cpp
+++ b/ui/thumbnaillist.cpp
@@ -47,9 +47,7 @@ ThumbnailsBox::ThumbnailsBox(QWidget *parent)
     vbox->setSpacing(0);
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 53, 0)
     titleWidget->setLevel(2);
-#endif
     titleWidget->setText(i18n("Thumbnails"));
     vbox->addWidget(titleWidget);
     vbox->setAlignment(titleWidget, Qt::AlignHCenter);
diff --git a/ui/toc.cpp b/ui/toc.cpp
index b8fc261db..8b5d86220 100644
--- a/ui/toc.cpp
+++ b/ui/toc.cpp
@@ -38,9 +38,7 @@ TOC::TOC(QWidget *parent, Okular::Document *document)
     mainlay->setSpacing(6);
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 53, 0)
     titleWidget->setLevel(2);
-#endif
     titleWidget->setText(i18n("Contents"));
     mainlay->addWidget(titleWidget);
     mainlay->setAlignment(titleWidget, Qt::AlignHCenter);