[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/plugins/render
From:       Bastian Holst <bastianholst () gmx ! de>
Date:       2009-05-08 9:20:28
Message-ID: 1241774428.422014.31530.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 965155 by bholst:

Switching from QImage to QPixmap in Marbles WikipediaPlugin and PhotoPlugin.


 M  +1 -1      photo/PhotoPluginWidget.cpp  
 M  +2 -2      photo/PhotoPluginWidget.h  
 M  +8 -5      wikipedia/WikipediaModel.cpp  
 M  +2 -2      wikipedia/WikipediaModel.h  
 M  +3 -3      wikipedia/WikipediaWidget.cpp  
 M  +3 -3      wikipedia/WikipediaWidget.h  


--- trunk/KDE/kdeedu/marble/src/plugins/render/photo/PhotoPluginWidget.cpp #965154:965155
@@ -73,7 +73,7 @@
 bool PhotoPluginWidget::render( GeoPainter *painter, ViewportParams *viewport,
                                 const QString& renderPos, GeoSceneLayer * layer )
 {
-    painter->drawImage( coordinates(), m_smallImage );
+    painter->drawPixmap( coordinates(), m_smallImage );
     
     updatePaintPosition( viewport, m_smallImage.size() );
     
--- trunk/KDE/kdeedu/marble/src/plugins/render/photo/PhotoPluginWidget.h #965154:965155
@@ -13,7 +13,7 @@
 
 #include "AbstractDataPluginWidget.h"
 
-#include <QtGui/QImage>
+#include <QtGui/QPixmap>
 
 class QUrl;
 class QWebView;
@@ -60,7 +60,7 @@
     bool eventFilter( QObject *, QMouseEvent * );
  private:
     bool m_hasCoordinates;
-    QImage m_smallImage;
+    QPixmap m_smallImage;
     QWebView *m_browser;
     
     QString m_server;
--- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaModel.cpp #965154:965155
@@ -21,10 +21,12 @@
 #include "WikipediaWidget.h"
 
 // Qt
+#include <QtCore/QDebug>
 #include <QtCore/QUrl>
 #include <QtCore/QString>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <QtSvg/QSvgRenderer>
 
 using namespace Marble;
@@ -38,14 +40,15 @@
 {
     // Rendering of the wikipedia icon from svg
     QSvgRenderer svgObj( MarbleDirs::path( "svg/wikipedia.svg" ), this );
-    m_wikipediaImage = new QImage( wikipediaIconWidth, wikipediaIconHeight, QImage::Format_ARGB32 );
-    m_wikipediaImage->fill( QColor( 0, 0, 0, 0 ).rgba() );
-    QPainter painter( m_wikipediaImage );
+    QImage wikipediaImage( wikipediaIconWidth, wikipediaIconHeight, QImage::Format_ARGB32 );
+    wikipediaImage.fill( QColor( 0, 0, 0, 0 ).rgba() );
+    QPainter painter( &wikipediaImage );
     svgObj.render( &painter );
+    m_wikipediaPixmap = new QPixmap( QPixmap::fromImage( wikipediaImage ) );
 }
 
 WikipediaModel::~WikipediaModel() {
-    delete m_wikipediaImage;
+    delete m_wikipediaPixmap;
 }
 
 QUrl WikipediaModel::descriptionFileUrl( GeoDataLatLonAltBox *box, qint32 number ) {
@@ -79,7 +82,7 @@
             continue;
         }
         
-        (*it)->setIcon( m_wikipediaImage );
+        (*it)->setIcon( m_wikipediaPixmap );
         addWidgetToList( (*it) );
     }
 }
--- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaModel.h #965154:965155
@@ -13,7 +13,7 @@
 
 #include "AbstractDataPluginModel.h"
 
-class QImage;
+class QPixmap;
 
 namespace Marble {
 
@@ -42,7 +42,7 @@
     void parseFile( QByteArray file );
     
  private:
-    QImage *m_wikipediaImage;
+    QPixmap *m_wikipediaPixmap;
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaWidget.cpp #965154:965155
@@ -13,7 +13,7 @@
 
 // Qt
 #include <QtCore/QDebug>
-#include <QtGui/QImage>
+#include <QtGui/QPixmap>
 #include <QtGui/QMouseEvent>
 #include <QtWebKit/QWebView>
 
@@ -53,7 +53,7 @@
 bool WikipediaWidget::render( GeoPainter *painter, ViewportParams *viewport,
                               const QString& renderPos, GeoSceneLayer * layer )
 {
-    painter->drawImage( coordinates(), *m_icon );
+    painter->drawPixmap( coordinates(), *m_icon );
     
     updatePaintPosition( viewport, m_icon->size() );
     
@@ -112,6 +112,6 @@
     return false;
 }
 
-void WikipediaWidget::setIcon( QImage *icon ) {
+void WikipediaWidget::setIcon( QPixmap *icon ) {
     m_icon = icon;
 }
--- trunk/KDE/kdeedu/marble/src/plugins/render/wikipedia/WikipediaWidget.h #965154:965155
@@ -15,7 +15,7 @@
 
 #include <QtCore/QUrl>
 
-class QImage;
+class QPixmap;
 class QWebView;
 
 namespace Marble {
@@ -55,13 +55,13 @@
     
     bool eventFilter( QObject *, QMouseEvent * );
     
-    void setIcon( QImage *icon );
+    void setIcon( QPixmap *icon );
  private:
     QUrl m_url;
     QUrl m_thumbnailImageUrl;
     QWebView *m_browser;
     
-    QImage *m_icon;
+    QPixmap *m_icon;
 };
     
 }
[prev in list] [next in list] [prev in thread] [next in thread]