author | drw <drw> | 2005-04-05 22:34:33 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-05 22:34:33 (UTC) |
commit | 327e938f58125a52482b9a6543dd1aa4243bb5d3 (patch) (side-by-side diff) | |
tree | c17fa46fe9c37c08f37cfdb9d3eaea6560161c2d /libopie2/opiecore | |
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 @@ /* This file is part of the Opie Project Copyright (C) 2005 Dan Williams <drw@handhelds.org> Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> =. .=l. .>+-= _;:, .> :=|. This program is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU Library 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 program 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 ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <opie2/oapplication.h> #include <opie2/odebug.h> #include <qpe/applnk.h> #include "oresource.h" namespace Opie { namespace Core { +static int smallIconSize = -1; // Size of small icons (width & height) +static int bigIconSize = -1; // Size of large icons (width & height) + QImage OResource::loadImage( const QString &name, Scale scale ) { // Load image QString filename; filename.sprintf( "%spics/%s.png", (const char*) oApp->qpeDir(), (const char*) name ); QImage image( filename ); if ( image.isNull() ) odebug << "libopie2 OResource: can't find image " << filename << oendl; // Scale image (if necessary) if ( scale == SmallIcon ) { // Retrieve size of small icons if ( smallIconSize == -1 ) smallIconSize = AppLnk::smallIconSize(); // Scale image return image.smoothScale( smallIconSize, smallIconSize ); } else if ( scale == BigIcon ) { // Retrieve size of big icons if ( bigIconSize == -1 ) bigIconSize = AppLnk::bigIconSize(); // Scale image return image.smoothScale( bigIconSize, bigIconSize ); } else return image; } QPixmap OResource::loadPixmap( const QString &name, Scale scale ) { QPixmap pixmap; pixmap.convertFromImage( loadImage( name, scale ) ); return pixmap; } } // namespace Core } // namespace Opie 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 @@ /* This file is part of the Opie Project Copyright (C) 2005 Dan Williams <drw@handhelds.org> Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de> Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> =. .=l. .>+-= _;:, .> :=|. This program is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU Library 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 program 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 ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef ORESOURCE_H #define ORESOURCE_H #include <qimage.h> #include <qpixmap.h> namespace Opie { namespace Core { -static int smallIconSize = -1; // Size of small icons (width & height) -static int bigIconSize = -1; // Size of large icons (width & height) - - class OResource { public: /** * Image scaling options. * * NoScale - no scaling of image will be performed * SmallIcon - image will be scaled based using SmallIconSize value * for width and height * BigIcon - image will be scaled based on BigIconSize value for * width and height * * Note: SmallIconSize and BigIconSize are run-time configuration * options defined in qpe.conf (Appearance section) */ enum Scale { NoScale = 0, SmallIcon, BigIcon }; /** * Constructor */ OResource() {} /** - * Load specified image. + * @fn loadImage( const QString &name, Scale scale = NoScale ) + * @brief Load specified image. * * @param name - name of pixmap image to load * @param scale - scaling (if any) to preform on image * * @return QImage containing image loaded (and scaled if appropriate) **/ static QImage loadImage( const QString &name, Scale scale = NoScale ); /** - * Load specified image. + * @fn loadPixmap( const QString &name, Scale scale = NoScale ) + * @brief Load specified image. * * @param name - name of pixmap image to load * @param scale - scaling (if any) to preform on image * * @return QPixmap containing image loaded (and scaled if appropriate) **/ static QPixmap loadPixmap( const QString &name, Scale scale = NoScale ); }; } // namespace Core } // namespace Opie #endif |