summaryrefslogtreecommitdiff
authordrw <drw>2005-05-24 20:53:08 (UTC)
committer drw <drw>2005-05-24 20:53:08 (UTC)
commit22cda9f7212641869c3abe210c66bf54a03f9579 (patch) (side-by-side diff)
tree446175ae7d2d2790bf52732a66a930648f0a195c
parent2848aca68964a46fb2f786cc01a9b2583d599511 (diff)
downloadopie-22cda9f7212641869c3abe210c66bf54a03f9579.zip
opie-22cda9f7212641869c3abe210c66bf54a03f9579.tar.gz
opie-22cda9f7212641869c3abe210c66bf54a03f9579.tar.bz2
Resource -> OResource and remove unnecessary include
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/weather/weatherconfig.cpp49
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp13
2 files changed, 25 insertions, 37 deletions
diff --git a/noncore/todayplugins/weather/weatherconfig.cpp b/noncore/todayplugins/weather/weatherconfig.cpp
index 4663549..d3ff3c9 100644
--- a/noncore/todayplugins/weather/weatherconfig.cpp
+++ b/noncore/todayplugins/weather/weatherconfig.cpp
@@ -1,26 +1,26 @@
/*
-                This file is part of the OPIE Project
+ This file is part of the OPIE Project
=.
-             .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
-           .>+-=
- _;:,     .>    :=|. This file is free software; you can
-.> <`_,   >  .   <= redistribute it and/or modify it under
-:`=1 )Y*s>-.--   : the terms of the GNU General Public
-.="- .-=="i,     .._ License as published by the Free Software
- - .   .-<_>     .<> Foundation; either version 2 of the License,
-     ._= =}       : or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s. This file is distributed in the hope that
-     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . . without even the implied warranty of
-    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=- You should have received a copy of the GNU
- -.   .:....=;==+<; General Public License along with this file;
-  -_. . .   )=.  = see the file COPYING. If not, write to the
-    --        :-=` Free Software Foundation, Inc.,
+ .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
+ .>+-=
+_;:, .> :=|. This file is free software; you can
+.> <`_, > . <= redistribute it and/or modify it under
+:`=1 )Y*s>-.-- : the terms of the GNU General Public
+.="- .-=="i, .._ License as published by the Free Software
+- . .-<_> .<> Foundation; either version 2 of the License,
+ ._= =} : or (at your option) any later version.
+ .%`+i> _;_.
+ .i_,=:_. -<s. This file is distributed in the hope that
+ + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
+ : .. .:, . . . without even the implied warranty of
+ =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
+ _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
+..}^=.= = ; Public License for more details.
+++= -. .` .:
+: = ...= . :.=- You should have received a copy of the GNU
+-. .:....=;==+<; General Public License along with this file;
+ -_. . . )=. = see the file COPYING. If not, write to the
+ -- :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
@@ -30,7 +30,6 @@
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qcheckbox.h>
#include <qclipboard.h>
@@ -73,12 +72,6 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name)
label->setAlignment( AlignHCenter | WordBreak );
label->setMaximumHeight( label->height() );
layout->addMultiCellWidget( label, 2, 2, 0, 1 );
- //layout->addWidget( label, 2, 0 );
-
- //QPushButton *pb = new QPushButton( Resource::loadPixmap( "copy" ),
- // tr( "Copy link" ), this );
- //connect( pb, SIGNAL( clicked() ), this, SLOT( slotCopyLink() ) );
- //layout->addWidget( pb, 2, 1 );
metricCB = new QCheckBox( tr( "Use metric units" ), this );
metricCB->setMaximumHeight( fh + 5 );
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
@@ -28,12 +28,11 @@ _;:, .> :=|. This file is free software; you can
#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>
@@ -49,9 +48,7 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
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 ) );
@@ -145,9 +142,7 @@ void WeatherPluginWidget::displayWeather()
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
{