summaryrefslogtreecommitdiff
authordrw <drw>2005-04-05 22:34:33 (UTC)
committer drw <drw>2005-04-05 22:34:33 (UTC)
commit327e938f58125a52482b9a6543dd1aa4243bb5d3 (patch) (unidiff)
treec17fa46fe9c37c08f37cfdb9d3eaea6560161c2d
parentb9730df31f0941857a4f2cbe3507231e49897f09 (diff)
downloadopie-327e938f58125a52482b9a6543dd1aa4243bb5d3.zip
opie-327e938f58125a52482b9a6543dd1aa4243bb5d3.tar.gz
opie-327e938f58125a52482b9a6543dd1aa4243bb5d3.tar.bz2
Eliminate compiler warnings and doc updates
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oresource.cpp3
-rw-r--r--libopie2/opiecore/oresource.h10
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
@@ -36,12 +36,15 @@
36 36
37#include "oresource.h" 37#include "oresource.h"
38 38
39namespace Opie { 39namespace Opie {
40namespace Core { 40namespace Core {
41 41
42static int smallIconSize = -1; // Size of small icons (width & height)
43static int bigIconSize = -1; // Size of large icons (width & height)
44
42QImage OResource::loadImage( const QString &name, Scale scale ) 45QImage 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 );
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
@@ -36,16 +36,12 @@
36#include <qimage.h> 36#include <qimage.h>
37#include <qpixmap.h> 37#include <qpixmap.h>
38 38
39namespace Opie { 39namespace Opie {
40namespace Core { 40namespace Core {
41 41
42static int smallIconSize = -1; // Size of small icons (width & height)
43static int bigIconSize = -1; // Size of large icons (width & height)
44
45
46class OResource 42class OResource
47{ 43{
48 public: 44 public:
49 /** 45 /**
50 * Image scaling options. 46 * Image scaling options.
51 * 47 *
@@ -63,23 +59,25 @@ class OResource
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 **/