22 files changed, 43 insertions, 48 deletions

diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in
index 866adfb..27a8187 100644
--- a/noncore/applets/notesapplet/config.in
+++ b/noncore/applets/notesapplet/config.in
@@ -1,4 +1,4 @@
   config NOTESAPPLET
     boolean "opie-notesapplet (quick note taking applet)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index a694b70..6d41ac3 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -29,14 +29,14 @@
 #include <sys/stat.h>

 #include <dirent.h>

 #include <sys/sendfile.h>

 #include <fcntl.h>

 

 

-using namespace Opie::Core;
-using namespace Opie::Core;
+using namespace Opie::Core;

+using namespace Opie::Core;

 void AdvancedFm::doDirChange() {

    QString pathItem = CurrentView()->currentItem()->text(0);

    if( pathItem == "../") {

       ListClicked( CurrentView()->currentItem());

    } else {

       if( pathItem.find(" -> ",0,TRUE) != -1)

@@ -702,16 +702,16 @@ void AdvancedFm::selectAll() {
 

 void AdvancedFm::startProcess(const QString & cmd) {

   QStringList command;

   OProcess *process;

   process = new OProcess();

   connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),

-          this, SLOT( processEnded(OProcess*)));

+          this, SLOT( processEnded(Opie::Core::OProcess*)));

 

   connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),

-            this, SLOT( oprocessStderr(OProcess*,char*,int)));

+          this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));

 

   command << "/bin/sh";

   command << "-c";

   command << cmd.latin1();

   *process << command;

   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )

diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 16a0992..6906298 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -144,16 +144,16 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
     proc = new OProcess();
 
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( processFinished()));
 
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStdout(OProcess*,char*,int)));
+            this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
 
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStderr(OProcess*,char*,int)));
+            this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
 
 //     connect( , SIGNAL(received(const QByteArray&)),
 //             this, SLOT(commandStdin(const QByteArray&)));
 
 //    * proc << commands.latin1();
       for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 35a328f..a29fa8e 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,11 +1,10 @@
 
 #include "io_bt.h"
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOBt::~IOBt() {
@@ -36,13 +35,13 @@ bool IOBt::open() {
         m_attach = new OProcess();
         *m_attach << "hciattach /dev/ttyS2 any 57600";
 
         // then start hcid, then rcfomm handling (m_mac)
 
         connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
-                 this, SLOT( slotExited(OProcess*) ) );
+                 this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
         if ( m_attach->start() ) {
             ret = IOSerial::open();
         } else {
             qWarning("could not attach to device");
             delete m_attach;
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index ba0b0e5..07c2b62 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -1,11 +1,10 @@
 
 #include "io_irda.h"
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOIrda::~IOIrda() {
@@ -27,13 +26,13 @@ bool IOIrda::open() {
 
     // irdaattach here
     m_attach = new OProcess();
     *m_attach << "irattach /dev/ttyS2 -s";
 
     connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
-            this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
     if ( m_attach->start() ) {
         ret= IOSerial::open();
     } else {
     // emit error!!!
         qWarning("could not attach to device");
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index 5958e93..fbc5306 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -27,15 +27,15 @@ void SzTransfer::sendFile(const QString& file) {
     proc = new OProcess;
     *proc << "sz";
     *proc << "-v" << "-v" << "-b" << file;
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT(sent()));
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(SzReceivedStdout(OProcess*,char*,int)));
+            this, SLOT(SzReceivedStdout(Opie::Core::OProcess*,char*,int)));
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(SzReceivedStderr(OProcess*,char*,int)));
+            this, SLOT(SzReceivedStderr(Opie::Core::OProcess*,char*,int)));
     connect(layer(), SIGNAL(received(const QByteArray&)),
             this, SLOT(receivedStdin(const QByteArray&)));
     proc->start(OProcess::NotifyOnExit, OProcess::All);
 
 }
 
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 21e24a0..5eae31f 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -6,14 +6,12 @@
 #include <qmessagebox.h>
 #include <stdlib.h>
 #include <qpe/global.h>
 #include <opie2/oprocess.h>
 
 using namespace Opie::Core;
-using namespace Opie::Core;
-using namespace Opie::Core;
 MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
     : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name)
 {
     if (MHPath.length()>0) {
         if (MHPath[MHPath.length()-1]=='/') {
             MHPath=MHPath.left(MHPath.length()-1);
@@ -318,15 +316,15 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
     command << "/bin/sh";
     command << "-c";
     command << cmd.latin1();
     OProcess *process = new OProcess();
 
     connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
-            this, SLOT( processEnded(OProcess*)));
+            this, SLOT( processEnded(Opie::Core::OProcess*)));
     connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT( oprocessStderr(OProcess*,char*,int)));
+            this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
     *process << command;
     removeMboxfailed = false;
     if(!process->start(OProcess::Block, OProcess::All) ) {
         qDebug("could not start process");
         return 0;
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index d913853..18d26e4 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -5,13 +5,12 @@
 
 #include "device.h"
 
 using namespace OpieTooth;
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 namespace {
   int parsePid( const QCString& par ){
     int id=0;
     QString string( par );
     QStringList list =  QStringList::split( '\n', string );
     for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){
@@ -47,17 +46,17 @@ void Device::attach(){
     qWarning("new process to create" );
     m_process = new OProcess();
     *m_process << "hciattach";
     *m_process << "-p";
     *m_process << m_device << m_mode << m_speed;
     connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
-            this, SLOT( slotExited(OProcess* ) ) );
+            this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
     connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ),
-            this, SLOT(slotStdOut(OProcess*,char*,int ) ) );
+            this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int ) ) );
     connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ),
-            this, SLOT(slotStdErr(OProcess*,char*,int) ) );
+            this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) );
     if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){
       qWarning("Could not start" );
       delete m_process;
       m_process = 0;
     }
   };
@@ -96,13 +95,13 @@ void Device::slotExited( OProcess* proc)
         // and call hciconfig hci0 up
         // FIXME hardcoded to hci0 now :(
         m_hci = new OProcess( );
         *m_hci << "hciconfig";
         *m_hci << "hci0 up";
         connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
-                this, SLOT( slotExited(OProcess* ) ) );
+                this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
         if(!m_hci->start() ){
           qWarning("could not start" );
           m_attached = false;
           emit device("hci0", false );
         }
       }else{
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 56156a8..7c9ea5b 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -42,13 +42,13 @@ void Manager::setDevice( Device* /*dev*/ ){
 }
 void Manager::isAvailable( const QString& device ){
     OProcess* l2ping = new OProcess();
     l2ping->setName( device.latin1() );
     *l2ping << "l2ping" << "-c1" << device;
     connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ),
-            this, SLOT(slotProcessExited(OProcess*) ) );
+            this, SLOT(slotProcessExited(Opie::Core::OProcess*) ) );
     if (!l2ping->start() ) {
         emit available( device,  false );
         delete l2ping;
     }
 
 }
@@ -60,15 +60,15 @@ void Manager::isAvailable( Device* /*dev*/ ){
 void Manager::searchDevices( const QString& device ){
     qWarning("search devices");
     OProcess* hcitool = new OProcess();
     hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
     *hcitool << "hcitool" << "scan";
     connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT(slotHCIExited(OProcess* ) ) );
+             this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) );
     connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
-             this, SLOT(slotHCIOut(OProcess*, char*, int ) ) );
+             this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning("could not start");
         RemoteDevice::ValueList list;
         emit foundDevices( device, list );
         delete hcitool;
     }
@@ -107,15 +107,15 @@ void Manager::removeServices( const QStringList& list){
 void Manager::searchServices( const QString& remDevice ){
     OProcess *m_sdp =new OProcess();
     *m_sdp << "sdptool" << "browse" << remDevice;
     m_sdp->setName( remDevice.latin1() );
     qWarning("search Services for %s", remDevice.latin1() );
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotSDPExited(OProcess* ) ) );
+            this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) );
     connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
-            this, SLOT(slotSDPOut(OProcess*, char*, int) ) );
+            this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
         qWarning("could not start sdptool" );
         delete m_sdp;
         Services::ValueList list;
         emit foundServices( remDevice, list );
     }
@@ -246,15 +246,15 @@ void Manager::connectTo( const QString& mac) {
 void Manager::searchConnections() {
     qWarning("searching connections?");
     OProcess* proc = new OProcess();
     m_hcitoolCon = QString::null;
 
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotConnectionExited( OProcess*) ) );
+            this, SLOT(slotConnectionExited( Opie::Core::OProcess*) ) );
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
-            this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) );
+            this, SLOT(slotConnectionOutput(Opie::Core::OProcess*, char*, int) ) );
     *proc << "hcitool";
     *proc << "con";
 
     if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         ConnectionState::ValueList list;
         emit connections( list  );
@@ -305,15 +305,15 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
 
 void Manager::signalStrength( const QString &mac ) {
 
     OProcess* sig_proc = new OProcess();
 
     connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotSignalStrengthExited( OProcess*) ) );
+            this, SLOT(slotSignalStrengthExited( Opie::Core::OProcess*) ) );
     connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
-            this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) );
+            this, SLOT(slotSignalStrengthOutput(Opie::Core::OProcess*, char*, int) ) );
     *sig_proc << "hcitool";
     *sig_proc << "lq";
     *sig_proc << mac;
 
     sig_proc->setName( mac.latin1() );
 
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp
index 90ef04a..09b19d2 100644
--- a/noncore/net/opietooth/lib/startdunconnection.cpp
+++ b/noncore/net/opietooth/lib/startdunconnection.cpp
@@ -2,13 +2,12 @@
 #include "startdunconnection.h"
 
 using namespace OpieTooth;
 
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 StartDunConnection::StartDunConnection() {
     m_dunConnect = 0l;
     setConnectionType();
 }
 
 StartDunConnection::~StartDunConnection() {
@@ -39,15 +38,15 @@ StartConnection::ConnectionType StartDunConnection::type() {
 
 void StartDunConnection::start()  {
     m_dunConnect = new OProcess();
     *m_dunConnect << "dund" << "--listen" << "--connect"  << m_mac;
 
     connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
     connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT( slotStdOut(OProcess*,char*,int) ) );
+             this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning( "could not start" );
         delete m_dunConnect;
     }
 }
 
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp
index fef35d9..24ac530 100644
--- a/noncore/net/opietooth/lib/startpanconnection.cpp
+++ b/noncore/net/opietooth/lib/startpanconnection.cpp
@@ -40,15 +40,15 @@ StartConnection::ConnectionType StartPanConnection::type() {
 void StartPanConnection::start()  {
     m_panConnect = new OProcess();
     qDebug( "IM START " + m_mac );
     *m_panConnect << "pand" << "--connect" << m_mac;
 
     connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
     connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT( slotStdOut(OProcess*,char*,int) ) );
+             this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning( "could not start" );
         delete m_panConnect;
     }
 }
 
@@ -70,15 +70,15 @@ void StartPanConnection::stop()  {
     m_panConnect = new OProcess();
     qDebug("IM STOP " + m_mac);
 
     *m_panConnect << "pand" << "--kill" << m_mac;
 
     connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
     connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT( slotStdOut(OProcess*,char*,int) ) );
+             this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning( "could not stop" );
         delete m_panConnect;
     }
 }
 
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 870e7fd..78c1501 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -7,13 +7,12 @@
 #include <qlabel.h>
 #include <opie2/oprocess.h>
 
 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 )
     : QDialog( parent, name, modal, fl ) {
 
     if ( !name )
         setName( "PPPDialog" );
     setCaption( tr( "ppp connection " ) ) ;
@@ -52,13 +51,13 @@ void PPPDialog::connectToDevice() {
     outPut->clear();
     // vom popupmenu beziehen
     QString connectScript = "/etc/ppp/peers/" + cmdLine->text();
     OProcess* pppDial = new OProcess();
     *pppDial << "pppd" << m_device << "call" << connectScript;
     connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ),
-                this, SLOT(fillOutPut(OProcess*,char*,int) ) );
+             this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) );
      if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) {
         qWarning("could not start");
         delete pppDial;
     }
 }
 
diff --git a/noncore/settings/networksettings/ppp/config.in b/noncore/settings/networksettings/ppp/config.in
index 3b8501d..0b71434 100644
--- a/noncore/settings/networksettings/ppp/config.in
+++ b/noncore/settings/networksettings/ppp/config.in
@@ -1,4 +1,4 @@
   config PPP
     boolean "opie-networksettingsplugin-kppp (PPP module)"
     default "n" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
+    depends ( LIBQPE || LIBQPE-X11 ) && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index 97fa468..d4661cb 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,6 +1,6 @@
   config WLAN
     boolean "opie-networksettingsplugin-wlan (wireless LAN module)"
     default "n" if NETWORKSETUP
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
     #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup"
-    #depends !( LIBOPIE2NET && LIBOPIE && NETWORKSETUP)
\ No newline at end of file
+    #depends !( LIBOPIE2NET && NETWORKSETUP)
\ No newline at end of file
diff --git a/noncore/unsupported/mail2/bend/bend.cpp b/noncore/unsupported/mail2/bend/bend.cpp
index ab6eb45..4ded402 100644
--- a/noncore/unsupported/mail2/bend/bend.cpp
+++ b/noncore/unsupported/mail2/bend/bend.cpp
@@ -6,13 +6,13 @@
 #include <qdir.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 #include "imapresponse.h"
 #include "imaphandler.h"
 #include "configfile.h"
 #include "bend.h"
 
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 94de15c..cac3f26 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -4,13 +4,13 @@
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "mailstatusbar.h"
 #include "listviewplus.h"
 #include "composerbase.h"
diff --git a/noncore/unsupported/mail2/main.cpp b/noncore/unsupported/mail2/main.cpp
index a11b4e2..fce9b0b 100644
--- a/noncore/unsupported/mail2/main.cpp
+++ b/noncore/unsupported/mail2/main.cpp
@@ -1,8 +1,9 @@
 #include <qpe/qpeapplication.h>
 
+using namespace Opie::Core;
 #include "mainwindow.h"
 
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 4e804c2..666cc4a 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,13 +1,13 @@
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "mainwindowbase.h"
 #include "mailstatusbar.h"
 #include "folderwidget.h"
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index f72026f..ff02a7d 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -2,13 +2,13 @@
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qpopupmenu.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "viewmailbase.h"
 #include "opendiag.h"
 
diff --git a/noncore/unsupported/mailit/main.cpp b/noncore/unsupported/mailit/main.cpp
index 71f8877..1ccd666 100644
--- a/noncore/unsupported/mailit/main.cpp
+++ b/noncore/unsupported/mailit/main.cpp
@@ -19,7 +19,8 @@
 **********************************************************************/
 #include <qpe/qpeapplication.h>
 #include "mailitwindow.h"
 
 #include <opie/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> )
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index cfaadbf..db4db71 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -9,13 +9,13 @@
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #include "pmipkg.h"
 #include "pksettings.h"
 #include "package.h"
 #include "packagelistitem.h"
 
-//#include <opie/oprocess.h>
+//#include <opie2/oprocess.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
 #include <qpe/qpeapplication.h>
 #include <qdir.h>
 #include <qfile.h>
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index 75e86d0..df9df54 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -17,13 +17,13 @@
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
 #include <qclipboard.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 #include <qtimer.h>
 #include <qfileinfo.h>