summaryrefslogtreecommitdiff
authordrw <drw>2005-05-24 20:53:08 (UTC)
committer drw <drw>2005-05-24 20:53:08 (UTC)
commit22cda9f7212641869c3abe210c66bf54a03f9579 (patch) (unidiff)
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 @@
1/* 1/*
2                This file is part of the OPIE Project 2 This file is part of the OPIE Project
3 =. 3 =.
4             .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org> 4 .=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
5           .>+-= 5 .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6_;:, .> :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_, > . <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.-- : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i, .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10- . .-<_> .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11 ._= =} : or (at your option) any later version.
12    .%`+i>       _;_. 12 .%`+i> _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13 .i_,=:_. -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15 : .. .:, . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.= = ; Public License for more details.
19++=   -.     .`     .: 19++= -. .` .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20: = ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21-. .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22 -_. . . )=. = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23 -- :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
@@ -30,7 +30,6 @@
30 30
31#include <qpe/config.h> 31#include <qpe/config.h>
32#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
33#include <qpe/resource.h>
34 33
35#include <qcheckbox.h> 34#include <qcheckbox.h>
36#include <qclipboard.h> 35#include <qclipboard.h>
@@ -73,12 +72,6 @@ WeatherPluginConfig::WeatherPluginConfig( QWidget *parent, const char* name)
73 label->setAlignment( AlignHCenter | WordBreak ); 72 label->setAlignment( AlignHCenter | WordBreak );
74 label->setMaximumHeight( label->height() ); 73 label->setMaximumHeight( label->height() );
75 layout->addMultiCellWidget( label, 2, 2, 0, 1 ); 74 layout->addMultiCellWidget( label, 2, 2, 0, 1 );
76 //layout->addWidget( label, 2, 0 );
77
78 //QPushButton *pb = new QPushButton( Resource::loadPixmap( "copy" ),
79 //tr( "Copy link" ), this );
80 //connect( pb, SIGNAL( clicked() ), this, SLOT( slotCopyLink() ) );
81 //layout->addWidget( pb, 2, 1 );
82 75
83 metricCB = new QCheckBox( tr( "Use metric units" ), this ); 76 metricCB = new QCheckBox( tr( "Use metric units" ), this );
84 metricCB->setMaximumHeight( fh + 5 ); 77 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
28 28
29#include <opie2/oprocess.h> 29#include <opie2/oprocess.h>
30 30
31#include <qpe/applnk.h> 31#include <opie2/oresource.h>
32
32#include <qpe/config.h> 33#include <qpe/config.h>
33#include <qpe/resource.h>
34 34
35#include <qfile.h> 35#include <qfile.h>
36#include <qimage.h>
37#include <qlabel.h> 36#include <qlabel.h>
38#include <qlayout.h> 37#include <qlayout.h>
39#include <qpixmap.h> 38#include <qpixmap.h>
@@ -49,9 +48,7 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
49 layout->setAutoAdd( true ); 48 layout->setAutoAdd( true );
50 49
51 weatherIcon = new QLabel( this ); 50 weatherIcon = new QLabel( this );
52 QPixmap pic; 51 weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( "Clock", Opie::Core::OResource::SmallIcon ) );
53 pic.convertFromImage( Resource::loadImage( "Clock" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
54 weatherIcon->setPixmap( pic );
55 52
56 weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this ); 53 weatherLabel = new QLabel( tr( "Retreiving current weather information." ), this );
57 weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) ); 54 weatherLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
@@ -145,9 +142,7 @@ void WeatherPluginWidget::displayWeather()
145 tmpstr = "todayweatherplugin/"; 142 tmpstr = "todayweatherplugin/";
146 getIcon( weatherData ); 143 getIcon( weatherData );
147 tmpstr.append( dataStr ); 144 tmpstr.append( dataStr );
148 QPixmap pic; 145 weatherIcon->setPixmap( Opie::Core::OResource::loadPixmap( tmpstr, Opie::Core::OResource::SmallIcon ) );
149 pic.convertFromImage( Resource::loadImage( tmpstr ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
150 weatherIcon->setPixmap( pic );
151 } 146 }
152 else 147 else
153 { 148 {