Resource -> OResource

3 files changed, 5 insertions, 4 deletions

diff --git a/examples/inputmethod/config.in b/examples/inputmethod/config.in
index c0aa7e8..85b9725 100644
--- a/examples/inputmethod/config.in
+++ b/examples/inputmethod/config.in
@@ -1,4 +1,4 @@
   config EXAMPLE_BOARD
     boolean "Input Method Example"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && EXAMPLES
diff --git a/examples/inputmethod/exampleboardimpl.cpp b/examples/inputmethod/exampleboardimpl.cpp
index 36989a2..6c7196b 100644
--- a/examples/inputmethod/exampleboardimpl.cpp
+++ b/examples/inputmethod/exampleboardimpl.cpp
@@ -1,22 +1,23 @@
 #include <qwidget.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qsignalmapper.h>
 #include <qpushbutton.h>
-#include <qpe/resource.h>
+
+#include <opie2/oresource.h>
 
 #include "exampleboardimpl.h"
 
 ExampleBoard::ExampleBoard(QWidget* par, WFlags fl )
         : QHBox(par, "name", fl )
 {
         QCheckBox *box1 = new QCheckBox(tr("Alt"),this);
         connect(box1,SIGNAL(toggled(bool)),
                         this,SLOT(slotAlt(bool)));
         m_alt = box1;
         box1 = new QCheckBox(tr("Shift"),this );
         connect(box1,SIGNAL(toggled(bool)),
                         this,SLOT(slotShift(bool)));
         m_shi = box1;
         box1 = new QCheckBox(tr("Ctrl","Control Shortcut on keyboard"),this );
         connect(box1,SIGNAL(toggled(bool)),
@@ -105,33 +106,33 @@ ExampleboardImpl::~ExampleboardImpl()
 QWidget *ExampleboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !m_pickboard )
         m_pickboard = new ExampleBoard( parent, f );
     return m_pickboard;
 }
 
 void ExampleboardImpl::resetState()
 {
     if ( m_pickboard )
         m_pickboard->resetState();
 }
 
 QPixmap *ExampleboardImpl::icon()
 {
     if ( !m_icn )
-        m_icn = new QPixmap(Resource::loadPixmap("Tux"));
+        m_icn = new QPixmap(Opie::Core::OResource::loadPixmap("Tux", Opie::Core::OResource::SmallIcon));
     return m_icn;
 }
 
 QString ExampleboardImpl::name()
 {
     return QObject::tr("Example Input");
 }
 
 void ExampleboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( m_pickboard )
         QObject::connect( m_pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT ExampleboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
diff --git a/examples/inputmethod/inputmethod.pro b/examples/inputmethod/inputmethod.pro
index ea98dd5..56881ff 100644
--- a/examples/inputmethod/inputmethod.pro
+++ b/examples/inputmethod/inputmethod.pro
@@ -1,12 +1,12 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on 
         HEADERS=   exampleboardimpl.h
         SOURCES=   exampleboardimpl.cpp
         TARGET  = example_board
         DESTDIR         = $(OPIEDIR)/plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ../../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
         VERSION         = 1.0.0
 
 include( $(OPIEDIR)/include.pro )