Resource -> OResource

5 files changed, 12 insertions, 17 deletions

diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 57a4088..a32e98b 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -18,13 +18,14 @@
 **
 **********************************************************************/
 
 #include "clipboard.h"
 
 #include <opie2/otaskbarapplet.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
 
 #include <qpainter.h>
 #include <qpopupmenu.h>
 #include <qwindowsystem_qws.h>
 #include <qapplication.h>
@@ -37,16 +38,13 @@
 using namespace Opie::Ui;
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
         setFixedWidth ( AppLnk::smallIconSize()  );
         setFixedHeight ( AppLnk::smallIconSize()  );
 
-        QImage img = Resource::loadImage( "paste");
-        img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
-
-        m_clipboardPixmap.convertFromImage( img );
+    m_clipboardPixmap = Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon );
 
         m_timer = new QTimer ( this );
 
         connect ( QApplication::clipboard ( ), SIGNAL( dataChanged()), this, SLOT( newData()));
         connect ( m_timer, SIGNAL( timeout()), this, SLOT( newData()));
         connect ( qApp, SIGNAL( aboutToQuit()), this, SLOT( shutdown()));
@@ -93,15 +91,15 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *)
                                 m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i );
                                 m_menu-> setItemChecked ( i, false );
                         }
                         m_menu-> setItemChecked ( m_history. count ( ) - 1, true );
                         m_menu-> insertSeparator ( );
                 }
-                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
-                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
-                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );
+    m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "cut", Opie::Core::OResource::SmallIcon ), tr( "Cut" ), 100 );
+    m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), tr( "Copy" ), 101 );
+    m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), tr( "Paste" ), 102 );
 
                 connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int)));
 
                 m_dirty = false;
         }
         QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index 647598d..cdd0121 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -3,11 +3,11 @@ CONFIG		+= qt plugin warn_on
         HEADERS         =   clipboard.h
         SOURCES         =   clipboard.cpp
         TARGET  = clipboardapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
         VERSION         = 1.0.0
 
 include( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control
index e0e2d82..6596633 100644
--- a/core/applets/clipboardapplet/opie-clipboardapplet.control
+++ b/core/applets/clipboardapplet/opie-clipboardapplet.control
@@ -1,10 +1,10 @@
 Package: opie-clipboardapplet
 Files: plugins/applets/libclipboardapplet.so*
 Priority: optional
 Section: opie/applets
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: Clipboard applet
  Clipboard applet for the Opie environment taskbar.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 0f36f16..dc0c67c 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -1,10 +1,11 @@
 #include "logout.h"
 
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
 #include <qmessagebox.h>
 
 #include <unistd.h>
@@ -42,17 +43,13 @@ QString LogoutApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "LogoutApplet", s, p );
 }
 
 QIconSet LogoutApplet::icon ( ) const
 {
-        QPixmap pix;
-        QImage img = Resource::loadImage ( "logout" );
-
-        if ( !img. isNull ( ))
-        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPixmap pix = Opie::Core::OResource::loadPixmap("logout", Opie::Core::OResource::SmallIcon );
         return pix;
 }
 
 QPopupMenu *LogoutApplet::popup ( QWidget * ) const
 {
         return 0;
diff --git a/core/applets/logoutapplet/logoutapplet.pro b/core/applets/logoutapplet/logoutapplet.pro
index 23cab02..5bb1571 100644
--- a/core/applets/logoutapplet/logoutapplet.pro
+++ b/core/applets/logoutapplet/logoutapplet.pro
@@ -3,11 +3,11 @@ CONFIG       += qt plugin warn_on
 HEADERS       = logout.h
 SOURCES       = logout.cpp
 TARGET        = logoutapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
-LIBS         += -lqpe
+LIBS         += -lqpe -lopiecore2
 VERSION       = 1.0.0
 
 include( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets