author | drw <drw> | 2005-04-05 22:34:33 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-05 22:34:33 (UTC) |
commit | 327e938f58125a52482b9a6543dd1aa4243bb5d3 (patch) (unidiff) | |
tree | c17fa46fe9c37c08f37cfdb9d3eaea6560161c2d | |
parent | b9730df31f0941857a4f2cbe3507231e49897f09 (diff) | |
download | opie-327e938f58125a52482b9a6543dd1aa4243bb5d3.zip opie-327e938f58125a52482b9a6543dd1aa4243bb5d3.tar.gz opie-327e938f58125a52482b9a6543dd1aa4243bb5d3.tar.bz2 |
Eliminate compiler warnings and doc updates
-rw-r--r-- | libopie2/opiecore/oresource.cpp | 3 | ||||
-rw-r--r-- | libopie2/opiecore/oresource.h | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libopie2/opiecore/oresource.cpp b/libopie2/opiecore/oresource.cpp index 88058d0..0d6e60a 100644 --- a/libopie2/opiecore/oresource.cpp +++ b/libopie2/opiecore/oresource.cpp | |||
@@ -1,85 +1,88 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (C) 2005 Dan Williams <drw@handhelds.org> | 4 | Copyright (C) 2005 Dan Williams <drw@handhelds.org> |
5 | Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> | 5 | Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> |
6 | =. | 6 | =. |
7 | .=l. | 7 | .=l. |
8 | .>+-= | 8 | .>+-= |
9 | _;:, .> :=|. This program is free software; you can | 9 | _;:, .> :=|. This program is free software; you can |
10 | .> <`_, > . <= redistribute it and/or modify it under | 10 | .> <`_, > . <= redistribute it and/or modify it under |
11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
12 | .="- .-=="i, .._ License as published by the Free Software | 12 | .="- .-=="i, .._ License as published by the Free Software |
13 | - . .-<_> .<> Foundation; either version 2 of the License, | 13 | - . .-<_> .<> Foundation; either version 2 of the License, |
14 | ._= =} : or (at your option) any later version. | 14 | ._= =} : or (at your option) any later version. |
15 | .%`+i> _;_. | 15 | .%`+i> _;_. |
16 | .i_,=:_. -<s. This program is distributed in the hope that | 16 | .i_,=:_. -<s. This program is distributed in the hope that |
17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
18 | : .. .:, . . . without even the implied warranty of | 18 | : .. .:, . . . without even the implied warranty of |
19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ..}^=.= = ; Library General Public License for more | 21 | ..}^=.= = ; Library General Public License for more |
22 | ++= -. .` .: details. | 22 | ++= -. .` .: details. |
23 | : = ...= . :.=- | 23 | : = ...= . :.=- |
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <opie2/oapplication.h> | 32 | #include <opie2/oapplication.h> |
33 | #include <opie2/odebug.h> | 33 | #include <opie2/odebug.h> |
34 | 34 | ||
35 | #include <qpe/applnk.h> | 35 | #include <qpe/applnk.h> |
36 | 36 | ||
37 | #include "oresource.h" | 37 | #include "oresource.h" |
38 | 38 | ||
39 | namespace Opie { | 39 | namespace Opie { |
40 | namespace Core { | 40 | namespace Core { |
41 | 41 | ||
42 | static int smallIconSize = -1; // Size of small icons (width & height) | ||
43 | static int bigIconSize = -1; // Size of large icons (width & height) | ||
44 | |||
42 | QImage OResource::loadImage( const QString &name, Scale scale ) | 45 | QImage OResource::loadImage( const QString &name, Scale scale ) |
43 | { | 46 | { |
44 | // Load image | 47 | // Load image |
45 | QString filename; | 48 | QString filename; |
46 | filename.sprintf( "%spics/%s.png", (const char*) oApp->qpeDir(), (const char*) name ); | 49 | filename.sprintf( "%spics/%s.png", (const char*) oApp->qpeDir(), (const char*) name ); |
47 | QImage image( filename ); | 50 | QImage image( filename ); |
48 | if ( image.isNull() ) | 51 | if ( image.isNull() ) |
49 | odebug << "libopie2 OResource: can't find image " << filename << oendl; | 52 | odebug << "libopie2 OResource: can't find image " << filename << oendl; |
50 | 53 | ||
51 | // Scale image (if necessary) | 54 | // Scale image (if necessary) |
52 | if ( scale == SmallIcon ) | 55 | if ( scale == SmallIcon ) |
53 | { | 56 | { |
54 | // Retrieve size of small icons | 57 | // Retrieve size of small icons |
55 | if ( smallIconSize == -1 ) | 58 | if ( smallIconSize == -1 ) |
56 | smallIconSize = AppLnk::smallIconSize(); | 59 | smallIconSize = AppLnk::smallIconSize(); |
57 | 60 | ||
58 | // Scale image | 61 | // Scale image |
59 | return image.smoothScale( smallIconSize, smallIconSize ); | 62 | return image.smoothScale( smallIconSize, smallIconSize ); |
60 | } | 63 | } |
61 | else if ( scale == BigIcon ) | 64 | else if ( scale == BigIcon ) |
62 | { | 65 | { |
63 | // Retrieve size of big icons | 66 | // Retrieve size of big icons |
64 | if ( bigIconSize == -1 ) | 67 | if ( bigIconSize == -1 ) |
65 | bigIconSize = AppLnk::bigIconSize(); | 68 | bigIconSize = AppLnk::bigIconSize(); |
66 | 69 | ||
67 | // Scale image | 70 | // Scale image |
68 | return image.smoothScale( bigIconSize, bigIconSize ); | 71 | return image.smoothScale( bigIconSize, bigIconSize ); |
69 | } | 72 | } |
70 | else | 73 | else |
71 | return image; | 74 | return image; |
72 | } | 75 | } |
73 | 76 | ||
74 | QPixmap OResource::loadPixmap( const QString &name, Scale scale ) | 77 | QPixmap OResource::loadPixmap( const QString &name, Scale scale ) |
75 | { | 78 | { |
76 | QPixmap pixmap; | 79 | QPixmap pixmap; |
77 | pixmap.convertFromImage( loadImage( name, scale ) ); | 80 | pixmap.convertFromImage( loadImage( name, scale ) ); |
78 | return pixmap; | 81 | return pixmap; |
79 | } | 82 | } |
80 | 83 | ||
81 | } // namespace Core | 84 | } // namespace Core |
82 | } // namespace Opie | 85 | } // namespace Opie |
83 | 86 | ||
84 | 87 | ||
85 | 88 | ||
diff --git a/libopie2/opiecore/oresource.h b/libopie2/opiecore/oresource.h index 8c67ced..87b2abd 100644 --- a/libopie2/opiecore/oresource.h +++ b/libopie2/opiecore/oresource.h | |||
@@ -1,92 +1,90 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (C) 2005 Dan Williams <drw@handhelds.org> | 4 | Copyright (C) 2005 Dan Williams <drw@handhelds.org> |
5 | Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de> | 5 | Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de> |
6 | Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> | 6 | Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #ifndef ORESOURCE_H | 33 | #ifndef ORESOURCE_H |
34 | #define ORESOURCE_H | 34 | #define ORESOURCE_H |
35 | 35 | ||
36 | #include <qimage.h> | 36 | #include <qimage.h> |
37 | #include <qpixmap.h> | 37 | #include <qpixmap.h> |
38 | 38 | ||
39 | namespace Opie { | 39 | namespace Opie { |
40 | namespace Core { | 40 | namespace Core { |
41 | 41 | ||
42 | static int smallIconSize = -1; // Size of small icons (width & height) | ||
43 | static int bigIconSize = -1; // Size of large icons (width & height) | ||
44 | |||
45 | |||
46 | class OResource | 42 | class OResource |
47 | { | 43 | { |
48 | public: | 44 | public: |
49 | /** | 45 | /** |
50 | * Image scaling options. | 46 | * Image scaling options. |
51 | * | 47 | * |
52 | * NoScale - no scaling of image will be performed | 48 | * NoScale - no scaling of image will be performed |
53 | * SmallIcon - image will be scaled based using SmallIconSize value | 49 | * SmallIcon - image will be scaled based using SmallIconSize value |
54 | * for width and height | 50 | * for width and height |
55 | * BigIcon - image will be scaled based on BigIconSize value for | 51 | * BigIcon - image will be scaled based on BigIconSize value for |
56 | * width and height | 52 | * width and height |
57 | * | 53 | * |
58 | * Note: SmallIconSize and BigIconSize are run-time configuration | 54 | * Note: SmallIconSize and BigIconSize are run-time configuration |
59 | * options defined in qpe.conf (Appearance section) | 55 | * options defined in qpe.conf (Appearance section) |
60 | */ | 56 | */ |
61 | enum Scale { NoScale = 0, SmallIcon, BigIcon }; | 57 | enum Scale { NoScale = 0, SmallIcon, BigIcon }; |
62 | 58 | ||
63 | /** | 59 | /** |
64 | * Constructor | 60 | * Constructor |
65 | */ | 61 | */ |
66 | OResource() {} | 62 | OResource() {} |
67 | 63 | ||
68 | /** | 64 | /** |
69 | * Load specified image. | 65 | * @fn loadImage( const QString &name, Scale scale = NoScale ) |
66 | * @brief Load specified image. | ||
70 | * | 67 | * |
71 | * @param name - name of pixmap image to load | 68 | * @param name - name of pixmap image to load |
72 | * @param scale - scaling (if any) to preform on image | 69 | * @param scale - scaling (if any) to preform on image |
73 | * | 70 | * |
74 | * @return QImage containing image loaded (and scaled if appropriate) | 71 | * @return QImage containing image loaded (and scaled if appropriate) |
75 | **/ | 72 | **/ |
76 | static QImage loadImage( const QString &name, Scale scale = NoScale ); | 73 | static QImage loadImage( const QString &name, Scale scale = NoScale ); |
77 | 74 | ||
78 | /** | 75 | /** |
79 | * Load specified image. | 76 | * @fn loadPixmap( const QString &name, Scale scale = NoScale ) |
77 | * @brief Load specified image. | ||
80 | * | 78 | * |
81 | * @param name - name of pixmap image to load | 79 | * @param name - name of pixmap image to load |
82 | * @param scale - scaling (if any) to preform on image | 80 | * @param scale - scaling (if any) to preform on image |
83 | * | 81 | * |
84 | * @return QPixmap containing image loaded (and scaled if appropriate) | 82 | * @return QPixmap containing image loaded (and scaled if appropriate) |
85 | **/ | 83 | **/ |
86 | static QPixmap loadPixmap( const QString &name, Scale scale = NoScale ); | 84 | static QPixmap loadPixmap( const QString &name, Scale scale = NoScale ); |
87 | }; | 85 | }; |
88 | 86 | ||
89 | } // namespace Core | 87 | } // namespace Core |
90 | } // namespace Opie | 88 | } // namespace Opie |
91 | 89 | ||
92 | #endif | 90 | #endif |