insolate the "stamp+icon" loading method in an own function

svn path=/trunk/KDE/kdegraphics/okular/; revision=862778

ui/annotationwidgets.cpp

@@ -107,10 +107,7 @@ void PixmapPreviewSelector::iconComboChanged( const QString& icon )
         m_icon = icon;
     }
 
-    QString path;
-    QPixmap pixmap = GuiUtils::iconLoader()->loadIcon( m_icon.toLower(), KIconLoader::User, m_previewSize, KIconLoader::DefaultState, QStringList(), &path, true );
-    if ( path.isEmpty() )
-        pixmap = GuiUtils::iconLoader()->loadIcon( m_icon.toLower(), KIconLoader::NoGroup, m_previewSize );
+    QPixmap pixmap = GuiUtils::loadStamp( m_icon, QSize( m_previewSize, m_previewSize ) );
     m_iconLabel->setPixmap( pixmap );
 
     emit iconChanged( m_icon );

ui/guiutils.cpp

@@ -137,6 +137,19 @@ QString prettyToolTip( const Okular::Annotation * ann )
     return tooltip;
 }
 
+QPixmap loadStamp( const QString& _name, const QSize& size )
+{
+    const QString name = _name.toLower();
+    QPixmap pixmap;
+    const KIconLoader * il = iconLoader();
+    QString path;
+    const int minSize = qMin( size.width(), size.height() );
+    pixmap = il->loadIcon( name, KIconLoader::User, minSize, KIconLoader::DefaultState, QStringList(), &path, true );
+    if ( path.isEmpty() )
+        pixmap = il->loadIcon( name, KIconLoader::NoGroup, minSize );
+    return pixmap;
+}
+
 void setIconLoader( KIconLoader * loader )
 {
     s_data->il = loader;

ui/guiutils.h

@@ -12,6 +12,8 @@
 
 #include <QtCore/QString>
 
+class QPixmap;
+class QSize;
 class QWidget;
 class KIconLoader;
 
@@ -33,6 +35,8 @@ namespace GuiUtils
 
     QString prettyToolTip( const Okular::Annotation * annotation );
 
+    QPixmap loadStamp( const QString& name, const QSize& size );
+
     void setIconLoader( KIconLoader * loader );
     KIconLoader* iconLoader();
 

ui/pagepainter.cpp

@@ -598,10 +598,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
                 Okular::StampAnnotation * stamp = (Okular::StampAnnotation *)a;
 
                 // get pixmap and alpha blend it if needed
-                QString path;
-                QPixmap pixmap = GuiUtils::iconLoader()->loadIcon( stamp->stampIconName().toLower(), KIconLoader::User, qMin( annotBoundary.width(), annotBoundary.height() ), KIconLoader::DefaultState, QStringList(), &path, true );
-                if ( path.isEmpty() )
-                    pixmap = GuiUtils::iconLoader()->loadIcon( stamp->stampIconName().toLower(), KIconLoader::NoGroup, qMin( annotBoundary.width(), annotBoundary.height() ) );
+                QPixmap pixmap = GuiUtils::loadStamp( stamp->stampIconName(), annotBoundary.size() );
                 QImage scaledImage;
                 scalePixmapOnImage( scaledImage, &pixmap, annotBoundary.width(),
                                     annotBoundary.height(), innerRect, QImage::Format_ARGB32 );