1 files changed, 38 insertions, 43 deletions

diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 8b53038..f3e7501 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -1,24 +1,26 @@
-
 /*
-               =.            This file is part of the OPIE Project
-             .=l.            Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This library 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 library 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.
+                             This file is part of the Opie Project
+
+                             Copyright (C) 2002,2003 Holger Freyther <zecke@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,
@@ -26,3 +28,2 @@
                              Boston, MA 02111-1307, USA.
-
 */
@@ -37,4 +38,5 @@
 /* OPIE */
-#include <opie2/ofileselector.h>
 #include <opie2/odebug.h>
+#include <opie2/ofileselector.h>
+#include <opie2/oresource.h>
 
@@ -42,3 +44,2 @@
 #include <qpe/mimetype.h>
-#include <qpe/resource.h>
 #include <qpe/storage.h>
@@ -336,7 +337,5 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
 
-    QPixmap pic;
     QToolButton *btn = new QToolButton( box );
     btn->setUsesBigPixmap( true );
-    pic.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    btn->setPixmap( pic );
+    btn->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
     connect(btn, SIGNAL(clicked() ),
@@ -346,4 +345,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
     btn->setUsesBigPixmap( true );
-    pic.convertFromImage( Resource::loadImage( "home" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    btn->setPixmap( pic );
+    btn->setPixmap( Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ) );
     connect(btn, SIGNAL(clicked() ),
@@ -353,4 +351,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
     btn->setUsesBigPixmap( true );
-    pic.convertFromImage( Resource::loadImage( "DocsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    btn->setPixmap( pic );
+    btn->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) );
     connect(btn, SIGNAL(clicked() ),
@@ -360,4 +357,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
     m_btnNew->setUsesBigPixmap( true );
-    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_btnNew->setPixmap( pic );
+    m_btnNew->setPixmap( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ) );
     connect(m_btnNew, SIGNAL(clicked() ),
@@ -368,4 +364,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
     m_btnClose->setUsesBigPixmap( true );
-    pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    m_btnClose->setPixmap( pic );
+    m_btnClose->setPixmap( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
     connect(m_btnClose, SIGNAL(clicked() ),
@@ -375,4 +370,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
     btn->setUsesBigPixmap( true );
-    pic.convertFromImage( Resource::loadImage( "cardmon/pcmcia" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    btn->setPixmap( pic );
+    btn->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) );
 
@@ -641,3 +635,3 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
         QWMatrix matrix;
-        QPixmap pixer(Resource::loadPixmap("UnknownDocument") );
+        QPixmap pixer( Opie::Core::OResource::loadPixmap( "UnknownDocument" ) );
         matrix.scale( .4, .4 );
@@ -655,3 +649,4 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
         {
-            locked = true; pix = Resource::loadPixmap("locked");
+            locked = true;
+            pix = Opie::Core::OResource::loadPixmap( "locked" );
         }
@@ -672,8 +667,8 @@ void OFileViewFileListView::addDir( QFileInfo* info, bool symlink )
         if ( symlink )
-            pix = Resource::loadPixmap( "opie/symlink" );
+            pix = Opie::Core::OResource::loadPixmap( "opie/symlink" );
         else
-            pix = Resource::loadPixmap( "lockedfolder" );
+            pix = Opie::Core::OResource::loadPixmap( "lockedfolder" );
     }
     else
-        pix = symlink ? Resource::loadPixmap( "opie/symlink") : Resource::loadPixmap("folder");
+        pix = symlink ? Opie::Core::OResource::loadPixmap( "opie/symlink" ) : Opie::Core::OResource::loadPixmap( "folder" );