| -rw-r--r-- | noncore/apps/odict/config.in | 2 | ||||
| -rw-r--r-- | noncore/apps/odict/main.cpp | 4 | ||||
| -rw-r--r-- | noncore/apps/odict/odict.pro | 4 | ||||
| -rw-r--r-- | noncore/apps/odict/opie-odict.control | 2 | ||||
| -rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 7 | ||||
| -rw-r--r-- | noncore/apps/odict/searchmethoddlg.h | 8 |
6 files changed, 12 insertions, 15 deletions
diff --git a/noncore/apps/odict/config.in b/noncore/apps/odict/config.in index 0ec2c89..c1f5eb4 100644 --- a/noncore/apps/odict/config.in +++ b/noncore/apps/odict/config.in @@ -3,2 +3,2 @@ default "n" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/noncore/apps/odict/main.cpp b/noncore/apps/odict/main.cpp index 0642022..d5b08d3 100644 --- a/noncore/apps/odict/main.cpp +++ b/noncore/apps/odict/main.cpp @@ -18,4 +18,4 @@ -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> + #include "odict.h" diff --git a/noncore/apps/odict/odict.pro b/noncore/apps/odict/odict.pro index 32e0ecc..7480cd7 100644 --- a/noncore/apps/odict/odict.pro +++ b/noncore/apps/odict/odict.pro @@ -4,3 +4,3 @@ HEADERS = odict.h \ configdlg.h \ - dingwidget.h + dingwidget.h @@ -13,3 +13,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lstdc++ -lopie +LIBS += -lqpe -lstdc++ -lopiecore2 -lopieui2 TARGET = odict diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control index b5cf931..bd4101b 100644 --- a/noncore/apps/odict/opie-odict.control +++ b/noncore/apps/odict/opie-odict.control @@ -6,3 +6,3 @@ Maintainer: Carsten Niehaus <cniehaus@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Dictionary look-up program diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp index 8ed7152..abe2966 100644 --- a/noncore/apps/odict/searchmethoddlg.cpp +++ b/noncore/apps/odict/searchmethoddlg.cpp @@ -18,2 +18,5 @@ +#include <opie2/ofileselector.h> +#include <opie2/ofiledialog.h> + #include <qpe/config.h> @@ -31,4 +34,4 @@ -#include <opie/ofileselector.h> -#include <opie/ofiledialog.h> +using Opie::OFileDialog; +using Opie::OFileSelector; diff --git a/noncore/apps/odict/searchmethoddlg.h b/noncore/apps/odict/searchmethoddlg.h index 706bbc1..ee9513b 100644 --- a/noncore/apps/odict/searchmethoddlg.h +++ b/noncore/apps/odict/searchmethoddlg.h @@ -9,9 +9,3 @@ -class QWidget; class QLineEdit; -class OTabWidget; -class QListView; -class QPushButton; -class QLabel; -class QString; @@ -22,3 +16,3 @@ class SearchMethodDlg : public QDialog Q_OBJECT - + public: |