author | drw <drw> | 2005-04-24 21:32:37 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 21:32:37 (UTC) |
commit | 2391cfd9c79b87b3b00a4bb4a1d76981debb4486 (patch) (unidiff) | |
tree | 4ba271b1465881c0cce4ba5fd7a8c95bff5aca24 /core/applets/rotateapplet/rotate.cpp | |
parent | ead2586272813b8cab8092773376c690cdf1b906 (diff) | |
download | opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.zip opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.tar.gz opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'core/applets/rotateapplet/rotate.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index d13c2c0..9abbde8 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -1,46 +1,49 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | |||
3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | 4 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> |
4 | Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> | 5 | Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> |
5 | =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> | 6 | Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> |
6 | .=l. | 7 | =. |
7 | .>+-= | 8 | .=l. |
8 | _;:, .> :=|. This library is free software; you can | 9 | Â Â Â Â Â Â .>+-= |
9 | .> <, > . <= redistribute it and/or modify it under | 10 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
10 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 11 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
11 | .="- .-=="i, .._ License as published by the Free Software | 12 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 13 | .="- .-=="i, Â Â .._ License as published by the Free Software |
13 | ._= =} : or (at your option) any later version. | 14 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
14 | .%+i> _;_. | 15 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
15 | .i_,=:_. -<s. This library is distributed in the hope that | 16 | Â Â .%`+i> Â Â Â _;_. |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
17 | : .. .:, . . . without even the implied warranty of | 18 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
18 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 19 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
19 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 20 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | ..}^=.= = ; Library General Public License for more | 21 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ++= -. . .: details. | 22 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
22 | : = ...= . :.=- | 23 | ++= Â -. Â Â .` Â Â .: details. |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | : Â Â = Â ...= . :.=- |
24 | -_. . . )=. = Library General Public License along with | 25 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
25 | -- :-= this library; see the file COPYING.LIB. | 26 | Â -_. . . Â )=. Â = Library General Public License along with |
27 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. | ||
26 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
29 | */ | 31 | */ |
30 | 32 | ||
31 | #include "rotate.h" | 33 | #include "rotate.h" |
32 | 34 | ||
33 | /* OPIE */ | 35 | /* OPIE */ |
34 | #include <opie2/odebug.h> | 36 | #include <opie2/odebug.h> |
35 | #include <opie2/odevice.h> | 37 | #include <opie2/odevice.h> |
38 | #include <opie2/oresource.h> | ||
39 | |||
36 | #include <qpe/applnk.h> | 40 | #include <qpe/applnk.h> |
37 | #include <qpe/config.h> | 41 | #include <qpe/config.h> |
38 | #include <qpe/power.h> | 42 | #include <qpe/power.h> |
39 | #include <qpe/qcopenvelope_qws.h> | 43 | #include <qpe/qcopenvelope_qws.h> |
40 | #include <qpe/resource.h> | ||
41 | using namespace Opie::Core; | 44 | using namespace Opie::Core; |
42 | 45 | ||
43 | /* STD */ | 46 | /* STD */ |
44 | #include <time.h> | 47 | #include <time.h> |
45 | 48 | ||
46 | RotateApplet::RotateApplet() | 49 | RotateApplet::RotateApplet() |
@@ -136,16 +139,13 @@ QString RotateApplet::tr( const char* s, const char* p ) const | |||
136 | return qApp->translate( "RotateApplet", s, p ); | 139 | return qApp->translate( "RotateApplet", s, p ); |
137 | } | 140 | } |
138 | */ | 141 | */ |
139 | 142 | ||
140 | QIconSet RotateApplet::icon() const | 143 | QIconSet RotateApplet::icon() const |
141 | { | 144 | { |
142 | QPixmap pix; | 145 | QPixmap pix = Opie::Core::OResource::loadPixmap( "Rotation", Opie::Core::OResource::SmallIcon ); |
143 | QImage img = Resource::loadImage( "Rotation" ); | ||
144 | if ( !img.isNull() ) | ||
145 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
146 | return pix; | 146 | return pix; |
147 | } | 147 | } |
148 | 148 | ||
149 | QPopupMenu* RotateApplet::popup(QWidget*) const | 149 | QPopupMenu* RotateApplet::popup(QWidget*) const |
150 | { | 150 | { |
151 | return 0; | 151 | return 0; |