Resource -> OResource

5 files changed, 135 insertions, 125 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index da21cef..e828595 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -1,46 +1,44 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+      .=l.                                Dan Williams <drw@handhelds.org>
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU 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 file 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 General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <stdio.h>
 
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 
-#ifdef QWS
 #include <qpe/config.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/storage.h>
-#endif
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qfileinfo.h>
 #include <qgroupbox.h>
@@ -193,17 +191,17 @@ void InstallDlgImpl :: init( bool displayextrainfo )
 
     QVBoxLayout *GroupBox2Layout = new QVBoxLayout( GroupBox2->layout() );
     output = new QMultiLineEdit( GroupBox2 );
     GroupBox2Layout->addWidget( output );
     layout->addMultiCellWidget( GroupBox2, 2, 2, 0, 1 );
 
-    btnInstall = new QPushButton( Resource::loadPixmap( "aqpkg/apply" ), tr( "Start" ), this );
+    btnInstall = new QPushButton( Opie::Core::OResource::loadPixmap( "aqpkg/apply", Opie::Core::OResource::SmallIcon ), tr( "Start" ), this );
     layout->addWidget( btnInstall, 3, 0 );
     connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
 
-    btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
+    btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), tr( "Options" ), this );
     layout->addWidget( btnOptions, 3, 1 );
     connect( btnOptions, SIGNAL( clicked() ), this, SLOT( optionsSelected() ) );
 }
 
 void InstallDlgImpl :: optionsSelected()
 {
@@ -257,13 +255,13 @@ void InstallDlgImpl :: installSelected()
             displayText( tr( "\n**** User Clicked ABORT ***" ) );
             pIpkg->abort();
             displayText( tr( "**** Process Aborted ****" ) );
         }
 
         btnInstall->setText( tr( "Close" ) );
-        btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+        btnInstall->setIconSet( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ) );
         return;
     }
     else if ( btnInstall->text() == tr( "Close" ) )
     {
         emit reloadData( this );
         return;
@@ -271,13 +269,13 @@ void InstallDlgImpl :: installSelected()
 
     // Disable buttons
     btnOptions->setEnabled( false );
 //    btnInstall->setEnabled( false );
 
     btnInstall->setText( tr( "Abort" ) );
-    btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
+    btnInstall->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
 
     if ( pIpkg )
     {
         output->setText( "" );
         connect( pIpkg, SIGNAL(outputText(const QString&)), this, SLOT(displayText(const QString&)));
         connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
@@ -463,15 +461,15 @@ void InstallDlgImpl :: ipkgFinished()
         pIpkg->runIpkg();
     }
     else
     {
         btnOptions->setEnabled( true );
         btnInstall->setText( tr( "Close" ) );
-        btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+        btnInstall->setIconSet( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ) );
 
         btnOptions->setText( tr( "Save output" ) );
-        btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+        btnOptions->setIconSet( Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ) );
 
         if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
             displayAvailableSpace( destination->currentText() );
     }
 }
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 6b31cd1..e07d8a0 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1,30 +1,30 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
  
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+      .=l.                                Dan Williams <drw@handhelds.org>
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU 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 file 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 General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "categoryfilterimpl.h"
@@ -37,16 +37,17 @@
 #include "mainwin.h"
 #include "packagewin.h"
 #include "settingsimpl.h"
 #include "utils.h"
 
 /* OPIE */
+#include <opie2/oresource.h>
+
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
 
 /* QT */
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qaction.h>
 #include <qcombobox.h>
@@ -118,50 +119,55 @@ MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
         text[0] = 'A' + i;
         LetterPushButton *b = new LetterPushButton( text, w );
         connect( b, SIGNAL( released(QString) ), this, SLOT( letterPushed(QString) ) );
         layout->addWidget( b, i / 13, i % 13);
     }
 
-    QAction *a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, w, 0 );
+    QAction *a = new QAction( QString::null, Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, w, 0 );
     a->setWhatsThis( tr( "Click here to hide the Quick Jump toolbar." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( hideJumpBar() ) );
     a->addTo( jumpBar );
     jumpBar->hide();
 
     // Packages menu
     QPopupMenu *popup = new QPopupMenu( this );
 
-    a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Update lists" ), Opie::Core::OResource::loadPixmap( "aqpkg/update", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to update package lists from servers." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( updateServer() ) );
     a->addTo( popup );
     a->addTo( bar );
 
-    actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "aqpkg/upgrade" ), QString::null, 0, this, 0 );
+    actionUpgrade = new QAction( tr( "Upgrade" ), Opie::Core::OResource::loadPixmap( "aqpkg/upgrade", Opie::Core::OResource::SmallIcon ),
+                                 QString::null, 0, this, 0 );
     actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) );
     connect( actionUpgrade, SIGNAL( activated() ), this, SLOT( upgradePackages() ) );
     actionUpgrade->addTo( popup );
     actionUpgrade->addTo( bar );
 
-    iconDownload = Resource::loadPixmap( "aqpkg/download" );
-    iconRemove = Resource::loadPixmap( "aqpkg/remove" );
+    iconDownload = Opie::Core::OResource::loadPixmap( "aqpkg/download", Opie::Core::OResource::SmallIcon );
+    iconRemove = Opie::Core::OResource::loadPixmap( "aqpkg/remove", Opie::Core::OResource::SmallIcon );
     actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
     actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) );
     connect( actionDownload, SIGNAL( activated() ), this, SLOT( downloadPackage() ) );
     actionDownload->addTo( popup );
     actionDownload->addTo( bar );
 
-    a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "aqpkg/apply" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Apply changes" ), Opie::Core::OResource::loadPixmap( "aqpkg/apply", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( applyChanges() ) );
     a->addTo( popup );
     a->addTo( bar );
 
     popup->insertSeparator();
 
-    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to configure this application." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
     a->addTo( popup );
     mb->insertItem( tr( "Actions" ), popup );
 
     // View menu
@@ -184,49 +190,54 @@ MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
     actionUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
     connect( actionUpdated, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) );
     actionUpdated->addTo( popup );
 
     popup->insertSeparator();
 
-    actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ),  QString::null, 0, this, 0 );
+    actionFilter = new QAction( tr( "Filter by category" ), Opie::Core::OResource::loadPixmap( "aqpkg/filter",
+                                Opie::Core::OResource::SmallIcon ),  QString::null, 0, this, 0 );
     actionFilter->setToggleAction( TRUE );
     actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
     connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
     actionFilter->addTo( popup );
 
     a = new QAction( tr( "Set filter category" ),  QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to change package category to used filter." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) );
     a->addTo( popup );
 
     popup->insertSeparator();
 
-    a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Find" ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to search for text in package names." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) );
     a->addTo( popup );
 
-    actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
+    actionFindNext = new QAction( tr( "Find next" ), Opie::Core::OResource::loadPixmap( "next", Opie::Core::OResource::SmallIcon ),
+                                  QString::null, 0, this, 0 );
     actionFindNext->setEnabled( FALSE );
     actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) );
     connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
     actionFindNext->addTo( popup );
     actionFindNext->addTo( findBar );
 
 
     popup->insertSeparator();
 
-    a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ),  QString::null, 0, this, 0 );
+    a = new QAction( tr( "Quick Jump keypad" ), Opie::Core::OResource::loadPixmap( "aqpkg/keyboard", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) );
     a->addTo( popup );
 
     mb->insertItem( tr( "View" ), popup );
 
     // Finish find toolbar creation
-    a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+    a = new QAction( QString::null, Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
     connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
     a->addTo( findBar );
     findBar->hide();
 
     // Create widget stack and add UI widgets
@@ -255,14 +266,14 @@ void MainWindow :: initMainWidget()
     QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow );
 
     serversList = new QComboBox( networkPkgWindow );
     connect( serversList, SIGNAL(activated(int)), this, SLOT(serverSelected(int)) );
     QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) );
 
-    installedIcon = Resource::loadPixmap( "installed" );
-    updatedIcon = Resource::loadPixmap( "aqpkg/updated" );
+    installedIcon = Opie::Core::OResource::loadPixmap( "installed" );
+    updatedIcon = Opie::Core::OResource::loadPixmap( "aqpkg/updated" );
 
     packagesList = new QListView( networkPkgWindow );
     packagesList->addColumn( tr( "Packages" ), 225 );
     QWhatsThis::add( packagesList, tr( "This is a listing of all packages for the server feed selected above.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nClick inside the box at the left to select a package." ) );
     QPEApplication::setStylusOperation( packagesList->viewport(), QPEApplication::RightOnHold );
     connect( packagesList, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index 499d647..5f0ae20 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -1,40 +1,40 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
                              
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+      .=l.                                Dan Williams <drw@handhelds.org>
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU 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 file 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 General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "packagewin.h"
 #include "package.h"
 #include "datamgr.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtextview.h>
 
@@ -105,13 +105,13 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
 
 	QVBoxLayout *layout = new QVBoxLayout( this, 4, 4 );
 
 	QTextView *l = new QTextView( str, QString::null, this );
 	layout->addWidget( l );
 
-	QPushButton *btn = new QPushButton( Resource::loadPixmap( "enter" ), tr( "Close" ), this );
+	QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ), tr( "Close" ), this );
 	layout->addWidget( btn );
 	connect( btn, SIGNAL( clicked() ), this, SLOT( close() ) );
 
 }
 
 PackageWindow::~PackageWindow()
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 9c8ec7a..7ffa1d6 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -1,44 +1,42 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+      .=l.                                Dan Williams <drw@handhelds.org>
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU 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 file 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 General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "settingsimpl.h"
 #include "global.h"
 
 /* OPIE */
 #include <opie2/otabwidget.h>
-#ifdef QWS
+#include <opie2/oresource.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
-#endif
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
@@ -108,17 +106,18 @@ QWidget *SettingsImpl :: initServerTab()
 
     servers = new QListBox( container );
     servers->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( servers, SIGNAL( highlighted(int) ), this, SLOT( editServer(int) ) );
     layout->addMultiCellWidget( servers, 0, 0, 0, 1 );
 
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "New" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( newServer() ) );
     layout->addWidget( btn, 1, 0 );
 
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), tr( "Delete" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( removeServer() ) );
     layout->addWidget( btn, 1, 1 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
@@ -136,13 +135,13 @@ QWidget *SettingsImpl :: initServerTab()
     serverurl = new QLineEdit( grpbox );
     grplayout->addWidget( serverurl, 1, 1 );
 
     active = new QCheckBox( tr( "Active Server" ), grpbox );
     grplayout->addMultiCellWidget( active, 2, 2, 0, 1 );
 
-    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), tr( "Update" ), grpbox );
     connect( btn, SIGNAL( clicked() ), this, SLOT( changeServerDetails() ) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 
     return control;
 }
 
@@ -166,17 +165,17 @@ QWidget *SettingsImpl :: initDestinationTab()
 
     destinations = new QListBox( container );
     destinations->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( destinations, SIGNAL( highlighted(int) ), this, SLOT( editDestination(int) ) );
     layout->addMultiCellWidget( destinations, 0, 0, 0, 1 );
 
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), tr( "New" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( newDestination() ) );
     layout->addWidget( btn, 1, 0 );
 
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), tr( "Delete" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( removeDestination() ) );
     layout->addWidget( btn, 1, 1 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Destination" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
@@ -194,13 +193,13 @@ QWidget *SettingsImpl :: initDestinationTab()
     destinationurl = new QLineEdit( grpbox );
     grplayout->addWidget( destinationurl, 1, 1 );
 
     linkToRoot = new QCheckBox( tr( "Link to root" ), grpbox );
     grplayout->addMultiCellWidget( linkToRoot, 2, 2, 0, 1 );
 
-    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), tr( "Update" ), grpbox );
     connect( btn, SIGNAL( clicked() ), this, SLOT( changeDestinationDetails() ) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 
     return control;
 }
 
@@ -249,13 +248,13 @@ QWidget *SettingsImpl :: initProxyTab()
 
     label = new QLabel( tr( "Password:" ), container );
     layout->addWidget( label, 3, 0 );
     txtPassword = new QLineEdit( container );
     layout->addWidget( txtPassword, 3, 1 );
 
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), tr( "Update" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( proxyApplyChanges() ) );
     layout->addMultiCellWidget( btn, 4, 4, 0, 1 );
 
     return control;
 }
 
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 5a4e284..eadfb63 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -27,20 +27,22 @@ _;:,   .>  :=|.         This file is free software; you can
 */
 
 #include "backuprestore.h"
 #include "errordialog.h"
 
 /* OPIE */
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/ostorageinfo.h>
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 #include <opie2/owait.h>
+
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
@@ -230,18 +232,18 @@ void BackupAndRestore::selectItem(QListViewItem *currentItem)
 {
     if(!currentItem)
         return;
 
     if(currentItem->text(HEADER_BACKUP) == "B")
     {
-        currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null"));
+        currentItem->setPixmap(HEADER_NAME, Opie::Core::OResource::loadPixmap("backup/null"));
         currentItem->setText(HEADER_BACKUP, "");
     }
     else
     {
-        currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check"));
+        currentItem->setPixmap(HEADER_NAME, Opie::Core::OResource::loadPixmap("backup/check"));
         currentItem->setText(HEADER_BACKUP, "B");
     }
 }
 
 void BackupAndRestore::scanForApplicationSettings()
 {