5 files changed, 15 insertions, 8 deletions
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp
index 82aeebd..a96f128 100644
--- a/noncore/net/opietooth/manager/main.cpp
+++ b/noncore/net/opietooth/manager/main.cpp
@@ -1,2 +1,4 @@
 /*
+using namespace Opie::Core;
+using namespace Opie::Core;
  * main.cpp
@@ -21,3 +23,3 @@
 #include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp
index 46a0e3d..1ef862a 100644
--- a/noncore/net/opietooth/manager/obexdialog.cpp
+++ b/noncore/net/opietooth/manager/obexdialog.cpp
@@ -11,4 +11,4 @@
 
-#include <opie/oprocess.h>
-#include <opie/ofiledialog.h>
+#include <opie2/oprocess.h>
+#include <opie2/ofiledialog.h>
 
@@ -16,2 +16,5 @@ using namespace OpieTooth;
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+using namespace Opie::Core;
 ObexDialog::ObexDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h
index b3d5e6d..d5b5682 100644
--- a/noncore/net/opietooth/manager/obexdialog.h
+++ b/noncore/net/opietooth/manager/obexdialog.h
@@ -5,3 +5,3 @@
 #include <qdialog.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 4e58552..870e7fd 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -7,3 +7,3 @@
 #include <qlabel.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
@@ -11,2 +11,4 @@ using namespace OpieTooth;
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 PPPDialog::PPPDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
@@ -54,3 +56,3 @@ void PPPDialog::connectToDevice() {
     *pppDial << "pppd" << m_device << "call" << connectScript;
-    connect( pppDial, SIGNAL(receivedStdout(OProcess*,char*,int) ),
+    connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ),
                 this, SLOT(fillOutPut(OProcess*,char*,int) ) );
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h
index bb8b734..05894e2 100644
--- a/noncore/net/opietooth/manager/pppdialog.h
+++ b/noncore/net/opietooth/manager/pppdialog.h
@@ -5,3 +5,3 @@
 #include <qdialog.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
@@ -25,3 +25,3 @@ namespace OpieTooth {
         void connectToDevice();
-        void fillOutPut( OProcess* pppDial, char* cha, int len );
+        void fillOutPut( Opie::Core::OProcess* pppDial, char* cha, int len );
     protected: