11 files changed, 24 insertions, 14 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index b780675..485354b 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -57,4 +57,5 @@ const double deg2rad = 0.017453292519943295769; // pi/180
 const int sw_prec = 2;
 
+using namespace Opie::Ui;
 void startPlayer()
 {
@@ -146,5 +147,5 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
   alarmBtn->setText( tr( "Set Alarm" ) );
 
-  Opie::OClickableLabel *click = new Opie::OClickableLabel( controls, "label" );
+  OClickableLabel *click = new Opie::Ui::OClickableLabel( controls, "label" );
   click->setText( tr( "Set date and time." ) );
   gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter );
diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp
index 89dd1bd..237d9f0 100644
--- a/noncore/tools/clock/main.cpp
+++ b/noncore/tools/clock/main.cpp
@@ -24,3 +24,5 @@
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Clock> )
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp
index 6fec5a0..9d5fc49 100644
--- a/noncore/tools/clock/setAlarm.cpp
+++ b/noncore/tools/clock/setAlarm.cpp
@@ -33,4 +33,5 @@
 #include <qcheckbox.h>
 
+using namespace Opie::Ui;
 Set_Alarm::Set_Alarm( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
@@ -210,5 +211,5 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
         text << "audio/*";
         map.insert(tr("Audio"), text );
-        QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
+        QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
 //        QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
         if(!str.isEmpty() ) {
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp
index b765a5e..d5f6c7f 100644
--- a/noncore/tools/euroconv/main.cpp
+++ b/noncore/tools/euroconv/main.cpp
@@ -1,4 +1,6 @@
 /****************************************************************************
  *
+using namespace Opie::Core;
+using namespace Opie::Core;
  * File:        main.cpp
  *
@@ -19,5 +21,5 @@
 #include "calckeypad.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 struct Layout : QVBox{
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 77e1790..4204d73 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -12,5 +12,5 @@
 
 /* OPIE */
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp
index bdd4a2c..d47479e 100644
--- a/noncore/tools/formatter/main.cpp
+++ b/noncore/tools/formatter/main.cpp
@@ -1,4 +1,5 @@
 
 /***************************************************************************
+
                           main.cpp  -  description
                              -------------------
@@ -16,3 +17,4 @@
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> )
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in
index 614ac8b..b3ca373 100644
--- a/noncore/tools/opie-sh/config.in
+++ b/noncore/tools/opie-sh/config.in
@@ -2,3 +2,3 @@
     boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in
index 3b70590..2a42c58 100644
--- a/noncore/tools/remote/config.in
+++ b/noncore/tools/remote/config.in
@@ -2,3 +2,3 @@
     boolean "opie-remote (remote control using irda, frontent to lirc)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/noncore/tools/remote/recorddialog.cpp b/noncore/tools/remote/recorddialog.cpp
index 1ce5472..a9c4c61 100644
--- a/noncore/tools/remote/recorddialog.cpp
+++ b/noncore/tools/remote/recorddialog.cpp
@@ -17,4 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "recorddialog.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 RecordDialog::RecordDialog(QWidget *parent, const char *name)
     :QDialog(parent, name)
@@ -50,7 +52,7 @@ void RecordDialog::retPressed()
         if(where == 0)
         {
-                connect(record, SIGNAL(receivedStdout(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) );
-                connect(record, SIGNAL(receivedStderr(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) );
-                connect(record, SIGNAL(processExited(OProcess*)), this, SLOT(done(OProcess*)) );
+                connect(record, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) );
+                connect(record, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) );
+                connect(record, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT(done(Opie::Core::OProcess*)) );
                 printf("RecordDialog::retPressed: starting irrecord\n");
                 QString file = "/tmp/" + input->text();
diff --git a/noncore/tools/remote/recorddialog.h b/noncore/tools/remote/recorddialog.h
index e4dcae6..46a82ce 100644
--- a/noncore/tools/remote/recorddialog.h
+++ b/noncore/tools/remote/recorddialog.h
@@ -28,5 +28,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <stdio.h>
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 class RecordDialog : public QDialog
@@ -37,10 +37,10 @@ public:
 public slots:
         void retPressed();
-        void incoming(OProcess *proc, char *buffer, int len);
-        void done(OProcess *proc);
+        void incoming(Opie::Core::OProcess *proc, char *buffer, int len);
+        void done(Opie::Core::OProcess *proc);
 private:
         QTextView *output;
         QLineEdit *input;
-        OProcess *record;
+        Opie::Core::OProcess *record;
         int where;
 };
diff --git a/noncore/tools/remote/remote.pro b/noncore/tools/remote/remote.pro
index 660c7f7..8b3e4be 100644
--- a/noncore/tools/remote/remote.pro
+++ b/noncore/tools/remote/remote.pro
@@ -6,5 +6,5 @@ SOURCES		=remote.cpp remotetab.cpp learntab.cpp configtab.cpp topgroup.cpp dvdgr
         INCLUDEPATH+=$(OPIEDIR)/include
         DEPENDPATH+=$(OPIEDIR)/include
-        LIBS    +=-lqpe -lopie
+        LIBS    +=-lqpe -lopiecore2
 TARGET          = remote