diff --git a/part/guiutils.cpp b/part/guiutils.cpp index 8ef68665c..0771f9d72 100644 --- a/part/guiutils.cpp +++ b/part/guiutils.cpp @@ -10,7 +10,6 @@ #include "guiutils.h" // qt/kde includes -#include #include #include #include @@ -34,7 +33,6 @@ struct GuiUtilsHelper { QSvgRenderer *svgStamps(); - QList il; std::unique_ptr svgStampFile; }; @@ -191,21 +189,6 @@ QPixmap loadStamp(const QString &nameOrPath, int size, bool keepAspectRatio) return QIcon::fromTheme(name).pixmap(size); } -void addIconLoader(KIconLoader *loader) -{ - s_data->il.append(loader); -} - -void removeIconLoader(KIconLoader *loader) -{ - s_data->il.removeAll(loader); -} - -KIconLoader *iconLoader() -{ - return s_data->il.isEmpty() ? KIconLoader::global() : s_data->il.back(); -} - void saveEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent) { const QString caption = i18n("Where do you want to save %1?", ef->name()); diff --git a/part/guiutils.h b/part/guiutils.h index c20b9be03..2779a9770 100644 --- a/part/guiutils.h +++ b/part/guiutils.h @@ -19,7 +19,6 @@ class QPixmap; class QSize; class QWidget; class QFile; -class KIconLoader; namespace Okular { @@ -50,10 +49,6 @@ QString prettyToolTip(const Okular::Annotation *annotation); */ QPixmap loadStamp(const QString &nameOrPath, int size, bool keepAspectRatio = true); -void addIconLoader(KIconLoader *loader); -void removeIconLoader(KIconLoader *loader); -KIconLoader *iconLoader(); - void saveEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent); void writeEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent, QFile &targetFile); diff --git a/part/part.cpp b/part/part.cpp index 967ddbe13..0dfd2ca74 100644 --- a/part/part.cpp +++ b/part/part.cpp @@ -339,8 +339,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &args) // create live connect extension (for integrating with browser scripting) new OkularLiveConnectExtension(this); - GuiUtils::addIconLoader(iconLoader()); - const QStringList iconDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("okular/pics"), QStandardPaths::LocateDirectory); QIcon::setFallbackSearchPaths(QIcon::fallbackSearchPaths() << iconDirs); @@ -961,7 +959,6 @@ Part::~Part() { QDBusConnection::sessionBus().unregisterObject(m_registerDbusName); - GuiUtils::removeIconLoader(iconLoader()); m_document->removeObserver(this); if (m_document->isOpened())