Resource -> OResource

5 files changed, 39 insertions, 39 deletions

diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp
index 34802fb..28b631b 100644
--- a/noncore/applets/autorotateapplet/autorotate.cpp
+++ b/noncore/applets/autorotateapplet/autorotate.cpp
@@ -16,7 +16,7 @@
 #include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
+#include <opie2/oresource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
 using namespace Opie::Core;
 
@@ -29,6 +29,6 @@ AutoRotate::AutoRotate(QWidget * parent):QWidget(parent)
     setFixedHeight( AppLnk::smallIconSize() );
 
-    enabledPm.convertFromImage( Resource::loadImage("autorotate/rotate").smoothScale( height(), width() ) );
-    disabledPm.convertFromImage( Resource::loadImage("autorotate/norotate").smoothScale( height(), width() ) );
+    enabledPm = Opie::Core::OResource::loadImage("autorotate/rotate", Opie::Core::OResource::SmallIcon);
+    disabledPm = Opie::Core::OResource::loadImage("autorotate/norotate", Opie::Core::OResource::SmallIcon);
 
     repaint(true);
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp
index bd6ca66..10c2b34 100644
--- a/noncore/applets/networkapplet/networkapplet.cpp
+++ b/noncore/applets/networkapplet/networkapplet.cpp
@@ -1,26 +1,26 @@
 /*
-                             This file is part of the Opie Project
+                     This file is part of the Opie Project
 
               =.             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
             .=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.
+     .>+-=
+_;:,   .>  :=|.         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,
@@ -34,7 +34,8 @@
 #include <opie2/odebug.h>
 #include <opie2/onetwork.h>
+#include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
@@ -56,9 +57,8 @@ IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name )
     assert( _iface );
     setToggleButton( true );
-    //setAutoRaise( true );
-    setOnIconSet( QIconSet( Resource::loadPixmap( "up" ) ) );
-    setOffIconSet( QIconSet( Resource::loadPixmap( "down" ) ) );
+    setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
+    setOnIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ) );
+    setOffIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ) ) );
     setOn( _iface->isUp() );
-    //setFixedWidth( 16 );
     connect( this, SIGNAL( clicked() ), this, SLOT( clicked() ) );
 }
@@ -122,5 +122,5 @@ void NetworkAppletControl::build()
         QHBoxLayout* h = new QHBoxLayout( l );
         QLabel* symbol = new QLabel( this );
-        symbol->setPixmap( Resource::loadPixmap( guessDevice( it.current() ) ) );
+        symbol->setPixmap( Opie::Core::OResource::loadPixmap( guessDevice( it.current() ), Opie::Core::OResource::SmallIcon ) );
         h->addWidget( symbol );
         symbol->show();
@@ -216,5 +216,5 @@ NetworkApplet::NetworkApplet( QWidget *parent, const char *name )
     setFixedHeight( AppLnk::smallIconSize() );
     setFixedWidth( AppLnk::smallIconSize() );
-    _pixmap.convertFromImage( Resource::loadImage( "networkapplet/network" ).smoothScale( height(), width() ) );
+    _pixmap = Opie::Core::OResource::loadPixmap( "networkapplet/network", Opie::Core::OResource::SmallIcon );
    _control = new NetworkAppletControl( this, "control" );
 }
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index d06672a..13f297e 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -19,4 +19,5 @@
 #include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
+#include <opie2/oresource.h>
 #include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
@@ -25,5 +26,4 @@
 #include <qpe/ir.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
@@ -433,5 +433,5 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name )
     setFixedHeight( AppLnk::smallIconSize() );
     setFixedWidth( AppLnk::smallIconSize() );
-    notesPixmap.convertFromImage( Resource::loadImage( "edit" ).smoothScale( height(), width() ) );
+    notesPixmap = Opie::Core::OResource::loadImage( "edit", Opie::Core::OResource::SmallIcon );
    vc = new NotesControl;
 }
diff --git a/noncore/applets/pyquicklaunch/pyquicklaunch.cpp b/noncore/applets/pyquicklaunch/pyquicklaunch.cpp
index bcd2f0d..45eda4e 100644
--- a/noncore/applets/pyquicklaunch/pyquicklaunch.cpp
+++ b/noncore/applets/pyquicklaunch/pyquicklaunch.cpp
@@ -17,8 +17,8 @@
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 using namespace Opie::Core;
 
@@ -83,6 +83,6 @@ PyQuicklaunchApplet::PyQuicklaunchApplet( QWidget *parent, const char *name )
     status = new PyQuicklaunchControl( this, this, "Python Quicklaunch Status" );
 
-    _online = Resource::loadPixmap( "pyquicklaunch/online" );
-    _offline = Resource::loadPixmap( "pyquicklaunch/offline" );
+    _online = Opie::Core::OResource::loadPixmap( "pyquicklaunch/online", Opie::Core::OResource::SmallIcon );
+    _offline = Opie::Core::OResource::loadPixmap( "pyquicklaunch/offline", Opie::Core::OResource::SmallIcon );
 
     _fifoName = QString().sprintf( "/tmp/mickeys-quicklauncher-%s", ::getpwuid( ::getuid() )->pw_name );
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
index 55c08b3..324ccdc 100644
--- a/noncore/applets/zkbapplet/applet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
@@ -1,10 +1,10 @@
 #include <opie2/otaskbarapplet.h>
 #include <opie2/okeyfilter.h>
+#include <opie2/oresource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <stdio.h>
-#include <unistd.h>
+//#include <stdio.h>
+//#include <unistd.h>
 #include "zkbwidget.h"
 #include "zkbcfg.h"
@@ -13,5 +13,5 @@ using namespace Opie::Ui;
 
 ZkbWidget::ZkbWidget(QWidget* parent)
-    :QLabel(parent),keymap(0),disabled(Resource::loadPixmap("zkb-disabled")) {
+    :QLabel(parent),keymap(0),disabled(Opie::Core::OResource::loadPixmap("zkb-disabled", Opie::Core::OResource::SmallIcon)) {
 
     labels = new QPopupMenu();