9 files changed, 49 insertions, 53 deletions

diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index e1f575d..d260670 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -15,3 +15,3 @@
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
@@ -24,4 +24,3 @@ AdressSearch::AdressSearch(QListView* parent, QString name):
         _contacts = 0;
-        QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" );
-        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
+    setPixmap( 0, Opie::Core::OResource::loadPixmap( "addressbook/AddressBook", Opie::Core::OResource::SmallIcon ) );
 
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 474dbb2..69170c9 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -15,5 +15,6 @@
 
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
@@ -23,5 +24,3 @@ AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent,
         _apps = 0;
-        QIconSet is = Resource::loadIconSet( "osearch/applications" );
-        //QIconSet is = Resource::loadIconSet( "AppsIcon" );
-        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
+    setPixmap( 0, Opie::Core::OResource::loadPixmap( "osearch/applications", Opie::Core::OResource::SmallIcon ) );
 }
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index c89c6e2..81b6359 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -14,3 +14,4 @@
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
 #include <qpe/qcopenvelope_qws.h>
@@ -32,12 +33,12 @@ void ContactItem::setIcon()
         case -1:
-                icon = Resource::loadPixmap( "reset" );
+                icon = Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::BusinessPhone:
-                icon = Resource::loadPixmap( "addressbook/phonework" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::BusinessFax:
-                icon = Resource::loadPixmap( "addressbook/faxwork" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::BusinessMobile:
-                icon = Resource::loadPixmap( "addressbook/mobilework" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework", Opie::Core::OResource::SmallIcon );
                 break;
@@ -45,18 +46,18 @@ void ContactItem::setIcon()
         case Qtopia::Emails:
-                icon = Resource::loadPixmap( "addressbook/email" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/email", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::HomePhone:
-                icon = Resource::loadPixmap( "addressbook/phonehome" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::HomeFax:
-                icon = Resource::loadPixmap( "addressbook/faxhome" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::HomeMobile:
-                icon = Resource::loadPixmap( "addressbook/mobilehome" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::HomeWebPage:
-                icon = Resource::loadPixmap( "addressbook/webpagehome" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::BusinessWebPage:
-                icon = Resource::loadPixmap( "addressbook/webpagework" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework", Opie::Core::OResource::SmallIcon );
                 break;
@@ -70,3 +71,3 @@ void ContactItem::setIcon()
          case Qtopia::FileAs:
-                icon = Resource::loadPixmap( "addressbook/identity" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/identity", Opie::Core::OResource::SmallIcon );
                 break;
@@ -77,3 +78,3 @@ void ContactItem::setIcon()
          case Qtopia::HomeCountry:
-                icon = Resource::loadPixmap( "osearch/addresshome" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/addresshome", Opie::Core::OResource::SmallIcon );
                 break;
@@ -89,3 +90,3 @@ void ContactItem::setIcon()
          case Qtopia::Profession:
-                icon = Resource::loadPixmap( "osearch/addresshome" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/addresshome", Opie::Core::OResource::SmallIcon );
                 break;
@@ -94,3 +95,3 @@ void ContactItem::setIcon()
          case Qtopia::Children:
-                icon = Resource::loadPixmap( "osearch/personal" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/personal", Opie::Core::OResource::SmallIcon );
                 break;
@@ -98,9 +99,9 @@ void ContactItem::setIcon()
          case Qtopia::Anniversary:
-                icon = Resource::loadPixmap( "osearch/clock" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/clock", Opie::Core::OResource::SmallIcon );
                 break;
          case Qtopia::Notes:
-                icon = Resource::loadPixmap( "txt" );
+        icon = Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon );
                 break;
         default:
-                icon = Resource::loadPixmap( "DocsIcon" );
+        icon = Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon );
                 break;
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index ef3b006..13df6bf 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -18,4 +18,4 @@
 #include <opie2/opimrecurrence.h>
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/config.h>
@@ -30,4 +30,4 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
 {
-        QIconSet is = Resource::loadIconSet( "datebook/DateBook" );
-        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
+    setPixmap( 0, Opie::Core::OResource::loadPixmap( "datebook/DateBook", Opie::Core::OResource::SmallIcon ) );
+
         actionShowPastEvents = new QAction( QObject::tr("Show past events"),QString::null,  0, 0, 0, true );
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 3d91c1f..9d165be 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -17,2 +17,3 @@
 
+#include <opie2/oresource.h>
 #include <opie2/owait.h>
@@ -21,3 +22,2 @@
 #include <qpe/config.h>
-#include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
@@ -33,4 +33,3 @@ DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
 {
-        QIconSet is = Resource::loadIconSet( "osearch/documents" );
-        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
+    setPixmap( 0, Opie::Core::OResource::loadPixmap( "osearch/documents", Opie::Core::OResource::SmallIcon ) );
 
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index 7bcf340..36adc63 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -14,4 +14,4 @@
 
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -63,3 +63,3 @@ void EventItem::setIcon()
         case -1:
-                icon = Resource::loadPixmap( "reset" );
+        icon = Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon );
         //      QWhatsThis::add( icon, QObject::tr("Enter your search terms here") );
@@ -67,9 +67,9 @@ void EventItem::setIcon()
         case Qtopia::DatebookDescription:
-                icon = Resource::loadPixmap( "osearch/summary" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/summary", Opie::Core::OResource::SmallIcon );
                 break;
          case Qtopia::Notes:
-                icon = Resource::loadPixmap( "txt" );
+        icon = Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon );
                 break;
         case Qtopia::Location:
-                icon = Resource::loadPixmap( "home" );
+        icon = Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon );
                 break;
@@ -77,6 +77,6 @@ void EventItem::setIcon()
          case Qtopia::EndDateTime:
-                icon = Resource::loadPixmap( "osearch/clock" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/clock", Opie::Core::OResource::SmallIcon );
                 break;
         default:
-                icon = Resource::loadPixmap( "DocsIcon" );
+        icon = Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon );
                 break;
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 1d0331c..d71b167 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -23,2 +23,3 @@
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <opie2/owait.h>
@@ -26,6 +27,4 @@
 #include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
 
-
 #include <qpe/qpeapplication.h>
@@ -167,3 +166,3 @@ void MainWindow::makeMenu()
   SearchAllAction = new QAction( tr("Search all"),QString::null,  0, this, 0 );
-  SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
+  SearchAllAction->setIconSet( Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ) );
  // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp
index 34e790a..9172344 100644
--- a/core/pim/osearch/todoitem.cpp
+++ b/core/pim/osearch/todoitem.cpp
@@ -14,8 +14,6 @@
 
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-
-
 using namespace Opie;
@@ -63,18 +61,18 @@ void TodoItem::setIcon()
         case -1:
-                icon = Resource::loadPixmap( "reset" );
+        icon = Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon );
                 break;
         case OPimTodo::Description:
-                icon = Resource::loadPixmap( "txt" );
+        icon = Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon );
                 break;
          case OPimTodo::Summary:
-                icon = Resource::loadPixmap( "osearch/summary" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/summary", Opie::Core::OResource::SmallIcon );
                 break;
         case OPimTodo::Priority:
-                icon = Resource::loadPixmap( "todo/priority1" );
+        icon = Opie::Core::OResource::loadPixmap( "todo/priority1", Opie::Core::OResource::SmallIcon );
                 break;
          case OPimTodo::HasDate:
-                icon = Resource::loadPixmap( "osearch/clock" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/clock", Opie::Core::OResource::SmallIcon );
                 break;
         default:
-                icon = Resource::loadPixmap( "DocsIcon" );
+        icon = Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon );
                 break;
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 1ed7370..8a9ae39 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -15,3 +15,4 @@
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
 #include <qpe/config.h>
@@ -27,4 +28,4 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
         //setPixmap( 0, als.findExec("todolist")->pixmap() );
-        QIconSet is = Resource::loadIconSet( "todo/TodoList" );
-        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
+    setPixmap( 0, Opie::Core::OResource::loadPixmap( "todo/TodoList", Opie::Core::OResource::SmallIcon ) );
+
         actionShowCompleted = new QAction( QObject::tr("Show completed tasks"),QString::null,  0, 0, 0, true );