Resource -> OResource

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
@@ -12,19 +12,18 @@
 //
 #include "adresssearch.h"
 #include "contactitem.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 //#include <qwhatsthis.h>
 
 using namespace Opie;
 AdressSearch::AdressSearch(QListView* parent, QString name):
 	SearchGroup(parent, 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 ) );
 
 
 //	QWhatsThis::add( this, QObject::tr("Search the addressbook") );
 /*	QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
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
@@ -12,19 +12,18 @@
 //
 #include "applnksearch.h"
 #include "applnkitem.h"
 
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
 
 AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
 {
 	_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 ) );
 }
 
 
 AppLnkSearch::~AppLnkSearch()
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
@@ -11,9 +11,10 @@
 //
 //
 #include "contactitem.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
 #include <qpe/qcopenvelope_qws.h>
 
 
 using namespace Opie;
@@ -29,37 +30,37 @@ void ContactItem::setIcon()
 {
 	QPixmap icon;
 	switch ( _contact->lastHitField() ) {
 	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;
 	case Qtopia::DefaultEmail:
 	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;
 	case Qtopia::Title:
  	case Qtopia::JobTitle:
 	case Qtopia::FirstName:
@@ -67,16 +68,16 @@ void ContactItem::setIcon()
 	case Qtopia::LastName:
 	case Qtopia::Suffix:
 	case Qtopia::Nickname:
  	case Qtopia::FileAs:
-		icon = Resource::loadPixmap( "addressbook/identity" );
+        icon = Opie::Core::OResource::loadPixmap( "addressbook/identity", Opie::Core::OResource::SmallIcon );
  		break;
  	case Qtopia::HomeStreet:
  	case Qtopia::HomeCity:
  	case Qtopia::HomeState:
  	case Qtopia::HomeZip:
  	case Qtopia::HomeCountry:
-		icon = Resource::loadPixmap( "osearch/addresshome" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/addresshome", Opie::Core::OResource::SmallIcon );
  		break;
  	case Qtopia::Company:
  	case Qtopia::BusinessCity:
  	case Qtopia::BusinessStreet:
@@ -86,24 +87,24 @@ void ContactItem::setIcon()
  	case Qtopia::Office:
  	case Qtopia::Manager:
  	case Qtopia::BusinessPager:
  	case Qtopia::Profession:
-		icon = Resource::loadPixmap( "osearch/addresshome" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/addresshome", Opie::Core::OResource::SmallIcon );
  		break;
  	case Qtopia::Assistant:
 	case Qtopia::Spouse:
  	case Qtopia::Children:
-		icon = Resource::loadPixmap( "osearch/personal" );
+        icon = Opie::Core::OResource::loadPixmap( "osearch/personal", Opie::Core::OResource::SmallIcon );
  		break;
  	case Qtopia::Birthday:
  	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;
 	}
 	setPixmap( 0, icon );
 }
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
@@ -15,10 +15,10 @@
 
 #include <opie2/odebug.h>
 #include <opie2/opimevent.h>
 #include <opie2/opimrecurrence.h>
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
@@ -27,10 +27,10 @@
 
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _dates(0), _popupMenu(0)
 {
-	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 );
 	actionSearchInDates = new QAction( QObject::tr("Search in dates"),QString::null,  0, 0, 0, true );
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "datebook_settings" );
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
@@ -14,13 +14,13 @@
 
 #include "doclnkitem.h"
 #include "doclnksearch.h"
 
+#include <opie2/oresource.h>
 #include <opie2/owait.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 #include <qaction.h>
 #include <qfile.h>
@@ -30,10 +30,9 @@
 
 DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
 : AppLnkSearch(parent, name), _popupMenu(0)
 {
-        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 ) );
 
 	actionSearchInFiles = new QAction( QObject::tr("Search content"),QString::null,  0, 0, 0, true );
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "doclnk_settings" );
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
@@ -11,10 +11,10 @@
 //
 //
 #include "eventitem.h"
 
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
 using namespace Opie;
@@ -60,26 +60,26 @@ void EventItem::setIcon()
 {
 	QPixmap icon;
 	switch ( _event->lastHitField() ) {
 	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") );
 		break;
 	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;
  	case Qtopia::StartDateTime:
  	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;
 	}
 	setPixmap( 0, icon );
 }
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
@@ -20,15 +20,14 @@
 #include "doclnksearch.h"
 #include "mainwindow.h"
 
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <opie2/owait.h>
 
 #include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
 
-
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 
 #include <qtoolbar.h>
@@ -164,9 +163,9 @@ void MainWindow::makeMenu()
 
 
   //SEARCH
   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...") );
   connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
   SearchAllAction->addTo( searchMenu );
   searchMenu->insertItem( tr( "Options" ), searchOptions );
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
@@ -11,14 +11,12 @@
 //
 //
 #include "todoitem.h"
 
+#include <opie2/oresource.h>
 
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-
-
 using namespace Opie;
 TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo)
 : ResultItem(parent)
 {
@@ -60,24 +58,24 @@ void TodoItem::setIcon()
 {
 	QPixmap icon;
 	switch ( _todo->lastHitField() ) {
 	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;
 	}
 	setPixmap( 0, icon );
 }
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
@@ -12,9 +12,10 @@
 //
 #include "todosearch.h"
 #include "todoitem.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
 #include <qpe/config.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
@@ -24,10 +25,10 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _todos(0), _popupMenu(0)
 {
 //	AppLnkSet als(QPEApplication::qpeDir());
 //	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 );
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "todo_settings" );
    	actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );