kiconloader fixes

svn path=/trunk/KDE/kdegraphics/okular/; revision=691642
remotes/origin/KDE/4.0
Aaron J. Seigo 19 years ago
parent a58e671331
commit a8e576712e
  1. 2
      ui/annotationwidgets.cpp
  2. 6
      ui/pagepainter.cpp

@ -87,7 +87,7 @@ void PixmapPreviewSelector::iconComboChanged( const QString& icon )
m_icon = m_comboItems->itemData( id ).toString();
QString path;
QPixmap pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), K3Icon::User, m_previewSize, K3Icon::DefaultState, &path, true );
QPixmap pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), K3Icon::User, m_previewSize, K3Icon::DefaultState, QStringList(), &path, true );
if ( path.isEmpty() )
pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), K3Icon::NoGroup, m_previewSize );
m_iconLabel->setPixmap( pixmap );

@ -30,7 +30,7 @@
#include "core/utils.h"
#include "settings.h"
K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("okular", K3Icon::NoGroup, 32, K3Icon::DefaultState, 0, true) ) )
K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("okular", K3Icon::NoGroup, 32, K3Icon::DefaultState, QStringList(), 0, true) ) )
#define TEXTANNOTATION_ICONSIZE 24
@ -547,7 +547,7 @@ void PagePainter::paintPageOnPainter( QPainter * destPainter, const Okular::Page
{
// get pixmap, colorize and alpha-blend it
QString path;
QPixmap pixmap = KIconLoader::global()->loadIcon( text->textIcon().toLower(), K3Icon::User, 32, K3Icon::DefaultState, &path, true );
QPixmap pixmap = KIconLoader::global()->loadIcon( text->textIcon().toLower(), K3Icon::User, 32, K3Icon::DefaultState, QStringList(), &path, true );
if ( path.isEmpty() )
pixmap = KIconLoader::global()->loadIcon( text->textIcon().toLower(), K3Icon::NoGroup, 32 );
QImage scaledImage;
@ -577,7 +577,7 @@ void PagePainter::paintPageOnPainter( QPainter * destPainter, const Okular::Page
// get pixmap and alpha blend it if needed
QString path;
QPixmap pixmap = KIconLoader::global()->loadIcon( stamp->stampIconName().toLower(), K3Icon::User, qMin( annotBoundary.width(), annotBoundary.height() ), K3Icon::DefaultState, &path, true );
QPixmap pixmap = KIconLoader::global()->loadIcon( stamp->stampIconName().toLower(), K3Icon::User, qMin( annotBoundary.width(), annotBoundary.height() ), K3Icon::DefaultState, QStringList(), &path, true );
if ( path.isEmpty() )
pixmap = KIconLoader::global()->loadIcon( stamp->stampIconName().toLower(), K3Icon::NoGroup, qMin( annotBoundary.width(), annotBoundary.height() ) );
QImage scaledImage;

Loading…
Cancel
Save