From 396bcc107b4f44b231411eb882e5956534b56e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Mon, 1 Oct 2007 15:10:42 +0000 Subject: [PATCH] Code adaptation because of changes on libraries related to revision 719630 svn path=/trunk/KDE/kdegraphics/okular/; revision=719644 --- ui/annotationwidgets.cpp | 4 ++-- ui/minibar.cpp | 2 +- ui/pagepainter.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/annotationwidgets.cpp b/ui/annotationwidgets.cpp index cd7d9df1c..aa4033015 100644 --- a/ui/annotationwidgets.cpp +++ b/ui/annotationwidgets.cpp @@ -102,9 +102,9 @@ void PixmapPreviewSelector::iconComboChanged( const QString& icon ) } QString path; - QPixmap pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), K3Icon::User, m_previewSize, K3Icon::DefaultState, QStringList(), &path, true ); + QPixmap pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), KIconLoader::User, m_previewSize, KIconLoader::DefaultState, QStringList(), &path, true ); if ( path.isEmpty() ) - pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), K3Icon::NoGroup, m_previewSize ); + pixmap = KIconLoader::global()->loadIcon( m_icon.toLower(), KIconLoader::NoGroup, m_previewSize ); m_iconLabel->setPixmap( pixmap ); emit iconChanged( m_icon ); diff --git a/ui/minibar.cpp b/ui/minibar.cpp index ea695691a..9c1289fde 100644 --- a/ui/minibar.cpp +++ b/ui/minibar.cpp @@ -86,7 +86,7 @@ MiniBar::MiniBar( QWidget * parent, Okular::Document * document ) horLayout->setMargin( 0 ); horLayout->setSpacing( 3 ); - QSize buttonSize( K3Icon::SizeSmallMedium, K3Icon::SizeSmallMedium ); + QSize buttonSize( KIconLoader::SizeSmallMedium, KIconLoader::SizeSmallMedium ); // bottom: left prev_page button m_prevButton = new HoverButton( this ); m_prevButton->setIcon( KIcon( layoutDirection() == Qt::RightToLeft ? "arrow-right" : "arrow-left" ) ); diff --git a/ui/pagepainter.cpp b/ui/pagepainter.cpp index efab853e4..94a1af7b7 100644 --- a/ui/pagepainter.cpp +++ b/ui/pagepainter.cpp @@ -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, QStringList(), 0, true) ) ) +K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("okular", KIconLoader::NoGroup, 32, KIconLoader::DefaultState, QStringList(), 0, true) ) ) #define TEXTANNOTATION_ICONSIZE 24 @@ -529,9 +529,9 @@ 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, QStringList(), &path, true ); + QPixmap pixmap = KIconLoader::global()->loadIcon( text->textIcon().toLower(), KIconLoader::User, 32, KIconLoader::DefaultState, QStringList(), &path, true ); if ( path.isEmpty() ) - pixmap = KIconLoader::global()->loadIcon( text->textIcon().toLower(), K3Icon::NoGroup, 32 ); + pixmap = KIconLoader::global()->loadIcon( text->textIcon().toLower(), KIconLoader::NoGroup, 32 ); QImage scaledImage; QRect annotBoundary2 = QRect( annotBoundary.topLeft(), QSize( TEXTANNOTATION_ICONSIZE, TEXTANNOTATION_ICONSIZE ) ); QRect annotRect2 = annotBoundary2.intersect( limits ); @@ -559,9 +559,9 @@ 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, QStringList(), &path, true ); + QPixmap pixmap = KIconLoader::global()->loadIcon( stamp->stampIconName().toLower(), KIconLoader::User, qMin( annotBoundary.width(), annotBoundary.height() ), KIconLoader::DefaultState, QStringList(), &path, true ); if ( path.isEmpty() ) - pixmap = KIconLoader::global()->loadIcon( stamp->stampIconName().toLower(), K3Icon::NoGroup, qMin( annotBoundary.width(), annotBoundary.height() ) ); + pixmap = KIconLoader::global()->loadIcon( stamp->stampIconName().toLower(), KIconLoader::NoGroup, qMin( annotBoundary.width(), annotBoundary.height() ) ); QImage scaledImage; scalePixmapOnImage( scaledImage, &pixmap, annotBoundary.width(), annotBoundary.height(), innerRect, QImage::Format_ARGB32 );