ODict: libopie->libopie2

6 files changed, 10 insertions, 13 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
@@ -1,4 +1,4 @@
   config ODICT
     boolean "opie-odict (electronic dictionary)"
     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
@@ -16,8 +16,8 @@
  **************************************************************************/
 
 
-#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
@@ -11,7 +11,7 @@ SOURCES		= main.cpp \
 		  dingwidget.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS		+= -lqpe -lstdc++ -lopie
+LIBS		+= -lqpe -lstdc++ -lopiecore2 -lopieui2
 TARGET 		= odict
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Description: Dictionary look-up program
  Look up words :)
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -16,6 +16,9 @@
  **************************************************************************/
 #include "searchmethoddlg.h"
 
+#include <opie2/ofileselector.h>
+#include <opie2/ofiledialog.h>
+
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
@@ -29,8 +32,8 @@
 #include <qlineedit.h>
 #include <qdir.h>
 
-#include <opie/ofileselector.h>
-#include <opie/ofiledialog.h>
+using Opie::OFileDialog;
+using Opie::OFileSelector;
 
 SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal)
 {
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
@@ -7,13 +7,7 @@
  *                                                                         *
  **************************************************************************/
 
-class QWidget;
 class QLineEdit;
-class OTabWidget;
-class QListView;
-class QPushButton;
-class QLabel;
-class QString;
 
 #include <qdialog.h>