| author | drw <drw> | 2005-06-15 22:39:20 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-06-15 22:39:20 (UTC) |
| commit | e0205bac48b9d23af9feb48004c24fcf7a5e8200 (patch) (side-by-side diff) | |
| tree | 2faa077192fd0bfc4fc409f0513cc0e82113fa9e /examples/inputmethod | |
| parent | d2474c8e654d223b85b6200ce09fabd3a40af8e3 (diff) | |
| download | opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.zip opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.gz opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | examples/inputmethod/config.in | 2 | ||||
| -rw-r--r-- | examples/inputmethod/exampleboardimpl.cpp | 5 | ||||
| -rw-r--r-- | examples/inputmethod/inputmethod.pro | 2 |
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,12 +1,13 @@ #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 ) { @@ -115,13 +116,13 @@ void ExampleboardImpl::resetState() 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"); 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 @@ -3,10 +3,10 @@ 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 ) |