Remove GuiUtils::iconLoader

It's unused
remotes/origin/work/spdx
Nicolas Fella 5 years ago committed by Albert Astals Cid
parent b0542ca0b2
commit e73bf99e58
  1. 17
      part/guiutils.cpp
  2. 5
      part/guiutils.h
  3. 3
      part/part.cpp

@ -10,7 +10,6 @@
#include "guiutils.h" #include "guiutils.h"
// qt/kde includes // qt/kde includes
#include <KIconLoader>
#include <KLocalizedString> #include <KLocalizedString>
#include <KMessageBox> #include <KMessageBox>
#include <QApplication> #include <QApplication>
@ -34,7 +33,6 @@ struct GuiUtilsHelper {
QSvgRenderer *svgStamps(); QSvgRenderer *svgStamps();
QList<KIconLoader *> il;
std::unique_ptr<QSvgRenderer> svgStampFile; std::unique_ptr<QSvgRenderer> svgStampFile;
}; };
@ -191,21 +189,6 @@ QPixmap loadStamp(const QString &nameOrPath, int size, bool keepAspectRatio)
return QIcon::fromTheme(name).pixmap(size); 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) void saveEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent)
{ {
const QString caption = i18n("Where do you want to save %1?", ef->name()); const QString caption = i18n("Where do you want to save %1?", ef->name());

@ -19,7 +19,6 @@ class QPixmap;
class QSize; class QSize;
class QWidget; class QWidget;
class QFile; class QFile;
class KIconLoader;
namespace Okular namespace Okular
{ {
@ -50,10 +49,6 @@ QString prettyToolTip(const Okular::Annotation *annotation);
*/ */
QPixmap loadStamp(const QString &nameOrPath, int size, bool keepAspectRatio = true); 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 saveEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent);
void writeEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent, QFile &targetFile); void writeEmbeddedFile(Okular::EmbeddedFile *ef, QWidget *parent, QFile &targetFile);

@ -339,8 +339,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &args)
// create live connect extension (for integrating with browser scripting) // create live connect extension (for integrating with browser scripting)
new OkularLiveConnectExtension(this); new OkularLiveConnectExtension(this);
GuiUtils::addIconLoader(iconLoader());
const QStringList iconDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("okular/pics"), QStandardPaths::LocateDirectory); const QStringList iconDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("okular/pics"), QStandardPaths::LocateDirectory);
QIcon::setFallbackSearchPaths(QIcon::fallbackSearchPaths() << iconDirs); QIcon::setFallbackSearchPaths(QIcon::fallbackSearchPaths() << iconDirs);
@ -961,7 +959,6 @@ Part::~Part()
{ {
QDBusConnection::sessionBus().unregisterObject(m_registerDbusName); QDBusConnection::sessionBus().unregisterObject(m_registerDbusName);
GuiUtils::removeIconLoader(iconLoader());
m_document->removeObserver(this); m_document->removeObserver(this);
if (m_document->isOpened()) if (m_document->isOpened())

Loading…
Cancel
Save