17 files changed, 18 insertions, 22 deletions

diff --git a/noncore/apps/opie-console/config.in b/noncore/apps/opie-console/config.in
index 521154d..b5702a9 100644
--- a/noncore/apps/opie-console/config.in
+++ b/noncore/apps/opie-console/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/apps/opie-console/file_layer.cpp b/noncore/apps/opie-console/file_layer.cpp
index 9ddef80..870e913 100644
--- a/noncore/apps/opie-console/file_layer.cpp
+++ b/noncore/apps/opie-console/file_layer.cpp
@@ -1,3 +1 @@
-#include <opie/oprocess.h>
-
 #include "file_layer.h"
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp
index 347d6e0..7eebc65 100644
--- a/noncore/apps/opie-console/filetransfer.cpp
+++ b/noncore/apps/opie-console/filetransfer.cpp
@@ -8,4 +8,2 @@
 
-#include <opie/oprocess.h>
-
 #include "procctl.h"
diff --git a/noncore/apps/opie-console/filetransfer.h b/noncore/apps/opie-console/filetransfer.h
index 8f55041..3b79cda 100644
--- a/noncore/apps/opie-console/filetransfer.h
+++ b/noncore/apps/opie-console/filetransfer.h
@@ -5,2 +5,4 @@
 
+#include <opie2/oprocess.h>
+
 #include <qfile.h>
@@ -11,3 +13,2 @@
 class QSocketNotifier;
-class OProcess;
 class FileTransferControl;
diff --git a/noncore/apps/opie-console/io_bt.h b/noncore/apps/opie-console/io_bt.h
index 239eefb..df6dd38 100644
--- a/noncore/apps/opie-console/io_bt.h
+++ b/noncore/apps/opie-console/io_bt.h
@@ -3,3 +3,3 @@
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 #include "io_serial.h"
diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h
index 14b1ae3..69bed7d 100644
--- a/noncore/apps/opie-console/io_irda.h
+++ b/noncore/apps/opie-console/io_irda.h
@@ -3,3 +3,3 @@
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 #include "io_serial.h"
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 2a926df..96ec3ef 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -3,3 +3,3 @@
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 #include "io_serial.h"
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 3fe9040..0a475d8 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -12,3 +12,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
@@ -335,3 +335,3 @@ void MainWindow::slotSaveScript() {
         map.insert(tr("Script"), text );
-        QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+        QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
         if (!filename.isEmpty()) {
@@ -708,3 +708,3 @@ void MainWindow::slotSaveHistory() {
     map.insert(tr("History"), text );
-    QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+    QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
     if (filename.isEmpty() ) return;
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 5548baf..a7ff1f3 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: 0.6-$SUB_VERSION
-Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs
+Depends: qpe-base, libopiecore2, libopieui2, opie-console-help-en, lrzsz, opie-keytabs
 License: GPL
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index ccf2e08..d3d7b25 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -69,3 +69,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie -lutil
+LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index c731747..97bd650 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -4,3 +4,3 @@
 #include <qdialog.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index 0a315cf..c47e73e 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -3,3 +3,2 @@
 #include <qfile.h>
-#include <opie/oprocess.h>
 #include <stdio.h>
diff --git a/noncore/apps/opie-console/sz_transfer.h b/noncore/apps/opie-console/sz_transfer.h
index d3e6621..aa97c32 100644
--- a/noncore/apps/opie-console/sz_transfer.h
+++ b/noncore/apps/opie-console/sz_transfer.h
@@ -4,3 +4,3 @@
 #include "file_layer.h"
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
diff --git a/noncore/apps/opie-console/tabwidget.h b/noncore/apps/opie-console/tabwidget.h
index cbaa0f1..98450a3 100644
--- a/noncore/apps/opie-console/tabwidget.h
+++ b/noncore/apps/opie-console/tabwidget.h
@@ -4,3 +4,3 @@
 #include <qmap.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 
diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro
index 7b4c310..624f381 100644
--- a/noncore/apps/opie-console/test/console.pro
+++ b/noncore/apps/opie-console/test/console.pro
@@ -14,3 +14,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopiecore2
 TARGET       = test
diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp
index 4026808..4a7202d 100644
--- a/noncore/apps/opie-console/test/senderui.cpp
+++ b/noncore/apps/opie-console/test/senderui.cpp
@@ -13,3 +13,3 @@
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index 55dd748..30e7caf 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -10,3 +10,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
@@ -100,3 +100,3 @@ void TransferDialog::slotFilename()
 
-        f = OFileDialog::getOpenFileName(0);
+    f = Opie::OFileDialog::getOpenFileName(0);
         if(!f.isNull()) filename->setText(f);