1 files changed, 4 insertions, 9 deletions

diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 8c41189..fe54051 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -25,18 +25,17 @@ _;:,   .>  :=|.         This file is free software; you can
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/oprocess.h>
 
-#include <qpe/applnk.h>
+#include <opie2/oresource.h>
+
 #include <qpe/config.h>
-#include <qpe/resource.h>
 
 #include <qfile.h>
-#include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qtextstream.h>
 
 #include "weatherpluginwidget.h"
@@ -46,15 +45,13 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
         : QWidget( parent,  name )
 {
         QHBoxLayout *layout = new QHBoxLayout( this, 1, 2 );
         layout->setAutoAdd( true );
 
         weatherIcon = new QLabel( this );
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( "Clock" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-        weatherIcon->setPixmap( pic );
+        weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( "Clock", Opie::Core::OResource::SmallIcon ) );
 
         weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
         weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
 
     weatherIcon->setFixedSize( weatherLabel->height(), weatherLabel->height() );
 
@@ -142,15 +139,13 @@ void WeatherPluginWidget::displayWeather()
 
                 weatherLabel->setText( tmpstr );
 
                 tmpstr = "todayweatherplugin/";
                 getIcon( weatherData );
                 tmpstr.append( dataStr );
-        QPixmap pic;
-        pic.convertFromImage( Resource::loadImage( tmpstr ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-        weatherIcon->setPixmap( pic );
+        weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( tmpstr, Opie::Core::OResource::SmallIcon ) );
         }
         else
         {
                 weatherLabel->setText( tr( "Current weather data not available." ) );
         }
 }