Eliminate compiler warnings and doc updates

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
@@ -34,16 +34,19 @@
 
 #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;
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
@@ -34,20 +34,16 @@
 #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
@@ -61,27 +57,29 @@ class OResource
         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 );
 };