author | drw <drw> | 2005-04-15 18:08:34 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-15 18:08:34 (UTC) |
commit | 790b371e6c7ed9da76eafb8a5b2e5d5458b320d8 (patch) (unidiff) | |
tree | 31c939fc67cae7b7d587e1c9bc94cfe57feb9f20 | |
parent | ba9d5ecee89aadb135a03c173878e315de784be3 (diff) | |
download | opie-790b371e6c7ed9da76eafb8a5b2e5d5458b320d8.zip opie-790b371e6c7ed9da76eafb8a5b2e5d5458b320d8.tar.gz opie-790b371e6c7ed9da76eafb8a5b2e5d5458b320d8.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index ac24894..547a9b3 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp | |||
@@ -1,23 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
@@ -40,3 +40,2 @@ | |||
40 | 40 | ||
41 | #include <qpe/resource.h> | ||
42 | #include <qpe/qcopenvelope_qws.h> | 41 | #include <qpe/qcopenvelope_qws.h> |
@@ -45,2 +44,3 @@ | |||
45 | #include <opie2/odevice.h> | 44 | #include <opie2/odevice.h> |
45 | #include <opie2/oresource.h> | ||
46 | 46 | ||
@@ -199,6 +199,3 @@ public: | |||
199 | { | 199 | { |
200 | QImage img = Resource::loadImage ( "launcher/new_wait" ); | 200 | setPixmap( Opie::Core::OResource::loadPixmap( "launcher/new_wait" ) ); |
201 | QPixmap pix; | ||
202 | pix. convertFromImage ( img ); | ||
203 | setPixmap ( pix ); | ||
204 | setAlignment ( AlignCenter ); | 201 | setAlignment ( AlignCenter ); |