author | drw <drw> | 2005-06-15 22:39:20 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 22:39:20 (UTC) |
commit | e0205bac48b9d23af9feb48004c24fcf7a5e8200 (patch) (unidiff) | |
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 @@ | |||
1 | config EXAMPLE_BOARD | 1 | config EXAMPLE_BOARD |
2 | boolean "Input Method Example" | 2 | boolean "Input Method Example" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES | 4 | 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 @@ | |||
1 | #include <qwidget.h> | 1 | #include <qwidget.h> |
2 | #include <qcheckbox.h> | 2 | #include <qcheckbox.h> |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <qsignalmapper.h> | 4 | #include <qsignalmapper.h> |
5 | #include <qpushbutton.h> | 5 | #include <qpushbutton.h> |
6 | #include <qpe/resource.h> | 6 | |
7 | #include <opie2/oresource.h> | ||
7 | 8 | ||
8 | #include "exampleboardimpl.h" | 9 | #include "exampleboardimpl.h" |
9 | 10 | ||
10 | ExampleBoard::ExampleBoard(QWidget* par, WFlags fl ) | 11 | ExampleBoard::ExampleBoard(QWidget* par, WFlags fl ) |
11 | : QHBox(par, "name", fl ) | 12 | : QHBox(par, "name", fl ) |
12 | { | 13 | { |
@@ -115,13 +116,13 @@ void ExampleboardImpl::resetState() | |||
115 | m_pickboard->resetState(); | 116 | m_pickboard->resetState(); |
116 | } | 117 | } |
117 | 118 | ||
118 | QPixmap *ExampleboardImpl::icon() | 119 | QPixmap *ExampleboardImpl::icon() |
119 | { | 120 | { |
120 | if ( !m_icn ) | 121 | if ( !m_icn ) |
121 | m_icn = new QPixmap(Resource::loadPixmap("Tux")); | 122 | m_icn = new QPixmap(Opie::Core::OResource::loadPixmap("Tux", Opie::Core::OResource::SmallIcon)); |
122 | return m_icn; | 123 | return m_icn; |
123 | } | 124 | } |
124 | 125 | ||
125 | QString ExampleboardImpl::name() | 126 | QString ExampleboardImpl::name() |
126 | { | 127 | { |
127 | return QObject::tr("Example Input"); | 128 | 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 | |||
3 | HEADERS= exampleboardimpl.h | 3 | HEADERS= exampleboardimpl.h |
4 | SOURCES= exampleboardimpl.cpp | 4 | SOURCES= exampleboardimpl.cpp |
5 | TARGET = example_board | 5 | TARGET = example_board |
6 | DESTDIR = $(OPIEDIR)/plugins/inputmethods | 6 | DESTDIR = $(OPIEDIR)/plugins/inputmethods |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../../launcher | 8 | DEPENDPATH += ../../launcher |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |