ODict: libopie->libopie2

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
@@ -2,3 +2,3 @@
     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
@@ -17,6 +17,6 @@
 
 
-#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
@@ -3,5 +3,5 @@ HEADERS		= odict.h \
                                 searchmethoddlg.h \
                                 configdlg.h \
-                                dingwidget.h 
+                                dingwidget.h
 
         SOURCES         = main.cpp \
@@ -12,5 +12,5 @@ SOURCES		= main.cpp \
 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
@@ -5,5 +5,5 @@ 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 :)
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
@@ -17,4 +17,7 @@
 #include "searchmethoddlg.h"
 
+#include <opie2/ofileselector.h>
+#include <opie2/ofiledialog.h>
+
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
@@ -30,6 +33,6 @@
 #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
@@ -8,11 +8,5 @@
  **************************************************************************/
 
-class QWidget;
 class QLineEdit;
-class OTabWidget;
-class QListView;
-class QPushButton;
-class QLabel;
-class QString;
 
 #include <qdialog.h>
@@ -21,5 +15,5 @@ class SearchMethodDlg : public QDialog
 {
         Q_OBJECT
-        
+
     public:
                 SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0  );